diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 15:47:55 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 15:47:55 +0000 |
| commit | 115b06f3d51902a122621e897360ba80153527b3 (patch) | |
| tree | 82a6e178b304838e1a5e26d77c9476c547128f6e /src/gpu/gl/GrGLUniformManager.h | |
| parent | c3a58f345de16c185db3a20578c7ddf52bc89d38 (diff) | |
Re-revert r6233.
git-svn-id: http://skia.googlecode.com/svn/trunk@6239 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLUniformManager.h')
| -rw-r--r-- | src/gpu/gl/GrGLUniformManager.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLUniformManager.h b/src/gpu/gl/GrGLUniformManager.h index 8f435d3037..e9856c6ea3 100644 --- a/src/gpu/gl/GrGLUniformManager.h +++ b/src/gpu/gl/GrGLUniformManager.h @@ -15,7 +15,6 @@ #include "SkTArray.h" class GrGLContextInfo; -class SkMatrix; /** Manages a program's uniforms. */ @@ -48,9 +47,6 @@ public: void setMatrix3fv(UniformHandle, int offset, int arrayCount, const GrGLfloat matrices[]) const; void setMatrix4fv(UniformHandle, int offset, int arrayCount, const GrGLfloat matrices[]) const; - // convenience method for uploading a SkMatrix to a 3x3 matrix uniform - void setSkMatrix(UniformHandle, const SkMatrix&) const; - struct BuilderUniform { GrGLShaderVar fVariable; uint32_t fVisibility; |