commit cae3a4c8ab7082df009a1e340f10292350e0c763
author Ethan Nicholas <ethannicholas@google.com> Thu Feb 02 10:43:58 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 02 18:34:02 2017 +0000
tree 93b73dca6a37d1241a0ecc8819fdc3cf23f64cb0
parent ebfbba9bbdacd754c8ad7429ee066f53f17bc66b

Revert "Replaced all calls to fragmentPosition() with sk_FragCoord"

This reverts commit de4d301881e7fd084f1f0b359ec6f9b2bf8bd4c5.

Reason for revert: several Chrome rendering bugs on Mac

BUG=skia:

Change-Id: I492082b0b7e7c902ede4b598c5809f604d210ce1
Reviewed-on: https://skia-review.googlesource.com/7887
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

tests/ImageStorageTest.cpp

diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp
index aa34831..20c9713 100644
--- a/tests/ImageStorageTest.cpp
+++ b/tests/ImageStorageTest.cpp
@@ -31,6 +31,7 @@
                 : INHERITED(kNone_OptimizationFlags)
                 , fImageStorageAccess(std::move(texture), kRead_GrIOType, mm, restrict) {
             this->initClassID<TestFP>();
+            this->setWillReadFragmentPosition();
             this->addImageStorageAccess(&fImageStorageAccess);
         }
 
@@ -50,7 +51,8 @@
                     const TestFP& tfp = args.fFp.cast<TestFP>();
                     GrGLSLFPFragmentBuilder* fb = args.fFragBuilder;
                     SkString imageLoadStr;
-                    fb->codeAppend("highp vec2 coord = sk_FragCoord.xy;");
+                    fb->codeAppendf("highp vec2 coord = %s.xy;",
+                                    args.fFragBuilder->fragmentPosition());
                     fb->appendImageStorageLoad(&imageLoadStr, args.fImageStorages[0],
                                                "ivec2(coord)");
                     if (GrPixelConfigIsSint(tfp.fImageStorageAccess.texture()->config())) {