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 /src/gpu/effects/GrTextureDomain.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 'src/gpu/effects/GrTextureDomain.cpp')
| -rw-r--r-- | src/gpu/effects/GrTextureDomain.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index c297560cea..671bec6012 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -87,7 +87,7 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder, case kIgnore_Mode: { builder->codeAppendf("%s = ", outColor); builder->appendTextureLookupAndModulate(inModulateColor, sampler, inCoords.c_str(), - kHighFloat2_GrSLType, colorXformHelper); + kFloat2_GrSLType, colorXformHelper); builder->codeAppend(";"); break; } @@ -98,7 +98,7 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder, builder->codeAppendf("%s = ", outColor); builder->appendTextureLookupAndModulate(inModulateColor, sampler, clampedCoords.c_str(), - kHighFloat2_GrSLType, colorXformHelper); + kFloat2_GrSLType, colorXformHelper); builder->codeAppend(";"); break; } @@ -117,11 +117,11 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder, builder->codeAppend("half4 outside = half4(0.0, 0.0, 0.0, 0.0);"); builder->codeAppend("half4 inside = "); builder->appendTextureLookupAndModulate(inModulateColor, sampler, inCoords.c_str(), - kHighFloat2_GrSLType, colorXformHelper); + kFloat2_GrSLType, colorXformHelper); builder->codeAppend(";"); - builder->codeAppendf("highfloat x = (%s).x;", inCoords.c_str()); - builder->codeAppendf("highfloat y = (%s).y;", inCoords.c_str()); + builder->codeAppendf("float x = (%s).x;", inCoords.c_str()); + builder->codeAppendf("float y = (%s).y;", inCoords.c_str()); builder->codeAppendf("x = abs(2.0*(x - %s.x)/(%s.z - %s.x) - 1.0);", domain, domain, domain); @@ -138,7 +138,7 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder, builder->codeAppendf("%s = any(outside) ? half4(0.0, 0.0, 0.0, 0.0) : ", outColor); builder->appendTextureLookupAndModulate(inModulateColor, sampler, inCoords.c_str(), - kHighFloat2_GrSLType, colorXformHelper); + kFloat2_GrSLType, colorXformHelper); builder->codeAppend(";"); } break; @@ -151,7 +151,7 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder, builder->codeAppendf("%s = ", outColor); builder->appendTextureLookupAndModulate(inModulateColor, sampler, clampedCoords.c_str(), - kHighFloat2_GrSLType, colorXformHelper); + kFloat2_GrSLType, colorXformHelper); builder->codeAppend(";"); break; } |