AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added DSL modifiers declarations

Browse Source 
Change-Id: I97a7c5cfb3ce3f430074092616a3256422c8ad5e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/444979
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
This commit is contained in:
Ethan Nicholas 2021-09-03 06:33:47 -04:00 committed by SkCQ
parent 33e0f9aa49
commit 678ec7187a
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sksl/DSLCore.h
View File

@ -90,6 +90,11 @@ DSLStatement Break(PositionInfo pos = PositionInfo::Capture());
*/
DSLStatement Continue(PositionInfo pos = PositionInfo::Capture());
/**
* Adds a modifiers declaration to the current program.
*/
void Declare(const DSLModifiers& modifiers, PositionInfo pos = PositionInfo::Capture());
/**
* Creates a local variable declaration statement.
*/

4
src/sksl/SkSLDSLParser.cpp
View File

@ -292,7 +292,9 @@ bool DSLParser::declaration() {
return this->interfaceBlock(modifiers);
}
if (lookahead.fKind == Token::Kind::TK_SEMICOLON) {
this->error(lookahead, "modifiers declarations are not yet supported");
this->nextToken();
Declare(modifiers, position(lookahead));
return true;
}
if (lookahead.fKind == Token::Kind::TK_STRUCT) {
SkTArray<DSLGlobalVar> result = this->structVarDeclaration(modifiers);

15
src/sksl/dsl/DSLCore.cpp
View File

@ -130,6 +130,11 @@ public:
return SkSL::ContinueStatement::Make(pos.offset());
}
static void Declare(const DSLModifiers& modifiers) {
DSLWriter::ProgramElements().push_back(std::make_unique<SkSL::ModifiersDeclaration>(
DSLWriter::Modifiers(modifiers.fModifiers)));
}
static DSLStatement Declare(DSLVar& var, PositionInfo pos) {
if (var.fDeclared) {
DSLWriter::ReportError("variable has already been declared", pos);
@ -344,6 +349,16 @@ DSLStatement Continue(PositionInfo pos) {
return DSLCore::Continue(pos);
}
void Declare(const DSLModifiers& modifiers, PositionInfo pos) {
SkSL::ProgramKind kind = DSLWriter::GetProgramConfig()->fKind;
if (kind != ProgramKind::kFragment &&
kind != ProgramKind::kVertex) {
DSLWriter::ReportError("layout qualifiers are not allowed in this kind of program", pos);
return;
}
DSLCore::Declare(modifiers);
}
// Logically, we'd want the variable's initial value to appear on here in Declare, since that
// matches how we actually write code (and in fact that was what our first attempt looked like).
// Unfortunately, C++ doesn't guarantee execution order between arguments, and Declare() can appear

7
tests/SkSLDSLTest.cpp
View File

@ -2130,3 +2130,10 @@ DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLExtension, r, ctxInfo) {
REPORTER_ASSERT(r, DSLWriter::ProgramElements().size() == 1);
EXPECT_EQUAL(*DSLWriter::ProgramElements()[0], "#extension test_extension : enable");
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLModifiersDeclaration, r, ctxInfo) {
AutoDSLContext context(ctxInfo.directContext()->priv().getGpu());
Declare(Modifiers(Layout().blendSupportAllEquations(), kOut_Modifier));
REPORTER_ASSERT(r, DSLWriter::ProgramElements().size() == 1);
EXPECT_EQUAL(*DSLWriter::ProgramElements()[0], "layout(blend_support_all_equations) out;");
}