commit e6ab998bc2e675ab0a426ec9434be887e5527ab3
author Greg Daniel <egdaniel@google.com> Wed Aug 22 13:56:32 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 22 13:56:37 2018 +0000
tree b66c501e8b43878f892589e556a7d3e7e8560cbf
parent 13df9817f82aca698a1b78f8924f11a4deaaa886

Revert "added support for sk_Dimensions to SkSL"

This reverts commit 9335c28e40d780b4d1920b6c442234e2e833f93b.

Reason for revert: breaking vulkan and maybe metal in gold

Original change's description:
> added support for sk_Dimensions to SkSL
> 
> Bug: skia:
> Change-Id: I5f6a9941822b7b4a3ad85b22b1bcd31d58320f90
> Reviewed-on: https://skia-review.googlesource.com/146640
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

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

Change-Id: I5e9dcfffd118ef125afb7b7792f16cb51dd779a3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/148680
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index f033ffd..9e90642 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -127,13 +127,10 @@
 void GrGLProgram::setRenderTargetState(const GrPrimitiveProcessor& primProc,
                                        const GrRenderTargetProxy* proxy) {
     GrRenderTarget* rt = proxy->peekRenderTarget();
-    // Load the RT dimension uniform if it is needed
-    if (fBuiltinUniformHandles.fRTDimensionsUni.isValid() &&
-        (fRenderTargetState.fRenderTargetSize.fWidth != rt->width() ||
-         fRenderTargetState.fRenderTargetSize.fHeight != rt->height())) {
-        fProgramDataManager.set2f(fBuiltinUniformHandles.fRTDimensionsUni,
-                                  SkIntToScalar(rt->width()),
-                                  SkIntToScalar(rt->height()));
+    // Load the RT height uniform if it is needed to y-flip gl_FragCoord.
+    if (fBuiltinUniformHandles.fRTHeightUni.isValid() &&
+        fRenderTargetState.fRenderTargetSize.fHeight != rt->height()) {
+        fProgramDataManager.set1f(fBuiltinUniformHandles.fRTHeightUni, SkIntToScalar(rt->height()));
     }
 
     // set RT adjustment