commit bfb459d880e4d82e69e8f77f0143665669b9527f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 25 18:13:32 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 25 18:13:32 2012 +0000
tree 30dc64b8bbf44037830b93a9fd33651bb9ea148a
parent b9119a6b563bf737e34d22f8bb96fc09a606c76f

Disable unused uniform assert due to texture matrices being crammed down stage's throats



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

src/gpu/gl/GrGLUniformManager.cpp

diff --git a/src/gpu/gl/GrGLUniformManager.cpp b/src/gpu/gl/GrGLUniformManager.cpp
index 1625ebb..180286b 100644
--- a/src/gpu/gl/GrGLUniformManager.cpp
+++ b/src/gpu/gl/GrGLUniformManager.cpp
@@ -167,7 +167,8 @@
     const Uniform& uni = fUniforms[handle_to_index(u)];
     GrAssert(uni.fType == kMat33f_GrSLType);
     GrAssert(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    GrAssert(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
+    // TODO: Re-enable this assert once texture matrices aren't forced on all custom effects
+    // GrAssert(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
     if (kUnusedUniform != uni.fFSLocation) {
         GR_GL_CALL(fContext.interface(), UniformMatrix3fv(uni.fFSLocation, 1, false, matrix));
     }