| Index: src/gpu/gl/builders/GrGLProgramBuilder.h
|
| diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| index 973ae5e07820a1e24cb228980983f4d0500d8c44..b7458b3e8fb8b850f728fc6530e5053d901cbcd3 100644
|
| --- a/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| @@ -30,9 +30,9 @@
|
| class GrGLUniformBuilder {
|
| public:
|
| enum ShaderVisibility {
|
| - kVertex_Visibility = 0x1,
|
| - kGeometry_Visibility = 0x2,
|
| - kFragment_Visibility = 0x4,
|
| + kVertex_Visibility = 1 << kVertex_GrShaderType,
|
| + kGeometry_Visibility = 1 << kGeometry_GrShaderType,
|
| + kFragment_Visibility = 1 << kFragment_GrShaderType,
|
| };
|
|
|
| virtual ~GrGLUniformBuilder() {}
|
| @@ -344,12 +344,6 @@ protected:
|
| SkString fSourceCoords;
|
| };
|
|
|
| - void addCoordVarying(const char* name, GrGLVarying* v, const char* uniName,
|
| - const char* sourceCoords) {
|
| - this->addVarying(name, v);
|
| - fCoordVaryings.push_back(TransformVarying(*v, uniName, sourceCoords));
|
| - }
|
| -
|
| const char* rtAdjustment() const { return "rtAdjustment"; }
|
|
|
| // number of each input/output type in a single allocation block, used by many builders
|
|
|