diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-01-13 17:05:03 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-13 17:05:03 -0800 |
| commit | 31b52b7c64f51f215cbb18f0cd0f2305d8a94c09 (patch) | |
| tree | 765ec3ec72816ad40decca673c2d396a07ef7617 /src | |
| parent | abb52a1a70a81915c6196e0fb3e9bcb05e8be14d (diff) | |
fix for winvdows nvpr
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/804023005
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrGeometryProcessor.cpp | 12 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLPathRendering.cpp | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp index e8ffc7b3a7..b4a9cbef02 100644 --- 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 35c4b82c82..93f892d3b3 100644 --- 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; |