commit 31b52b7c64f51f215cbb18f0cd0f2305d8a94c09
author joshualitt <joshualitt@chromium.org> Tue Jan 13 17:05:03 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 13 17:05:03 2015 -0800
tree 765ec3ec72816ad40decca673c2d396a07ef7617
parent abb52a1a70a81915c6196e0fb3e9bcb05e8be14d

fix for winvdows nvpr

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/804023005

src/gpu/GrGeometryProcessor.cpp

diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index e8ffc7b..b4a9cbe 100644
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -391,15 +391,11 @@
                         coordTransforms[t]->getMatrix().hasPerspective() ? kVec3f_GrSLType :
                                                                            kVec2f_GrSLType;
 
-                const char* varyingName = "MatrixCoord";
-                SkString suffixedVaryingName;
-                if (0 != t) {
-                    suffixedVaryingName.append(varyingName);
-                    suffixedVaryingName.appendf("_%i", t);
-                    varyingName = suffixedVaryingName.c_str();
-                }
+
+                SkString strVaryingName("MatrixCoord");
+                strVaryingName.appendf("_%i_%i", i, t);
                 GrGLVertToFrag v(varyingType);
-                pb->addVarying(varyingName, &v);
+                pb->addVarying(strVaryingName.c_str(), &v);
                 SeparableVaryingInfo& varyingInfo = fSeparableVaryingInfos.push_back();
                 varyingInfo.fVariable = pb->getFragmentShaderBuilder()->fInputs.back();
                 varyingInfo.fLocation = fSeparableVaryingInfos.count() - 1;