| Index: src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| index 122db10ec99ba0d4a8aa4cd6cf0cd4199d93c55a..e6ca9b986a7e6185420198f2cdbe8b226a7336f5 100644
|
| --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| @@ -10,6 +10,7 @@
|
| #include "glsl/GrGLSL.h"
|
| #include "glsl/GrGLSLCaps.h"
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
| +#include "glsl/GrGLSLUniformHandler.h"
|
| #include "glsl/GrGLSLVarying.h"
|
|
|
| const char* GrGLSLFragmentShaderBuilder::kDstTextureColorName = "_dstColor";
|
| @@ -136,15 +137,9 @@ const char* GrGLSLFragmentShaderBuilder::fragmentPosition() {
|
| static const char* kTempName = "tmpXYFragCoord";
|
| static const char* kCoordName = "fragCoordYDown";
|
| if (!fSetupFragPosition) {
|
| - SkASSERT(!fProgramBuilder->fUniformHandles.fRTHeightUni.isValid());
|
| const char* rtHeightName;
|
|
|
| - fProgramBuilder->fUniformHandles.fRTHeightUni =
|
| - fProgramBuilder->addFragPosUniform(GrGLSLProgramBuilder::kFragment_Visibility,
|
| - kFloat_GrSLType,
|
| - kDefault_GrSLPrecision,
|
| - "RTHeight",
|
| - &rtHeightName);
|
| + fProgramBuilder->uniformHandler()->addRTHeightUniform("RTHeight", &rtHeightName);
|
|
|
| // The Adreno compiler seems to be very touchy about access to "gl_FragCoord".
|
| // Accessing glFragCoord.zw can cause a program to fail to link. Additionally,
|
| @@ -156,7 +151,6 @@ const char* GrGLSLFragmentShaderBuilder::fragmentPosition() {
|
| this->codePrependf("vec2 %s = gl_FragCoord.xy;", kTempName);
|
| fSetupFragPosition = true;
|
| }
|
| - SkASSERT(fProgramBuilder->fUniformHandles.fRTHeightUni.isValid());
|
| return kCoordName;
|
| }
|
| }
|
|
|