commit 2d41d0d3636a7403bf6dd46339a31caa5fd4dff0
author Greg Daniel <egdaniel@google.com> Mon Aug 26 11:08:51 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Aug 26 15:34:14 2019 +0000
tree f2845e32c2c14150fe1315d6d189278dd125076e
parent 3012cbaa20ce825e8bc9e7b31233bdbd87c68c33

Remove GrGpuTextureCommandBuffer class and rename to GrOpsRenderPass.

Change-Id: Ia6e666a7bb986bb3dc769d25919580bca17b4748
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236556
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrOpsTask.cpp

diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index bcf0034..98f0c61 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -14,9 +14,9 @@
 #include "src/gpu/GrAuditTrail.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrGpu.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrResourceAllocator.h"
@@ -414,14 +414,14 @@
     }
 }
 
-static GrGpuRTCommandBuffer* create_command_buffer(GrGpu* gpu,
-                                                   GrRenderTarget* rt,
-                                                   GrSurfaceOrigin origin,
-                                                   const SkRect& bounds,
-                                                   GrLoadOp colorLoadOp,
-                                                   const SkPMColor4f& loadClearColor,
-                                                   GrLoadOp stencilLoadOp) {
-    const GrGpuRTCommandBuffer::LoadAndStoreInfo kColorLoadStoreInfo {
+static GrOpsRenderPass* create_command_buffer(GrGpu* gpu,
+                                              GrRenderTarget* rt,
+                                              GrSurfaceOrigin origin,
+                                              const SkRect& bounds,
+                                              GrLoadOp colorLoadOp,
+                                              const SkPMColor4f& loadClearColor,
+                                              GrLoadOp stencilLoadOp) {
+    const GrOpsRenderPass::LoadAndStoreInfo kColorLoadStoreInfo {
         colorLoadOp,
         GrStoreOp::kStore,
         loadClearColor
@@ -432,12 +432,12 @@
     // to stop splitting up higher level OpsTasks for copyOps to achieve that.
     // Note: we would still need SB loads and stores but they would happen at a
     // lower level (inside the VK command buffer).
-    const GrGpuRTCommandBuffer::StencilLoadAndStoreInfo stencilLoadAndStoreInfo {
+    const GrOpsRenderPass::StencilLoadAndStoreInfo stencilLoadAndStoreInfo {
         stencilLoadOp,
         GrStoreOp::kStore,
     };
 
-    return gpu->getCommandBuffer(rt, origin, bounds, kColorLoadStoreInfo, stencilLoadAndStoreInfo);
+    return gpu->getOpsRenderPass(rt, origin, bounds, kColorLoadStoreInfo, stencilLoadAndStoreInfo);
 }
 
 // TODO: this is where GrOp::renderTarget is used (which is fine since it
@@ -459,7 +459,7 @@
              !flushState->gpu()->caps()->performColorClearsAsDraws());
     SkASSERT(fStencilLoadOp != GrLoadOp::kClear ||
              !flushState->gpu()->caps()->performStencilClearsAsDraws());
-    GrGpuRTCommandBuffer* commandBuffer = create_command_buffer(
+    GrOpsRenderPass* renderPass = create_command_buffer(
                                                     flushState->gpu(),
                                                     fTarget->peekRenderTarget(),
                                                     fTarget->origin(),
@@ -467,8 +467,8 @@
                                                     fColorLoadOp,
                                                     fLoadClearColor,
                                                     fStencilLoadOp);
-    flushState->setCommandBuffer(commandBuffer);
-    commandBuffer->begin();
+    flushState->setOpsRenderPass(renderPass);
+    renderPass->begin();
 
     // Draw all the generated geometry.
     for (const auto& chain : fOpChains) {
@@ -492,9 +492,9 @@
         flushState->setOpArgs(nullptr);
     }
 
-    commandBuffer->end();
-    flushState->gpu()->submit(commandBuffer);
-    flushState->setCommandBuffer(nullptr);
+    renderPass->end();
+    flushState->gpu()->submit(renderPass);
+    flushState->setOpsRenderPass(nullptr);
 
     return true;
 }