commit 9335c28e40d780b4d1920b6c442234e2e833f93b
author Ethan Nicholas <ethannicholas@google.com> Fri Aug 10 15:54:46 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 21 17:17:16 2018 +0000
tree 156d0b5e694f73433a2d90e54fdbd632a05f8c36
parent b85fc3bd1b3580c42a2d54bbf451b9b415900352

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>

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 9e90642..f033ffd 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -127,10 +127,13 @@
 void GrGLProgram::setRenderTargetState(const GrPrimitiveProcessor& primProc,
                                        const GrRenderTargetProxy* proxy) {
     GrRenderTarget* rt = proxy->peekRenderTarget();
-    // 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()));
+    // 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()));
     }
 
     // set RT adjustment