commit fa648a1be30eb95314bcd4f07e2efe39162722d5
author Ethan Nicholas <ethannicholas@google.com> Wed Feb 17 12:13:20 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 17 18:26:56 2021 +0000
tree db5ffd4aafe865633b6f1136f7ae4f693f4965c3
parent b41a1f9025c256e44aead913de6227a2e73e380a

Renamed DSL Ternary to Select

Change-Id: Idd0d49d3564dc3a24455db3c504ffa124f34dd05
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/371336
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

tests/SkSLDSLTest.cpp

diff --git a/tests/SkSLDSLTest.cpp b/tests/SkSLDSLTest.cpp
index 0b461cd..e1700d9 100644
--- a/tests/SkSLDSLTest.cpp
+++ b/tests/SkSLDSLTest.cpp
@@ -1091,6 +1091,23 @@
     REPORTER_ASSERT(r, whitespace_insensitive_compare(y, "return true;"));
 }
 
+DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLSelect, r, ctxInfo) {
+    AutoDSLContext context(ctxInfo.directContext()->priv().getGpu());
+    Var a(kInt, "a");
+    Expression x = Select(a > 0, 1, -1);
+    REPORTER_ASSERT(r, x.release()->description() == "((a > 0) ? 1 : -1)");
+
+    {
+        ExpectError error(r, "error: expected 'bool', but found 'int'\n");
+        Select(a, 1, -1).release();
+    }
+
+    {
+        ExpectError error(r, "error: ternary operator result mismatch: 'float2', 'float3'\n");
+        Select(a > 0, Float2(1), Float3(1)).release();
+    }
+}
+
 DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLSwitch, r, ctxInfo) {
     AutoDSLContext context(ctxInfo.directContext()->priv().getGpu());
 
@@ -1179,23 +1196,6 @@
     REPORTER_ASSERT(r, e13.release()->description() == "float4(a.xyz, float(1)).x");
 }
 
-DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLTernary, r, ctxInfo) {
-    AutoDSLContext context(ctxInfo.directContext()->priv().getGpu());
-    Var a(kInt, "a");
-    Expression x = Ternary(a > 0, 1, -1);
-    REPORTER_ASSERT(r, x.release()->description() == "((a > 0) ? 1 : -1)");
-
-    {
-        ExpectError error(r, "error: expected 'bool', but found 'int'\n");
-        Ternary(a, 1, -1).release();
-    }
-
-    {
-        ExpectError error(r, "error: ternary operator result mismatch: 'float2', 'float3'\n");
-        Ternary(a > 0, Float2(1), Float3(1)).release();
-    }
-}
-
 DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLWhile, r, ctxInfo) {
     AutoDSLContext context(ctxInfo.directContext()->priv().getGpu());
     Statement x = While(true, Block());