Make it possible to use the DSL from within the compiler itself
The DSL would not previously function within the compiler, because it
expected to be in charge of everything itself. The compiler and DSL also
disagreed about how to handle some things, such as the DSL not
respecting the compiler's override flags.
This CL moves responsibility for much of the setup process into
DSL::Start(), which the compiler now invokes. DSL::Start() now also
takes a ProgramSettings instead of DSL-specific flags, and the
externalFunctions vector has been moved into ProgramSettings.
Change-Id: I283ed8366e25d67f02c43833743c5f8afdedaefc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408136
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
diff --git a/tests/SkSLDSLTest.cpp b/tests/SkSLDSLTest.cpp
index 1408ad3..2772862 100644
--- a/tests/SkSLDSLTest.cpp
+++ b/tests/SkSLDSLTest.cpp
@@ -18,8 +18,18 @@
using namespace SkSL::dsl;
-constexpr int kDefaultTestFlags = (kDefaultDSLFlags & ~kMangle_Flag) | kMarkVarsDeclared_Flag;
-constexpr int kNoDeclareTestFlags = kDefaultDSLFlags & ~kMangle_Flag;
+SkSL::ProgramSettings default_settings() {
+ SkSL::ProgramSettings result;
+ result.fDSLMarkVarsDeclared = true;
+ result.fDSLMangling = false;
+ return result;
+}
+
+SkSL::ProgramSettings no_mark_vars_declared() {
+ SkSL::ProgramSettings result = default_settings();
+ result.fDSLMarkVarsDeclared = false;
+ return result;
+}
/**
* In addition to issuing an automatic Start() and End(), disables mangling and optionally
@@ -30,9 +40,9 @@
*/
class AutoDSLContext {
public:
- AutoDSLContext(GrGpu* gpu, int flags = kDefaultTestFlags,
+ AutoDSLContext(GrGpu* gpu, SkSL::ProgramSettings settings = default_settings(),
SkSL::ProgramKind kind = SkSL::ProgramKind::kFragment) {
- Start(gpu->shaderCompiler(), kind, flags);
+ Start(gpu->shaderCompiler(), kind, settings);
}
~AutoDSLContext() {
@@ -137,7 +147,7 @@
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLFlags, r, ctxInfo) {
{
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kOptimize_Flag);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
EXPECT_EQUAL(All(GreaterThan(Float4(1), Float4(0))), "true");
Var x(kInt_Type, "x");
@@ -145,13 +155,16 @@
}
{
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNo_Flag);
+ SkSL::ProgramSettings settings;
+ settings.fOptimize = false;
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), settings,
+ SkSL::ProgramKind::kFragmentProcessor);
EXPECT_EQUAL(All(GreaterThan(Float4(1), Float4(0))),
"all(greaterThan(float4(1.0), float4(0.0)))");
}
{
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kMangle_Flag);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), SkSL::ProgramSettings());
Var x(kInt_Type, "x");
EXPECT_EQUAL(Declare(x), "int _0_x;");
}
@@ -1228,7 +1241,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLBlock, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
EXPECT_EQUAL(Block(), "{ }");
Var a(kInt_Type, "a", 1), b(kInt_Type, "b", 2);
EXPECT_EQUAL(Block(Declare(a), Declare(b), a = b), "{ int a = 1; int b = 2; (a = b); }");
@@ -1242,7 +1255,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLBreak, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var i(kInt_Type, "i", 0);
DSLFunction(kVoid_Type, "success").define(
For(Declare(i), i < 10, ++i, Block(
@@ -1262,7 +1275,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLContinue, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var i(kInt_Type, "i", 0);
DSLFunction(kVoid_Type, "success").define(
For(Declare(i), i < 10, ++i, Block(
@@ -1282,7 +1295,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLDeclare, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var a(kHalf4_Type, "a"), b(kHalf4_Type, "b", Half4(1));
Statement x = Declare(a);
EXPECT_EQUAL(x, "half4 a;");
@@ -1310,7 +1323,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLDeclareGlobal, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var x(kInt_Type, "x", 0);
DeclareGlobal(x);
Var y(kUniform_Modifier, kFloat2_Type, "y");
@@ -1342,7 +1355,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLFor, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
EXPECT_EQUAL(For(Statement(), Expression(), Expression(), Block()),
"for (;;) {}");
@@ -1372,7 +1385,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLFunction, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var coords(kFloat2_Type, "coords");
DSLFunction(kVoid_Type, "main", coords).define(
sk_FragColor() = Half4(coords, 0, 1)
@@ -1599,7 +1612,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLSwizzle, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kDefaultTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu());
Var a(kFloat4_Type, "a");
EXPECT_EQUAL(a.x(),
@@ -1632,7 +1645,7 @@
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLVarSwap, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
// We should be able to convert `a` into a proper var by swapping it, even from within a scope.
Var a;
@@ -1744,7 +1757,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLModifiers, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var v1(kConst_Modifier, kInt_Type, "v1", 0);
Statement d1 = Declare(v1);
@@ -1787,7 +1800,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLLayout, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
Var v1(DSLModifiers(DSLLayout().location(1).set(2).binding(3).offset(4).index(5).builtin(6)
.inputAttachmentIndex(7),
kConst_Modifier), kInt_Type, "v1", 0);
@@ -1876,7 +1889,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLSampleFragmentProcessor, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kDefaultTestFlags,
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), default_settings(),
SkSL::ProgramKind::kFragmentProcessor);
DSLVar child(kUniform_Modifier, kFragmentProcessor_Type, "child");
EXPECT_EQUAL(Sample(child), "sample(child)");
@@ -1891,7 +1904,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLSampleShader, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kDefaultTestFlags,
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), default_settings(),
SkSL::ProgramKind::kRuntimeShader);
DSLVar shader(kUniform_Modifier, kShader_Type, "shader");
EXPECT_EQUAL(Sample(shader, Float2(0, 0)), "sample(shader, float2(0.0, 0.0))");
@@ -1903,7 +1916,7 @@
}
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLStruct, r, ctxInfo) {
- AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), kNoDeclareTestFlags);
+ AutoDSLContext context(ctxInfo.directContext()->priv().getGpu(), no_mark_vars_declared());
DSLType simpleStruct = Struct("SimpleStruct",
Field(kFloat_Type, "x"),