| Index: src/gpu/gl/GrGLEffectMatrix.cpp
|
| diff --git a/src/gpu/gl/GrGLEffectMatrix.cpp b/src/gpu/gl/GrGLEffectMatrix.cpp
|
| index 523b37e72ee907d6adcb7c5ff5fc6ca72d059c96..437e6832c06984da3e66aa6e9dc413326d8a7aae 100644
|
| --- a/src/gpu/gl/GrGLEffectMatrix.cpp
|
| +++ b/src/gpu/gl/GrGLEffectMatrix.cpp
|
| @@ -189,8 +189,7 @@ void GrGLEffectMatrix::setData(const GrGLUniformManager& uniformManager,
|
| const SkMatrix& matrix,
|
| const GrDrawEffect& drawEffect,
|
| const GrTexture* texture) {
|
| - GrAssert((GrGLUniformManager::kInvalidUniformHandle == fUni) ==
|
| - (kVoid_GrSLType == fUniType));
|
| + GrAssert(fUni.isValid() != (kVoid_GrSLType == fUniType));
|
| const SkMatrix& coordChangeMatrix = GrEffect::kLocal_CoordsType == fCoordsType ?
|
| drawEffect.getCoordChangeMatrix() :
|
| SkMatrix::I();
|
|
|