| Index: src/gpu/gl/GrGLProgramDataManager.cpp
|
| diff --git a/src/gpu/gl/GrGLProgramDataManager.cpp b/src/gpu/gl/GrGLProgramDataManager.cpp
|
| index f0aba497201b3de3ef881bb6c48e28c4dc86a0e7..54ca73a205c694bab8fae3948ca0509a20a28cd2 100644
|
| --- a/src/gpu/gl/GrGLProgramDataManager.cpp
|
| +++ b/src/gpu/gl/GrGLProgramDataManager.cpp
|
| @@ -8,6 +8,7 @@
|
| #include "SkMatrix.h"
|
| #include "gl/GrGLProgramDataManager.h"
|
| #include "gl/GrGLGpu.h"
|
| +#include "glsl/GrGLSLUniformHandler.h"
|
|
|
| #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \
|
| SkASSERT(arrayCount <= uni.fArrayCount || \
|
| @@ -31,12 +32,12 @@ GrGLProgramDataManager::GrGLProgramDataManager(GrGLGpu* gpu, GrGLuint programID,
|
| );
|
| // TODO: Move the Xoom uniform array in both FS and VS bug workaround here.
|
|
|
| - if (GrGLProgramBuilder::kVertex_Visibility & builderUniform.fVisibility) {
|
| + if (GrGLSLUniformHandler::kVertex_Visibility & builderUniform.fVisibility) {
|
| uniform.fVSLocation = builderUniform.fLocation;
|
| } else {
|
| uniform.fVSLocation = kUnusedUniform;
|
| }
|
| - if (GrGLProgramBuilder::kFragment_Visibility & builderUniform.fVisibility) {
|
| + if (GrGLSLUniformHandler::kFragment_Visibility & builderUniform.fVisibility) {
|
| uniform.fFSLocation = builderUniform.fLocation;
|
| } else {
|
| uniform.fFSLocation = kUnusedUniform;
|
|
|