| Index: src/gpu/gl/GrGLProgramResourceManager.h
|
| diff --git a/src/gpu/gl/GrGLUniformManager.h b/src/gpu/gl/GrGLProgramResourceManager.h
|
| similarity index 88%
|
| rename from src/gpu/gl/GrGLUniformManager.h
|
| rename to src/gpu/gl/GrGLProgramResourceManager.h
|
| index 6137bcd9cc88806769b63cf1139feab103707d07..1ffdf32fa07337867281e4ee55912c2a5582e952 100644
|
| --- a/src/gpu/gl/GrGLUniformManager.h
|
| +++ b/src/gpu/gl/GrGLProgramResourceManager.h
|
| @@ -5,8 +5,8 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -#ifndef GrGLUniformManager_DEFINED
|
| -#define GrGLUniformManager_DEFINED
|
| +#ifndef GrGLProgramResourceManager_DEFINED
|
| +#define GrGLProgramResourceManager_DEFINED
|
|
|
| #include "gl/GrGLShaderVar.h"
|
| #include "gl/GrGLSL.h"
|
| @@ -17,9 +17,11 @@
|
| class GrGpuGL;
|
| class SkMatrix;
|
|
|
| -/** Manages a program's uniforms.
|
| -*/
|
| -class GrGLUniformManager : public SkRefCnt {
|
| +/** Manages the resources used by a shader program.
|
| + * The resources are objects the program uses to communicate with the
|
| + * application code.
|
| + */
|
| +class GrGLProgramResourceManager : public SkRefCnt {
|
| public:
|
| // Opaque handle to a uniform
|
| class UniformHandle {
|
| @@ -43,10 +45,10 @@ public:
|
| int toUniformIndex() const { SkASSERT(isValid()); return ~fValue; }
|
|
|
| int fValue;
|
| - friend class GrGLUniformManager; // For accessing toUniformIndex().
|
| + friend class GrGLProgramResourceManager; // For accessing toUniformIndex().
|
| };
|
|
|
| - GrGLUniformManager(GrGpuGL* gpu);
|
| + GrGLProgramResourceManager(GrGpuGL* gpu);
|
|
|
| UniformHandle appendUniform(GrSLType type, int arrayCount = GrGLShaderVar::kNonArray);
|
|
|
| @@ -96,7 +98,7 @@ public:
|
| /**
|
| * Called by the GrGLShaderBuilder to access the array by the handle (index).
|
| */
|
| - const BuilderUniform& getBuilderUniform(const BuilderUniformArray&, GrGLUniformManager::UniformHandle) const;
|
| + const BuilderUniform& getBuilderUniform(const BuilderUniformArray&, GrGLProgramResourceManager::UniformHandle) const;
|
|
|
| private:
|
| enum {
|
|
|