| Index: src/gpu/glsl/GrGLSLProgramBuilder.h
|
| diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| index fae8df0e978a9e060a13f97d6cc5b4e78ee7a8c4..164423cce9cc4ec88d0d1646cd2d7253a4021e62 100644
|
| --- a/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| @@ -28,7 +28,6 @@ typedef SkSTArray<8, GrGLSLFragmentProcessor*, true> GrGLSLFragProcs;
|
| class GrGLSLProgramBuilder {
|
| public:
|
| typedef GrGpu::DrawArgs DrawArgs;
|
| - typedef GrGLSLUniformHandler::ShaderVisibility ShaderVisibility;
|
| typedef GrGLSLUniformHandler::UniformHandle UniformHandle;
|
|
|
| virtual ~GrGLSLProgramBuilder() {}
|
| @@ -41,7 +40,7 @@ public:
|
| const GrProgramDesc& desc() const { return *fArgs.fDesc; }
|
| const GrProgramDesc::KeyHeader& header() const { return fArgs.fDesc->header(); }
|
|
|
| - void appendUniformDecls(ShaderVisibility, SkString*) const;
|
| + void appendUniformDecls(GrShaderFlags visibility, SkString*) const;
|
|
|
| // Handles for program uniforms (other than per-effect uniforms)
|
| struct BuiltinUniformHandles {
|
|
|