| Index: src/gpu/gl/builders/GrGLProgramBuilder.h
|
| diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| index 76f7ae97c37df5c5091712cb75767da81e6b84bc..fd21ef11e5de92f9bad013118adaab921d2fde55 100644
|
| --- a/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
|
| @@ -186,7 +186,10 @@ public:
|
| * to be used.
|
| * @return true if generation was successful.
|
| */
|
| - static GrGLProgram* CreateProgram(const GrOptDrawState&, GrGpu::DrawType, GrGpuGL*);
|
| + static GrGLProgram* CreateProgram(const GrOptDrawState&,
|
| + const GrProgramDesc&,
|
| + GrGpu::DrawType,
|
| + GrGpuGL*);
|
|
|
| virtual UniformHandle addUniform(uint32_t visibility,
|
| GrSLType type,
|
| @@ -246,11 +249,12 @@ protected:
|
| typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
|
|
|
| static GrGLProgramBuilder* CreateProgramBuilder(const GrOptDrawState&,
|
| + const GrProgramDesc&,
|
| GrGpu::DrawType,
|
| bool hasGeometryProcessor,
|
| GrGpuGL*);
|
|
|
| - GrGLProgramBuilder(GrGpuGL*, const GrOptDrawState&);
|
| + GrGLProgramBuilder(GrGpuGL*, const GrOptDrawState&, const GrProgramDesc&);
|
|
|
| const GrOptDrawState& optState() const { return fOptState; }
|
| const GrProgramDesc& desc() const { return fDesc; }
|
|
|