Index: src/gpu/gl/GrGLProgram.h |
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h |
index 73a32395a29b501fc29f103d2b7a29ad531bfb51..18f29d3b20221ebb7502eaababd61d88240b506e 100644 |
--- a/src/gpu/gl/GrGLProgram.h |
+++ b/src/gpu/gl/GrGLProgram.h |
@@ -15,7 +15,7 @@ |
#include "GrGLShaderBuilder.h" |
#include "GrGLSL.h" |
#include "GrGLTexture.h" |
-#include "GrGLUniformManager.h" |
+#include "GrGLProgramResourceManager.h" |
#include "SkString.h" |
#include "SkXfermode.h" |
@@ -162,11 +162,11 @@ public: |
SharedGLState*); |
private: |
- typedef GrGLUniformManager::UniformHandle UniformHandle; |
+ typedef GrGLProgramResourceManager::UniformHandle UniformHandle; |
GrGLProgram(GrGpuGL*, |
const GrGLProgramDesc&, |
- GrGLUniformManager*, |
+ GrGLProgramResourceManager*, |
const GrGLShaderBuilder::GenProgramOutput&); |
// Sets the texture units for samplers. |
@@ -194,7 +194,7 @@ private: |
GrGLProgramDesc fDesc; |
GrGpuGL* fGpu; |
- SkAutoTUnref<GrGLUniformManager> fUniformManager; |
+ SkAutoTUnref<GrGLProgramResourceManager> fProgramResourceManager; |
typedef SkRefCnt INHERITED; |
}; |