| Index: src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
|
| diff --git a/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp b/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
|
| index 73c0fcd81e1d4d5fa0027977994e30bd582a49f3..be6dcfe33b738b2a0b865015353aef46f8b248c4 100644
|
| --- a/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
|
| +++ b/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "GrGLSLVertexShaderBuilder.h"
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
| +#include "glsl/GrGLSLUniformHandler.h"
|
| #include "glsl/GrGLSLVarying.h"
|
|
|
| GrGLSLVertexBuilder::GrGLSLVertexBuilder(GrGLSLProgramBuilder* program)
|
| @@ -14,7 +15,8 @@ GrGLSLVertexBuilder::GrGLSLVertexBuilder(GrGLSLProgramBuilder* program)
|
| , fRtAdjustName(nullptr) {
|
| }
|
|
|
| -void GrGLSLVertexBuilder::transformToNormalizedDeviceSpace(const GrShaderVar& posVar) {
|
| +void GrGLSLVertexBuilder::transformToNormalizedDeviceSpace(GrGLSLUniformHandler* uniformHandler,
|
| + const GrShaderVar& posVar) {
|
| SkASSERT(!fRtAdjustName);
|
|
|
| GrSLPrecision precision = kDefault_GrSLPrecision;
|
| @@ -23,11 +25,9 @@ void GrGLSLVertexBuilder::transformToNormalizedDeviceSpace(const GrShaderVar& po
|
| }
|
|
|
| // setup RT Uniform
|
| - fProgramBuilder->fUniformHandles.fRTAdjustmentUni =
|
| - fProgramBuilder->addUniform(GrGLSLProgramBuilder::kVertex_Visibility,
|
| - kVec4f_GrSLType, precision,
|
| - fProgramBuilder->rtAdjustment(),
|
| - &fRtAdjustName);
|
| + uniformHandler->addRTAdjustmentUniform(precision,
|
| + fProgramBuilder->rtAdjustment(),
|
| + &fRtAdjustName);
|
| if (this->getProgramBuilder()->desc().header().fSnapVerticesToPixelCenters) {
|
| if (kVec3f_GrSLType == posVar.getType()) {
|
| const char* p = posVar.c_str();
|
|
|