commit 33c1f6b47bf7d58921b2e9d1ad526823cb5c204f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 16 17:54:26 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 16 17:54:26 2012 +0000
tree 9c8545ed74af0ebfcc0318851cb7410768bec079
parent 9ba4fa6f0fb8ef496d81ccac36e780aa806fea83

Fix test break in r4627.



git-svn-id: http://skia.googlecode.com/svn/trunk@4628 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 b2b26fa..4f549d0 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -992,15 +992,15 @@
     if (kUseUniform == fUniLocations.fColorMatrixUni) {
         GL_CALL_RET(fUniLocations.fColorMatrixUni,
                     GetUniformLocation(fProgramID, COL_MATRIX_UNI_NAME));
-        GrAssert(kUnusedUniform != fUniLocations.fColorMatrixUni);
     }
 
     if (kUseUniform == fUniLocations.fColorMatrixVecUni) {
         GL_CALL_RET(fUniLocations.fColorMatrixVecUni,
                     GetUniformLocation(fProgramID, COL_MATRIX_VEC_UNI_NAME));
-        GrAssert(kUnusedUniform != fUniLocations.fColorMatrixVecUni);
     }
+
     if (kUseUniform == fUniLocations.fCoverageUni) {
+        GL_CALL_RET(fUniLocations.fCoverageUni,GetUniformLocation(fProgramID, COV_UNI_NAME));
         GrAssert(kUnusedUniform != fUniLocations.fCoverageUni);
     }