commit 5efd5ea4e146c47394d16c8b6f876264822a0bee
author Robert Phillips <robertphillips@google.com> Tue May 30 13:47:32 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 31 17:00:22 2017 +0000
tree 81bff3047ae76431524c75bd9d351171b5fe50e5
parent bef2852a8ca0c2dccd9500857a03208d39e3d4f7

Update clearOp for split-OpList world (take 3)

It would reduce a lot of noise if the GrRenderTargetOpList kept a pointer to the GrCaps but, for now, I'm trying to shrink the GrRTOpList, not expand it.

Reland of: https://skia-review.googlesource.com/c/17323/ (Update clearOp for split-OpList world)

Change-Id: Ia61ce4d6ce245380fc9651928a46c22039fc12cf
Reviewed-on: https://skia-review.googlesource.com/18026
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrProcessor.cpp

diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 17927f6..0bce078 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -184,6 +184,8 @@
         }
     }
 
+    // MDB TODO: instantiate 'fBufferAccesses' here as well
+
     for (const auto& imageStorage : fImageStorageAccesses) {
         if (!imageStorage->instantiate(resourceProvider)) {
             return false;
@@ -279,14 +281,14 @@
                                                               GrSLRestrict restrict,
                                                               GrShaderFlags visibility)
         : fProxyRef(std::move(proxy), ioType) {
-    SkASSERT(fProxyRef.getProxy());
+    SkASSERT(fProxyRef.get());
 
     fMemoryModel = memoryModel;
     fRestrict = restrict;
     fVisibility = visibility;
     // We currently infer this from the config. However, we could allow the client to specify
     // a format that is different but compatible with the config.
-    switch (fProxyRef.getProxy()->config()) {
+    switch (fProxyRef.get()->config()) {
         case kRGBA_8888_GrPixelConfig:
             fFormat = GrImageStorageFormat::kRGBA8;
             break;