commit 587e08f361ee3e775a6bbc6dca761dbba82e422c
author Brian Salomon <bsalomon@google.com> Fri Jan 27 10:59:27 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 27 16:43:38 2017 +0000
tree 9f64e10d50fab820419d29dea30a6c978c86c8c9
parent 4d3adb6b0dea1c9f74fc00b007dfb1af425fc727

Revert "Revert "Start of rewrite of GrFragmentProcessor optimizations.""

This reverts commit 052fd5158f7f85e478a9f87c45fecaacf7d0f5f3.

Disables the test (of unused code) until platform-specific issues are addressed.

Change-Id: I7aa23a07954fccf382aa07d28afcbffb0bebcd6d
Reviewed-on: https://skia-review.googlesource.com/7656
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/ImageStorageTest.cpp

diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp
index 59d134d..aa34831 100644
--- a/tests/ImageStorageTest.cpp
+++ b/tests/ImageStorageTest.cpp
@@ -28,7 +28,8 @@
 
     private:
         TestFP(sk_sp<GrTexture> texture, GrSLMemoryModel mm, GrSLRestrict restrict)
-                : fImageStorageAccess(std::move(texture), kRead_GrIOType, mm, restrict) {
+                : INHERITED(kNone_OptimizationFlags)
+                , fImageStorageAccess(std::move(texture), kRead_GrIOType, mm, restrict) {
             this->initClassID<TestFP>();
             this->addImageStorageAccess(&fImageStorageAccess);
         }
@@ -73,6 +74,7 @@
         }
 
         ImageStorageAccess fImageStorageAccess;
+        typedef GrFragmentProcessor INHERITED;
     };
 
     static constexpr int kS = 256;