Index: src/gpu/gl/GrGLProgram.cpp |
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp |
index 0f4b70de2b235d8a8e4ca50eb6c73829fbeae208..fbcb074798677a257bafc0b8b2b5fce872952035 100644 |
--- a/src/gpu/gl/GrGLProgram.cpp |
+++ b/src/gpu/gl/GrGLProgram.cpp |
@@ -31,8 +31,10 @@ static SkMatrix get_transform_matrix(const GrPendingFragmentStage& stage, int tr |
const GrCoordTransform& coordTransform = stage.getProcessor()->coordTransform(transformIdx); |
SkMatrix combined; |
- if (kLocal_GrCoordSet == coordTransform.sourceCoords()) { |
- // If we have explicit local coords then we shouldn't need a coord change. |
+ if (kLocal_GrCoordSet == coordTransform.sourceCoords() || |
+ kDevice_GrCoordSet == coordTransform.sourceCoords()) { |
bsalomon
2014/12/17 19:45:28
backwards... don't apply ccm if using device coord
|
+ // If we have explicit local coords or are in device coords then we shouldn't need a coord |
+ // change. |
const SkMatrix& ccm = stage.getCoordChangeMatrix(); |
combined.setConcat(coordTransform.getMatrix(), ccm); |
} else { |