Index: src/gpu/gl/GrGLEffectMatrix.cpp |
=================================================================== |
--- src/gpu/gl/GrGLEffectMatrix.cpp (revision 11179) |
+++ src/gpu/gl/GrGLEffectMatrix.cpp (working copy) |
@@ -58,6 +58,7 @@ |
switch (key & kMatrixTypeKeyMask) { |
case kIdentity_MatrixType: |
fUniType = kVoid_GrSLType; |
+ uniName = NULL; |
varyingType = kVec2f_GrSLType; |
break; |
case kTrans_MatrixType: |
@@ -79,12 +80,12 @@ |
GrCrash("Unexpected key."); |
} |
SkString suffixedUniName; |
- if (NULL != suffix) { |
- suffixedUniName.append(uniName); |
- suffixedUniName.append(suffix); |
- uniName = suffixedUniName.c_str(); |
- } |
if (kVoid_GrSLType != fUniType) { |
+ if (NULL != suffix) { |
+ suffixedUniName.append(uniName); |
+ suffixedUniName.append(suffix); |
+ uniName = suffixedUniName.c_str(); |
+ } |
fUni = builder->addUniform(GrGLShaderBuilder::kVertex_Visibility, |
fUniType, |
uniName, |