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

Only change from last attempt is putting the call to shaderDerivativeExtensionString behind a check for shaderDerivativeSupport to avoid a spurious assertion failure.

TBR=benjaminwagner@google.com

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2437063002

Review-Url: https://chromiumcodereview.appspot.com/2437063002

1 files changed, 1 insertions, 13 deletions

diff --git a/src/sksl/SkSLMain.cpp b/src/sksl/SkSLMain.cpp
index fe925e0c6e..eb07b4d032 100644
--- a/src/sksl/SkSLMain.cpp
+++ b/src/sksl/SkSLMain.cpp
@@ -16,18 +16,6 @@ bool endsWith(const std::string& s, const std::string& ending) {
     return false;
 }
 
-static SkSL::GLCaps default_caps() {
-    return { 
-             400, 
-             SkSL::GLCaps::kGL_Standard,
-             false, // isCoreProfile
-             false, // usesPrecisionModifiers;
-             false, // mustDeclareFragmentShaderOutput
-             true,  // canUseMinAndAbsTogether
-             false  // mustForceNegatedAtanParamToFloat
-           };
-}
-
 /**
  * Very simple standalone executable to facilitate testing.
  */
@@ -69,7 +57,7 @@ int main(int argc, const char** argv) {
     } else if (endsWith(name, ".glsl")) {
         std::ofstream out(argv[2], std::ofstream::binary);
         SkSL::Compiler compiler;
-        if (!compiler.toGLSL(kind, text, default_caps(), out)) {
+        if (!compiler.toGLSL(kind, text, SkSL::GLCaps(), out)) {
             printf("%s", compiler.errorText().c_str());
             exit(3);
         }