From 1d816b92bb7cf2258007f3f74ffd143b89f25d01 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 17 Aug 2017 11:07:59 -0400 Subject: Revert "Switched highp float to highfloat and mediump float to half." This reverts commit 88d99c63878c2d3d340120f0321676f72afcb4f0. Reason for revert: Believed to be causing unit test failures in Chrome roll: https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/364433 https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Ftryserver.chromium.android%2Flinux_android_rel_ng%2F364433%2F%2B%2Frecipes%2Fsteps%2Fcontent_browsertests__with_patch__on_Android%2F0%2Flogs%2FWebRtcCaptureFromElementBrowserTest.VerifyCanvasWebGLCaptureColor%2F0 Original change's description: > Switched highp float to highfloat and mediump float to half. > > The ultimate goal is to end up with "float" and "half", but this > intermediate step uses "highfloat" so that it is clear if I missed a > "float" somewhere. Once this lands, a subsequent CL will switch all > "highfloats" back to "floats". > > Bug: skia: > Change-Id: Ia13225c7a0a0a2901e07665891c473d2500ddcca > Reviewed-on: https://skia-review.googlesource.com/31000 > Commit-Queue: Ethan Nicholas > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,csmartdalton@google.com,ethannicholas@google.com Change-Id: I8bfa97547ac3920d433665f161d27df3f15c83aa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/35705 Commit-Queue: Brian Salomon Reviewed-by: Brian Salomon --- tests/SkSLFPTest.cpp | 68 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'tests/SkSLFPTest.cpp') diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 266169f630..c3f9468ca8 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 = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -132,7 +132,7 @@ DEF_TEST(SkSLFPHelloWorld, r) { " GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;\n" " const GrTest& _outer = args.fFp.cast();\n" " (void) _outer;\n" - " fragBuilder->codeAppendf(\"%s = half4(1.0);\\n\", args.fOutputColor);\n" + " fragBuilder->codeAppendf(\"%s = float4(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 half2 point;" + "in float2 point;" "void main() {" - "sk_OutColor = half4(point, point);" + "sk_OutColor = float4(point, point);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -176,7 +176,7 @@ DEF_TEST(SkSLFPInput, r) { ", fPoint(point)" }, { - "fragBuilder->codeAppendf(\"%s = half4(half2(%f, %f), half2(%f, %f));\\n\", " + "fragBuilder->codeAppendf(\"%s = float4(float2(%f, %f), float2(%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 half4 color;" + "uniform float4 color;" "void main() {" "sk_OutColor = color;" "}", @@ -194,14 +194,14 @@ DEF_TEST(SkSLFPUniform, r) { "static std::unique_ptr Make()" }, { - "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType, " + "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_GrSLType, " "kDefault_GrSLPrecision, \"color\");", }); } DEF_TEST(SkSLFPInUniform, r) { test(r, - "in uniform half4 color;" + "in uniform float4 color;" "void main() {" "sk_OutColor = color;" "}", @@ -210,7 +210,7 @@ DEF_TEST(SkSLFPInUniform, r) { "static std::unique_ptr Make(SkRect color) {", }, { - "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType, " + "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_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 = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -231,7 +231,7 @@ DEF_TEST(SkSLFPSections, r) { test(r, "@class { class section }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -243,16 +243,16 @@ DEF_TEST(SkSLFPSections, r) { test(r, "@cpp { cpp section }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), {}, {"cpp section"}); test(r, "@constructorParams { int x, float y, std::vector z }" - "in highfloat w;" + "in float w;" "void main() {" - "sk_OutColor = highfloat4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -265,7 +265,7 @@ DEF_TEST(SkSLFPSections, r) { test(r, "@constructor { constructor section }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -275,7 +275,7 @@ DEF_TEST(SkSLFPSections, r) { test(r, "@initializers { initializers section }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -283,22 +283,22 @@ DEF_TEST(SkSLFPSections, r) { }, {}); test(r, - "half x = 10;" - "@emitCode { fragBuilder->codeAppendf(\"half y = %d\\n\", x * 2); }" + "float x = 10;" + "@emitCode { fragBuilder->codeAppendf(\"float y = %d\\n\", x * 2); }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), {}, { "x = 10.0;\n" - " fragBuilder->codeAppendf(\"half y = %d\\n\", x * 2);" + " fragBuilder->codeAppendf(\"float y = %d\\n\", x * 2);" }); test(r, "@fields { fields section }" "@clone { }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -309,7 +309,7 @@ DEF_TEST(SkSLFPSections, r) { test(r, "@make { make section }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -318,11 +318,11 @@ DEF_TEST(SkSLFPSections, r) { }, {}); test(r, - "uniform half calculated;" - "in half provided;" + "uniform float calculated;" + "in float provided;" "@setData(varName) { varName.set1f(calculated, provided * 2); }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(1);" "}", *SkSL::ShaderCapsFactory::Default(), {}, @@ -336,7 +336,7 @@ DEF_TEST(SkSLFPSections, r) { test(r, "@test(testDataName) { testDataName section }" "void main() {" - "sk_OutColor = half4(1);" + "sk_OutColor = float4(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, highfloat2(0, 0), colorXform);" + "sk_OutColor = sk_InColor * texture(image, float2(0, 0), colorXform);" "}", *SkSL::ShaderCapsFactory::Default(), { @@ -363,12 +363,12 @@ DEF_TEST(SkSLFPColorSpaceXform, r) { "sk_sp fColorXform;" }, { - "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->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->getProgramBuilder()->samplerVariable(args.fTexSamplers[0]).c_str(), " "fragBuilder->getProgramBuilder()->samplerSwizzle(args.fTexSamplers[0]).c_str(), " - "fColorSpaceHelper.isValid() ? SkStringPrintf(\", half4(clamp((%s * half4(_tmpVar1.rgb, " + "fColorSpaceHelper.isValid() ? SkStringPrintf(\", float4(clamp((%s * float4(_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 = half4(sk_TransformedCoords2D[0], sk_TransformedCoords2D[0]);" + "sk_OutColor = float4(sk_TransformedCoords2D[0], sk_TransformedCoords2D[0]);" "}", *SkSL::ShaderCapsFactory::Default(), {}, { "SkString sk_TransformedCoords2D_0 = " "fragBuilder->ensureCoords2D(args.fTransformedCoords[0]);", - "fragBuilder->codeAppendf(\"%s = half4(%s, %s);\\n\", args.fOutputColor, " + "fragBuilder->codeAppendf(\"%s = float4(%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 half sometimes;" + "layout(when=someExpression(someOtherExpression())) uniform float sometimes;" "void main() {" "}", *SkSL::ShaderCapsFactory::Default(), -- cgit v1.2.3