re-land of new SkSL precisions

Bug: skia:
Change-Id: Ic1deb3db2cbda6ca45f93dee99832971a36a2119
Reviewed-on: https://skia-review.googlesource.com/47841
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 34 insertions, 34 deletions

diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index c3f9468ca8..266169f630 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -62,7 +62,7 @@ static void test(skiatest::Reporter* r, const char* src, const GrShaderCaps& cap
 DEF_TEST(SkSLFPHelloWorld, r) {
     test(r,
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -132,7 +132,7 @@ DEF_TEST(SkSLFPHelloWorld, r) {
              "        GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;\n"
              "        const GrTest& _outer = args.fFp.cast<GrTest>();\n"
              "        (void) _outer;\n"
-             "        fragBuilder->codeAppendf(\"%s = float4(1.0);\\n\", args.fOutputColor);\n"
+             "        fragBuilder->codeAppendf(\"%s = half4(1.0);\\n\", args.fOutputColor);\n"
              "    }\n"
              "private:\n"
              "    void onSetData(const GrGLSLProgramDataManager& pdman, "
@@ -163,9 +163,9 @@ DEF_TEST(SkSLFPHelloWorld, r) {
 
 DEF_TEST(SkSLFPInput, r) {
     test(r,
-         "in float2 point;"
+         "in half2 point;"
          "void main() {"
-         "sk_OutColor = float4(point, point);"
+         "sk_OutColor = half4(point, point);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -176,7 +176,7 @@ DEF_TEST(SkSLFPInput, r) {
              ", fPoint(point)"
          },
          {
-             "fragBuilder->codeAppendf(\"%s = float4(float2(%f, %f), float2(%f, %f));\\n\", "
+             "fragBuilder->codeAppendf(\"%s = half4(half2(%f, %f), half2(%f, %f));\\n\", "
                                       "args.fOutputColor, _outer.point().fX, _outer.point().fY, "
                                       "_outer.point().fX, _outer.point().fY);",
              "if (fPoint != that.fPoint) return false;"
@@ -185,7 +185,7 @@ DEF_TEST(SkSLFPInput, r) {
 
 DEF_TEST(SkSLFPUniform, r) {
     test(r,
-         "uniform float4 color;"
+         "uniform half4 color;"
          "void main() {"
          "sk_OutColor = color;"
          "}",
@@ -194,14 +194,14 @@ DEF_TEST(SkSLFPUniform, r) {
              "static std::unique_ptr<GrFragmentProcessor> Make()"
          },
          {
-            "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_GrSLType, "
+            "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType, "
                                                          "kDefault_GrSLPrecision, \"color\");",
          });
 }
 
 DEF_TEST(SkSLFPInUniform, r) {
     test(r,
-         "in uniform float4 color;"
+         "in uniform half4 color;"
          "void main() {"
          "sk_OutColor = color;"
          "}",
@@ -210,7 +210,7 @@ DEF_TEST(SkSLFPInUniform, r) {
              "static std::unique_ptr<GrFragmentProcessor> Make(SkRect color) {",
          },
          {
-            "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_GrSLType, "
+            "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType, "
                                                          "kDefault_GrSLPrecision, \"color\");",
             "const SkRect colorValue = _outer.color();",
             "pdman.set4fv(fColorVar, 1, (float*) &colorValue);"
@@ -221,7 +221,7 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@header { header section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -231,7 +231,7 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@class { class section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -243,16 +243,16 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@cpp { cpp section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {},
          {"cpp section"});
     test(r,
          "@constructorParams { int x, float y, std::vector<float> z }"
-         "in float w;"
+         "in highfloat w;"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = highfloat4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -265,7 +265,7 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@constructor { constructor section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -275,7 +275,7 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@initializers { initializers section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -283,22 +283,22 @@ DEF_TEST(SkSLFPSections, r) {
          },
          {});
     test(r,
-         "float x = 10;"
-         "@emitCode { fragBuilder->codeAppendf(\"float y = %d\\n\", x * 2); }"
+         "half x = 10;"
+         "@emitCode { fragBuilder->codeAppendf(\"half y = %d\\n\", x * 2); }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {},
          {
             "x = 10.0;\n"
-            " fragBuilder->codeAppendf(\"float y = %d\\n\", x * 2);"
+            " fragBuilder->codeAppendf(\"half y = %d\\n\", x * 2);"
          });
     test(r,
          "@fields { fields section }"
          "@clone { }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -309,7 +309,7 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@make { make section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -318,11 +318,11 @@ DEF_TEST(SkSLFPSections, r) {
          },
          {});
     test(r,
-         "uniform float calculated;"
-         "in float provided;"
+         "uniform half calculated;"
+         "in half provided;"
          "@setData(varName) { varName.set1f(calculated, provided * 2); }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {},
@@ -336,7 +336,7 @@ DEF_TEST(SkSLFPSections, r) {
     test(r,
          "@test(testDataName) { testDataName section }"
          "void main() {"
-         "sk_OutColor = float4(1);"
+         "sk_OutColor = half4(1);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {},
@@ -353,7 +353,7 @@ DEF_TEST(SkSLFPColorSpaceXform, r) {
          "in uniform sampler2D image;"
          "in uniform colorSpaceXform colorXform;"
          "void main() {"
-         "sk_OutColor = sk_InColor * texture(image, float2(0, 0), colorXform);"
+         "sk_OutColor = sk_InColor * texture(image, highfloat2(0, 0), colorXform);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {
@@ -363,12 +363,12 @@ DEF_TEST(SkSLFPColorSpaceXform, r) {
              "sk_sp<GrColorSpaceXform> fColorXform;"
          },
          {
-             "fragBuilder->codeAppendf(\"float4 _tmpVar1;%s = %s * %stexture(%s, "
-             "float2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : "
-             "\"float4(1)\", fColorSpaceHelper.isValid() ? \"(_tmpVar1 = \" : \"\", "
+             "fragBuilder->codeAppendf(\"half4 _tmpVar1;%s = %s * %stexture(%s, "
+             "highfloat2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : "
+             "\"half4(1)\", fColorSpaceHelper.isValid() ? \"(_tmpVar1 = \" : \"\", "
              "fragBuilder->getProgramBuilder()->samplerVariable(args.fTexSamplers[0]).c_str(), "
              "fragBuilder->getProgramBuilder()->samplerSwizzle(args.fTexSamplers[0]).c_str(), "
-             "fColorSpaceHelper.isValid() ? SkStringPrintf(\", float4(clamp((%s * float4(_tmpVar1.rgb, "
+             "fColorSpaceHelper.isValid() ? SkStringPrintf(\", half4(clamp((%s * half4(_tmpVar1.rgb, "
              "1.0)).rgb, 0.0, _tmpVar1.a), _tmpVar1.a))\", args.fUniformHandler->getUniformCStr("
              "fColorSpaceHelper.gamutXformUniform())).c_str() : \"\");"
          });
@@ -377,14 +377,14 @@ DEF_TEST(SkSLFPColorSpaceXform, r) {
 DEF_TEST(SkSLFPTransformedCoords, r) {
     test(r,
          "void main() {"
-         "sk_OutColor = float4(sk_TransformedCoords2D[0], sk_TransformedCoords2D[0]);"
+         "sk_OutColor = half4(sk_TransformedCoords2D[0], sk_TransformedCoords2D[0]);"
          "}",
          *SkSL::ShaderCapsFactory::Default(),
          {},
          {
             "SkString sk_TransformedCoords2D_0 = "
                                          "fragBuilder->ensureCoords2D(args.fTransformedCoords[0]);",
-            "fragBuilder->codeAppendf(\"%s = float4(%s, %s);\\n\", args.fOutputColor, "
+            "fragBuilder->codeAppendf(\"%s = half4(%s, %s);\\n\", args.fOutputColor, "
                               "sk_TransformedCoords2D_0.c_str(), sk_TransformedCoords2D_0.c_str());"
          });
 
@@ -392,7 +392,7 @@ DEF_TEST(SkSLFPTransformedCoords, r) {
 
 DEF_TEST(SkSLFPLayoutWhen, r) {
     test(r,
-         "layout(when=someExpression(someOtherExpression())) uniform float sometimes;"
+         "layout(when=someExpression(someOtherExpression())) uniform half sometimes;"
          "void main() {"
          "}",
          *SkSL::ShaderCapsFactory::Default(),