commit 96291dfa7054545327b34016882ca57f40a1fc81
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 20 16:17:03 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 20 16:17:03 2012 +0000
tree 432083986a6b9db94bc148f8f30d85d232364314
parent 80214e26c57c5fea954006400852e8999e201923

Remove assertion when texture matrix is unused

Review URL: http://codereview.appspot.com/6420054/


git-svn-id: http://skia.googlecode.com/svn/trunk@4693 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 52a4bd3..8c1f4f7 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -1032,7 +1032,8 @@
                 tex_matrix_name(s, &texMName);
                 GL_CALL_RET(locations.fTextureMatrixUni,
                             GetUniformLocation(fProgramID, texMName.c_str()));
-                GrAssert(kUnusedUniform != locations.fTextureMatrixUni);
+                //color filter table effect does not consumer coords gen'ed by matrix.
+                //GrAssert(kUnusedUniform != locations.fTextureMatrixUni);
             }
 
             if (kUseUniform == locations.fSamplerUni) {