diff options
author | 2017-10-16 14:15:26 -0600 | |
---|---|---|
committer | 2017-10-16 22:37:03 +0000 | |
commit | fdde34eeb2cb5106a6680c49dd30c0b4428cbfbb (patch) | |
tree | 5b6bfa8ee9117126c0abe3c3731c253f91f3e47d /src/gpu/effects | |
parent | 09eeefba6d19dd6bff1e046c31a889393a9447d0 (diff) |
Remove precision from GrGLSLVaryingHandler
(It's built into the types now.)
Bug: skia:
Change-Id: I44edc6e71098cf74387091903e920b1dd929b103
Reviewed-on: https://skia-review.googlesource.com/59880
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/effects')
-rw-r--r-- | src/gpu/effects/GrAtlasedShaderHelpers.h | 4 | ||||
-rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 6 | ||||
-rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/effects/GrAtlasedShaderHelpers.h b/src/gpu/effects/GrAtlasedShaderHelpers.h index fae42ebbe7..5277d31611 100644 --- a/src/gpu/effects/GrAtlasedShaderHelpers.h +++ b/src/gpu/effects/GrAtlasedShaderHelpers.h @@ -29,14 +29,14 @@ static void append_index_uv_varyings(GrGLSLPrimitiveProcessor::EmitArgs& args, args.fVertBuilder->codeAppend("half texIdx = 2.0*diff.x + diff.y;"); // Multiply by 1/atlasSize to get normalized texture coordinates - args.fVaryingHandler->addVarying("TextureCoords", uv, kHigh_GrSLPrecision); + args.fVaryingHandler->addVarying("TextureCoords", uv); args.fVertBuilder->codeAppendf("%s = intCoords * %s;", uv->vsOut(), atlasSizeInvName); args.fVaryingHandler->addVarying("TexIndex", texIdx); args.fVertBuilder->codeAppendf("%s = texIdx;", texIdx->vsOut()); if (st) { - args.fVaryingHandler->addVarying("IntTextureCoords", st, kHigh_GrSLPrecision); + args.fVaryingHandler->addVarying("IntTextureCoords", st); args.fVertBuilder->codeAppendf("%s = intCoords;", st->vsOut()); } } diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 0b4ee0758b..0eb417a498 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -78,7 +78,7 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { varyingHandler->emitAttributes(gp); GrGLSLVertToFrag v(kFloat4_GrSLType); - varyingHandler->addVarying("ConicCoeffs", &v, kHigh_GrSLPrecision); + varyingHandler->addVarying("ConicCoeffs", &v); vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inConicCoeffs()->fName); GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder; @@ -555,14 +555,14 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { fDevKLMUniform = uniformHandler->addUniform(kVertex_GrShaderFlag, kFloat3x3_GrSLType, "KLM", &devkLMMatrixName); GrGLSLVertToFrag v(kFloat3_GrSLType); - varyingHandler->addVarying("CubicCoeffs", &v, kHigh_GrSLPrecision); + varyingHandler->addVarying("CubicCoeffs", &v); vertBuilder->codeAppendf("%s = %s * float3(%s, 1);", v.vsOut(), devkLMMatrixName, gpArgs->fPositionVar.c_str()); GrGLSLVertToFrag gradCoeffs(kFloat4_GrSLType); if (kFillAA_GrProcessorEdgeType == fEdgeType || kHairlineAA_GrProcessorEdgeType == fEdgeType) { - varyingHandler->addVarying("GradCoeffs", &gradCoeffs, kHigh_GrSLPrecision); + varyingHandler->addVarying("GradCoeffs", &gradCoeffs); vertBuilder->codeAppendf("float k = %s[0], l = %s[1], m = %s[2];", v.vsOut(), v.vsOut(), v.vsOut()); vertBuilder->codeAppendf("float2 gk = float2(%s[0][0], %s[1][0]), " diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index 5ee5715b29..e1c733dfa1 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -645,7 +645,7 @@ public: &uv, &texIdx, &st); GrGLSLVertToFrag delta(kFloat_GrSLType); - varyingHandler->addVarying("Delta", &delta, kHigh_GrSLPrecision); + varyingHandler->addVarying("Delta", &delta); if (dfTexEffect.getFlags() & kBGR_DistanceFieldEffectFlag) { vertBuilder->codeAppendf("%s = -%s.x/3.0;", delta.vsOut(), atlasSizeInvName); } else { |