fix for winvdows nvpr

TBR=bsalomon@google.com
BUG=skia:

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

diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index e8ffc7b3a7880bbc34637b7f66aa034135a69ad2..b4a9cbef024fb9b60e99199097c2b7c2b95246db 100644 (file)
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -391,15 +391,11 @@ public:
                         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;

diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp
index 35c4b82c82f0c6ad2f4f27e026f0ddc57b9a0368..93f892d3b36c8d31701a27d88c8f1ab006a1164e 100644 (file)
--- a/src/gpu/gl/GrGLPathRendering.cpp
+++ b/src/gpu/gl/GrGLPathRendering.cpp
@@ -68,7 +68,6 @@ GrGLPathRendering::GrGLPathRendering(GrGLGpu* gpu)
         NULL != glInterface->fFunctions.fStencilThenCoverFillPathInstanced &&
         NULL != glInterface->fFunctions.fStencilThenCoverStrokePathInstanced;
     fCaps.fragmentInputGenSupport =
-        kGLES_GrGLStandard == glInterface->fStandard &&
         NULL != glInterface->fFunctions.fProgramPathFragmentInputGen;
     fCaps.glyphLoadingSupport =
         NULL != glInterface->fFunctions.fPathMemoryGlyphIndexArray;