commit 2ebd0c80a2a9d90a2c2c653f40a2a7205bd2d31b
author Brian Salomon <bsalomon@google.com> Mon Oct 03 17:15:28 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 03 21:39:33 2016 +0000
tree 1baafac8edfb1d5d51e9ea53b176b95506e809cd
parent 2cbcd12281ee807214df094964c584c78932e10b

Remove option to make GrCoordTransforms apply to device positions.

Adds a device space texture decal effect to use for clipping.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2870

Change-Id: Ifcc7617ea87f5a86e301995cba9dfc30a4b0e2c5
Reviewed-on: https://skia-review.googlesource.com/2870
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
index 5ae28a0..24f21ff 100644
--- a/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
@@ -15,12 +15,7 @@
 SkMatrix GrGLSLPrimitiveProcessor::GetTransformMatrix(const SkMatrix& localMatrix,
                                                       const GrCoordTransform& coordTransform) {
     SkMatrix combined;
-    // We only apply the localmatrix to localcoords
-    if (kLocal_GrCoordSet == coordTransform.sourceCoords()) {
-        combined.setConcat(coordTransform.getMatrix(), localMatrix);
-    } else {
-        combined = coordTransform.getMatrix();
-    }
+    combined.setConcat(coordTransform.getMatrix(), localMatrix);
     if (coordTransform.reverseY()) {
         // combined.postScale(1,-1);
         // combined.postTranslate(0,1);