From 33c1f6b47bf7d58921b2e9d1ad526823cb5c204f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 16 Jul 2012 17:54:26 +0000 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index b2b26fa3c..4f549d05a 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); }