diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-09-20 11:24:15 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-22 13:54:38 +0000 |
commit | 8aa4569c139a7a7ac38c62b25e3af40309cc2ee2 (patch) | |
tree | 7a26824983b55df440a1c369798936da7f872351 /tests/SkSLFPTest.cpp | |
parent | b7d42e3c11a6e1d89e8b1af030511e935ee065ba (diff) |
switched SkSL's temporary 'highfloat' type back to 'float'
Bug: skia:
Change-Id: If0debae7318b6b5b4a7cb85d458996a09931127e
Reviewed-on: https://skia-review.googlesource.com/48760
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/SkSLFPTest.cpp')
-rw-r--r-- | tests/SkSLFPTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 266169f630..dc9279573d 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -250,9 +250,9 @@ DEF_TEST(SkSLFPSections, r) { {"cpp section"}); test(r, "@constructorParams { int x, float y, std::vector<float> z }" - "in highfloat w;" + "in float w;" "void main() {" - "sk_OutColor = highfloat4(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(), { @@ -364,7 +364,7 @@ DEF_TEST(SkSLFPColorSpaceXform, r) { }, { "fragBuilder->codeAppendf(\"half4 _tmpVar1;%s = %s * %stexture(%s, " - "highfloat2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : " + "float2(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(), " |