diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-16 17:54:26 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-16 17:54:26 +0000 |
commit | 33c1f6b47bf7d58921b2e9d1ad526823cb5c204f (patch) | |
tree | 9c8545ed74af0ebfcc0318851cb7410768bec079 /src | |
parent | 9ba4fa6f0fb8ef496d81ccac36e780aa806fea83 (diff) |
Fix test break in r4627.
git-svn-id: http://skia.googlecode.com/svn/trunk@4628 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index b2b26fa3c8..4f549d05ac 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -992,15 +992,15 @@ void GrGLProgram::getUniformLocationsAndInitCache(const GrGLContextInfo& gl, 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); } |