| commit | 0982d35187da7e1ed6c0eba5951bbdadca8b33e7 | [log] [tgz] |
|---|---|---|
| author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jul 31 15:33:25 2012 +0000 |
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jul 31 15:33:25 2012 +0000 |
| tree | 91635ad9da0506b043a5eaf382d091deb2fce178 | |
| parent | bd5fa90dd12faf3aa5fe336907b71f9ad3bee7a6 [diff] [blame] |
Make 0-texture GrCustomStages work. Review URL: http://codereview.appspot.com/6448080/ git-svn-id: http://skia.googlecode.com/svn/trunk@4858 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index b6c224c..18d97d5 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h
@@ -276,10 +276,9 @@ struct StageUniforms { UniformHandle fTextureMatrixUni; - UniformHandle fSamplerUni; + SkTArray<UniformHandle, true> fSamplerUniforms; StageUniforms() { fTextureMatrixUni = GrGLUniformManager::kInvalidUniformHandle; - fSamplerUni = GrGLUniformManager::kInvalidUniformHandle; } };