diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-06-02 11:01:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-02 19:44:18 +0000 |
| commit | e23bffd65b379aeeb6bb614de81369c130623e92 (patch) | |
| tree | 7ed966359438344027ffd20d58b5afdb4bb5b3fe /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| parent | 219b4e81db683d943da0261438bfdc6139d8f061 (diff) | |
Remove support in GPU backend for distance vector field.
Also, remvoes SkNormalBevelSource as this was the last use case for the distance vector field.
Change-Id: Ib0176c78e500e6b5130310934253a75860245812
Reviewed-on: https://skia-review.googlesource.com/18482
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 337ee6d0ea..0d87c4f5a2 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -76,17 +76,6 @@ void GrGLSLProgramBuilder::emitAndInstallPrimProc(const GrPrimitiveProcessor& pr this->nameExpression(outputColor, "outputColor"); this->nameExpression(outputCoverage, "outputCoverage"); - const char* distanceVectorName = nullptr; - if (this->fPipeline.usesDistanceVectorField() && proc.implementsDistanceVector()) { - // Each individual user (FP) of the distance vector must be able to handle having this - // variable be undeclared. There is no single default value that will yield a reasonable - // result for all users. - distanceVectorName = fFS.distanceVectorName(); - fFS.codeAppend( "// Normalized vector to the closest geometric edge (in device space)\n"); - fFS.codeAppend( "// Distance to the edge encoded in the z-component\n"); - fFS.codeAppendf("vec4 %s;", distanceVectorName); - } - SkASSERT(!fUniformHandles.fRTAdjustmentUni.isValid()); GrShaderFlags rtAdjustVisibility = kVertex_GrShaderFlag; if (proc.willUseGeoShader()) { @@ -124,7 +113,6 @@ void GrGLSLProgramBuilder::emitAndInstallPrimProc(const GrPrimitiveProcessor& pr proc, outputColor->c_str(), outputCoverage->c_str(), - distanceVectorName, rtAdjustName, texSamplers.begin(), texelBuffers.begin(), @@ -199,8 +187,7 @@ SkString GrGLSLProgramBuilder::emitAndInstallFragProc(const GrFragmentProcessor& coords, textureSamplers, texelBuffers, - imageStorages, - this->primitiveProcessor().implementsDistanceVector()); + imageStorages); fragProc->emitCode(args); |