Revert "re-land of skslc now automatically turns on derivatives support"

This reverts commit d7d1997643db3b9b5caaaac235c0e2cd0fa23ec2.

This breaks the Chromium roll (it did last time it landed too).
https://codereview.chromium.org/2429853002

Please gate your next attempt on at least one of linux_android_rel_ng, linux_chromium_rel_ng, or mac_chromium_rel_ng.

TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I999d4af70a5704b8990f3cd7d145eabff57646f5
Reviewed-on: https://skia-review.googlesource.com/3590
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

1 files changed, 9 insertions, 28 deletions

diff --git a/tests/SkSLGLSLTest.cpp b/tests/SkSLGLSLTest.cpp
index ad1fe0d901..b615f67814 100644
--- a/tests/SkSLGLSLTest.cpp
+++ b/tests/SkSLGLSLTest.cpp
@@ -27,7 +27,15 @@ static void test(skiatest::Reporter* r, const char* src, SkSL::GLCaps caps, cons
 }
 
 static SkSL::GLCaps default_caps() {
-    return SkSL::GLCaps();
+    return { 
+             400, 
+             SkSL::GLCaps::kGL_Standard,
+             false, // isCoreProfile
+             false, // usesPrecisionModifiers;
+             false, // mustDeclareFragmentShaderOutput
+             true,  // canUseMinAndAbsTogether
+             false  // mustForceNegatedAtanParamToFloat
+           };
 }
 
 DEF_TEST(SkSLHelloWorld, r) {
@@ -379,30 +387,3 @@ DEF_TEST(SkSLArrayConstructors, r) {
          "vec2 test2[] = vec2[](vec2(1.0, 2.0), vec2(3.0, 4.0));\n"
          "mat4 test3[] = mat4[]();\n");
 }
-
-DEF_TEST(SkSLDerivatives, r) {
-    test(r,
-         "void main() { float x = dFdx(1); }",
-         default_caps(),
-         "#version 400\n"
-         "void main() {\n"
-         "    float x = dFdx(1.0);\n"
-         "}\n");
-    SkSL::GLCaps caps = default_caps();
-    caps.fShaderDerivativeExtensionString = "GL_OES_standard_derivatives";
-    test(r,
-         "void main() { float x = 1; }",
-         caps,
-         "#version 400\n"
-         "void main() {\n"
-         "    float x = 1.0;\n"
-         "}\n");
-    test(r,
-         "void main() { float x = dFdx(1); }",
-         caps,
-         "#version 400\n"
-         "#extension GL_OES_standard_derivatives : require\n"
-         "void main() {\n"
-         "    float x = dFdx(1.0);\n"
-         "}\n");
-}