commit 47be94abd132307fbc82d087108ade58f86c82da
author Brian Salomon <bsalomon@google.com> Thu Dec 06 15:50:29 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 06 15:50:36 2018 +0000
tree c47fcf9eb72c3797148f3698d87948e218453f93
parent 69e5785d9f00f08513423833a39cbb8d5e35a72e

Revert "Use unnormalized coords all the way through with GL_TEXTURE_RECTANGLE textures."

This reverts commit 10273c1d5fe18f41a62c5ff4faf8bbdb5d5656cc.

Reason for revert: bad gms

Original change's description:
> Use unnormalized coords all the way through with GL_TEXTURE_RECTANGLE textures.
> 
> We used to unnormalize them in the shader via SkSL.
> 
> This allows us to support GL_TEXTURE_RECTANGLE without having textureSize()
> available in GLSL.
> 
> Change-Id: Ibe63a302228811933ef000251db4cad9aaf4f2ea
> Reviewed-on: https://skia-review.googlesource.com/c/174068
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,brianosman@google.com

Change-Id: I9bf38e1040578becba28ac8cccd81e2af2844278
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/175252
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
index 8e6099e..fb6e7f2 100644
--- a/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
@@ -24,26 +24,14 @@
     }
 
     if (coordTransform.reverseY()) {
-        if (coordTransform.normalize()) {
-            // combined.postScale(1,-1);
-            // combined.postTranslate(0,1);
-            combined.set(SkMatrix::kMSkewY,
-                         combined[SkMatrix::kMPersp0] - combined[SkMatrix::kMSkewY]);
-            combined.set(SkMatrix::kMScaleY,
-                         combined[SkMatrix::kMPersp1] - combined[SkMatrix::kMScaleY]);
-            combined.set(SkMatrix::kMTransY,
-                         combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
-        } else {
-            // combined.postScale(1, -1);
-            // combined.postTranslate(0,1);
-            SkScalar h = coordTransform.peekTexture()->height();
-            combined.set(SkMatrix::kMSkewY,
-                         h * combined[SkMatrix::kMPersp0] - combined[SkMatrix::kMSkewY]);
-            combined.set(SkMatrix::kMScaleY,
-                         h * combined[SkMatrix::kMPersp1] - combined[SkMatrix::kMScaleY]);
-            combined.set(SkMatrix::kMTransY,
-                         h * combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
-        }
+        // combined.postScale(1,-1);
+        // combined.postTranslate(0,1);
+        combined.set(SkMatrix::kMSkewY,
+            combined[SkMatrix::kMPersp0] - combined[SkMatrix::kMSkewY]);
+        combined.set(SkMatrix::kMScaleY,
+            combined[SkMatrix::kMPersp1] - combined[SkMatrix::kMScaleY]);
+        combined.set(SkMatrix::kMTransY,
+            combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
     }
     return combined;
 }