diff options
author | joshualitt <joshualitt@chromium.org> | 2014-08-21 20:18:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-21 20:18:45 -0700 |
commit | 30ba436f04e61d4505fb854d5fc56079636e0788 (patch) | |
tree | 0a8756ce4f6df0364fb238ee0057b78863afa8a5 /src/gpu/gl/GrGLProgramDataManager.h | |
parent | c8c4b957288fd3114d60e3faa9bc95c4c15ca1f2 (diff) |
Initial refactor of shaderbuilder to prepare for geometry shaders
gitignore for eclipse
BUG=skia:
R=bsalomon@google.com, bsalomon@chromium.org
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/491673002
Diffstat (limited to 'src/gpu/gl/GrGLProgramDataManager.h')
-rw-r--r-- | src/gpu/gl/GrGLProgramDataManager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/gl/GrGLProgramDataManager.h index 8ef4a41fbc..3082f6f02b 100644 --- a/src/gpu/gl/GrGLProgramDataManager.h +++ b/src/gpu/gl/GrGLProgramDataManager.h @@ -17,7 +17,7 @@ class GrGpuGL; class SkMatrix; class GrGLProgram; -class GrGLShaderBuilder; +class GrGLProgramBuilder; /** Manages the resources used by a shader program. * The resources are objects the program uses to communicate with the @@ -51,10 +51,10 @@ public: int fValue; friend class GrGLProgramDataManager; // For accessing toProgramDataIndex(). - friend class GrGLShaderBuilder; // For accessing toShaderBuilderIndex(). + friend class GrGLProgramBuilder; // For accessing toShaderBuilderIndex(). }; - GrGLProgramDataManager(GrGpuGL*, GrGLProgram*, const GrGLShaderBuilder&); + GrGLProgramDataManager(GrGpuGL*, GrGLProgram*, const GrGLProgramBuilder&); /** Functions for uploading uniform values. The varities ending in v can be used to upload to an * array of uniforms. arrayCount must be <= the array count of the uniform. |