diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-02-02 10:43:58 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-02 18:34:02 +0000 |
| commit | cae3a4c8ab7082df009a1e340f10292350e0c763 (patch) | |
| tree | 93b73dca6a37d1241a0ecc8819fdc3cf23f64cb0 /tests | |
| parent | ebfbba9bbdacd754c8ad7429ee066f53f17bc66b (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageStorageTest.cpp | 4 | ||||
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp index aa34831d1e..20c9713745 100644 --- a/tests/ImageStorageTest.cpp +++ b/tests/ImageStorageTest.cpp @@ -31,6 +31,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageStorageLoad, reporter, ctxInfo) { : INHERITED(kNone_OptimizationFlags) , fImageStorageAccess(std::move(texture), kRead_GrIOType, mm, restrict) { this->initClassID<TestFP>(); + this->setWillReadFragmentPosition(); this->addImageStorageAccess(&fImageStorageAccess); } @@ -50,7 +51,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageStorageLoad, reporter, ctxInfo) { 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())) { diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index c28dbbb7f3..a33e6f16e6 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -418,13 +418,4 @@ DEF_TEST(SkSLDivByZero, r) { "error: 1: division by zero\n1 error\n"); } -DEF_TEST(SkSLUnsupportedGLSLIdentifiers, r) { - test_failure(r, - "void main() { float x = gl_FragCoord.x; };", - "error: 1: unknown identifier 'gl_FragCoord'\n1 error\n"); - test_failure(r, - "void main() { float r = gl_FragColor.r; };", - "error: 1: unknown identifier 'gl_FragColor'\n1 error\n"); -} - #endif |