| Index: src/gpu/gl/GrGLProgram.h
|
| diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
|
| index 9c5ab73ca4b0ce6b976c2936c8341c302d55e984..dc64a70d26de27f92fefa3c3504aef80317e56f4 100644
|
| --- a/src/gpu/gl/GrGLProgram.h
|
| +++ b/src/gpu/gl/GrGLProgram.h
|
| @@ -13,6 +13,7 @@
|
| #include "GrGLProgramDesc.h"
|
| #include "GrGLTexture.h"
|
| #include "GrGLProgramDataManager.h"
|
| +#include "glsl/GrGLSLProgramDataManager.h"
|
|
|
| #include "SkString.h"
|
| #include "SkXfermode.h"
|
| @@ -74,7 +75,7 @@ public:
|
| * pos.x = dot(v.xy, pos.xz)
|
| * pos.y = dot(v.zw, pos.yz)
|
| */
|
| - void getRTAdjustmentVec(GrGLfloat* destVec) {
|
| + void getRTAdjustmentVec(float* destVec) {
|
| destVec[0] = 2.f / fRenderTargetSize.fWidth;
|
| destVec[1] = -1.f;
|
| if (kBottomLeft_GrSurfaceOrigin == fRenderTargetOrigin) {
|
| @@ -97,7 +98,7 @@ public:
|
| SkTArray<const GrTextureAccess*>* textureBindings);
|
|
|
| protected:
|
| - typedef GrGLProgramDataManager::UniformHandle UniformHandle;
|
| + typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
|
| typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
|
| typedef GrGLProgramDataManager::SeparableVaryingInfoArray SeparableVaryingInfoArray;
|
|
|
|
|