| Index: src/gpu/glsl/GrGLSLProgramBuilder.h
|
| diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| index 4f3f8a5291a3cfb6c73cb951cda1fc06b3f5ac0c..e87ab0aee93d37fee610f90e15467346ee54e724 100644
|
| --- a/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| @@ -65,8 +65,6 @@ public:
|
| */
|
| virtual const char* getUniformCStr(UniformHandle u) const = 0;
|
|
|
| - virtual const GrGLSLCaps* glslCaps() const = 0;
|
| -
|
| /*
|
| * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
|
| */
|
| @@ -193,6 +191,8 @@ class GrGLSLProgramBuilder : public GrGLSLGPBuilder,
|
| public:
|
| typedef GrGpu::DrawArgs DrawArgs;
|
|
|
| + virtual const GrGLSLCaps* glslCaps() const = 0;
|
| +
|
| // Handles for program uniforms (other than per-effect uniforms)
|
| struct BuiltinUniformHandles {
|
| UniformHandle fRTAdjustmentUni;
|
|
|