Revert "added sk_FragCoord support to skslc"

This reverts commit ce33f10677630e34187b661a02161378d8304d68.

Reason for revert: Breaking many gpu bots

Change-Id: I94c813ed6a9311458c872f74bb1b0792f46ff414
Reviewed-on: https://skia-review.googlesource.com/5737
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

1 files changed, 7 insertions, 81 deletions

diff --git a/tests/SkSLGLSLTest.cpp b/tests/SkSLGLSLTest.cpp
index 37d9a27e3f..ceb7cb7229 100644
--- a/tests/SkSLGLSLTest.cpp
+++ b/tests/SkSLGLSLTest.cpp
@@ -11,37 +11,25 @@
 
 #if SK_SUPPORT_GPU
 
-static void test(skiatest::Reporter* r, const char* src, const SkSL::Program::Settings& settings,
-                 const char* expected, SkSL::Program::Inputs* inputs) {
+static void test(skiatest::Reporter* r, const char* src, const GrShaderCaps& caps,
+                 const char* expected) {
     SkSL::Compiler compiler;
     SkString output;
-    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kFragment_Kind,
-                                                                     SkString(src),
-                                                                     settings);
-    if (!program) {
+    bool result = compiler.toGLSL(SkSL::Program::kFragment_Kind, SkString(src), caps, &output);
+    if (!result) {
         SkDebugf("Unexpected error compiling %s\n%s", src, compiler.errorText().c_str());
     }
-    REPORTER_ASSERT(r, program);
-    *inputs = program->fInputs;
-    REPORTER_ASSERT(r, compiler.toGLSL(*program, &output));
-    if (program) {
+    REPORTER_ASSERT(r, result);
+    if (result) {
         SkString skExpected(expected);
         if (output != skExpected) {
-            SkDebugf("GLSL MISMATCH:\nsource:\n%s\n\nexpected:\n'%s'\n\nreceived:\n'%s'", src,
+            SkDebugf("GLSL MISMATCH:\nsource:\n%s\n\nexpected:\n'%s'\n\nreceived:\n'%s'", src, 
                      expected, output.c_str());
         }
         REPORTER_ASSERT(r, output == skExpected);
     }
 }
 
-static void test(skiatest::Reporter* r, const char* src, const GrShaderCaps& caps,
-                 const char* expected) {
-    SkSL::Program::Settings settings;
-    settings.fCaps = &caps;
-    SkSL::Program::Inputs inputs;
-    test(r, src, settings, expected, &inputs);
-}
-
 DEF_TEST(SkSLHelloWorld, r) {
     test(r,
          "void main() { sk_FragColor = vec4(0.75); }",
@@ -615,66 +603,4 @@ DEF_TEST(SkSLOffset, r) {
          "    int z;\n"
          "} test;\n");
 }
-
-DEF_TEST(SkSLFragCoord, r) {
-    SkSL::Program::Settings settings;
-    settings.fFlipY = true;
-    sk_sp<GrShaderCaps> caps = SkSL::ShaderCapsFactory::FragCoordsOld();
-    settings.fCaps = caps.get();
-    SkSL::Program::Inputs inputs;
-    test(r,
-         "void main() { sk_FragColor.xy = sk_FragCoord.xy; }",
-         settings,
-         "#version 110\n"
-         "#extension GL_ARB_fragment_coord_conventions : require\n"
-         "layout(origin_upper_left) in vec4 gl_FragCoord;\n"
-         "void main() {\n"
-         "    gl_FragColor.xy = gl_FragCoord.xy;\n"
-         "}\n",
-         &inputs);
-    REPORTER_ASSERT(r, !inputs.fRTHeight);
-
-    caps = SkSL::ShaderCapsFactory::FragCoordsNew();
-    settings.fCaps = caps.get();
-    test(r,
-         "void main() { sk_FragColor.xy = sk_FragCoord.xy; }",
-         settings,
-         "#version 400\n"
-         "layout(origin_upper_left) in vec4 gl_FragCoord;\n"
-         "out vec4 sk_FragColor;\n"
-         "void main() {\n"
-         "    sk_FragColor.xy = gl_FragCoord.xy;\n"
-         "}\n",
-         &inputs);
-    REPORTER_ASSERT(r, !inputs.fRTHeight);
-
-    caps = SkSL::ShaderCapsFactory::Default();
-    settings.fCaps = caps.get();
-    test(r,
-         "void main() { sk_FragColor.xy = sk_FragCoord.xy; }",
-         settings,
-         "#version 400\n"
-         "uniform float u_skRTHeight;\n"
-         "highp vec2 _sktmpCoord = gl_FragCoord.xy;\n"
-         "highp vec4 sk_FragCoord = vec4(_sktmpCoord.x, u_skRTHeight - _sktmpCoord.y, 1.0, 1.0);\n"
-         "out vec4 sk_FragColor;\n"
-         "void main() {\n"
-         "    sk_FragColor.xy = sk_FragCoord.xy;\n"
-         "}\n",
-         &inputs);
-    REPORTER_ASSERT(r, inputs.fRTHeight);
-
-    settings.fFlipY = false;
-    test(r,
-         "void main() { sk_FragColor.xy = sk_FragCoord.xy; }",
-         settings,
-         "#version 400\n"
-         "out vec4 sk_FragColor;\n"
-         "void main() {\n"
-         "    sk_FragColor.xy = gl_FragCoord.xy;\n"
-         "}\n",
-         &inputs);
-    REPORTER_ASSERT(r, !inputs.fRTHeight);
-}
-
 #endif