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/ccpr/GrCCCoverageProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCCoverageProcessor.cpp b/src/gpu/ccpr/GrCCCoverageProcessor.cpp
index cd635e4..b6ec180 100644
--- a/src/gpu/ccpr/GrCCCoverageProcessor.cpp
+++ b/src/gpu/ccpr/GrCCCoverageProcessor.cpp
@@ -8,8 +8,8 @@
 #include "src/gpu/ccpr/GrCCCoverageProcessor.h"
 
 #include "src/core/SkMakeUnique.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
 #include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/ccpr/GrCCConicShader.h"
 #include "src/gpu/ccpr/GrCCCubicShader.h"
 #include "src/gpu/ccpr/GrCCQuadraticShader.h"
@@ -200,6 +200,6 @@
         const GrMesh meshes[], int meshCount, const SkRect& drawBounds) const {
     GrPipeline::DynamicStateArrays dynamicStateArrays;
     dynamicStateArrays.fScissorRects = scissorRects;
-    GrGpuRTCommandBuffer* cmdBuff = flushState->rtCommandBuffer();
-    cmdBuff->draw(*this, pipeline, nullptr, &dynamicStateArrays, meshes, meshCount, drawBounds);
+    GrOpsRenderPass* renderPass = flushState->opsRenderPass();
+    renderPass->draw(*this, pipeline, nullptr, &dynamicStateArrays, meshes, meshCount, drawBounds);
 }

src/gpu/ccpr/GrCCFiller.cpp

diff --git a/src/gpu/ccpr/GrCCFiller.cpp b/src/gpu/ccpr/GrCCFiller.cpp
index 79fbc73..9c09b4a 100644
--- a/src/gpu/ccpr/GrCCFiller.cpp
+++ b/src/gpu/ccpr/GrCCFiller.cpp
@@ -12,7 +12,6 @@
 #include "src/core/SkMathPriv.h"
 #include "src/core/SkPathPriv.h"
 #include "src/gpu/GrCaps.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
 #include "src/gpu/GrOnFlushResourceProvider.h"
 #include "src/gpu/GrOpFlushState.h"
 #include <stdlib.h>

src/gpu/ccpr/GrCCPathProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPathProcessor.cpp b/src/gpu/ccpr/GrCCPathProcessor.cpp
index 3a88698..acc5613 100644
--- a/src/gpu/ccpr/GrCCPathProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPathProcessor.cpp
@@ -8,8 +8,8 @@
 #include "src/gpu/ccpr/GrCCPathProcessor.h"
 
 #include "include/gpu/GrTexture.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
 #include "src/gpu/GrOnFlushResourceProvider.h"
+#include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/ccpr/GrCCPerFlushResources.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -141,8 +141,8 @@
                              baseInstance, enablePrimitiveRestart);
     mesh.setVertexData(resources.refVertexBuffer());
 
-    flushState->rtCommandBuffer()->draw(*this, pipeline, fixedDynamicState, nullptr, &mesh, 1,
-                                        bounds);
+    flushState->opsRenderPass()->draw(*this, pipeline, fixedDynamicState, nullptr, &mesh, 1,
+                                      bounds);
 }
 
 void GrCCPathProcessor::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {

src/gpu/ccpr/GrCCStroker.cpp

diff --git a/src/gpu/ccpr/GrCCStroker.cpp b/src/gpu/ccpr/GrCCStroker.cpp
index 2829a2d..b432d60 100644
--- a/src/gpu/ccpr/GrCCStroker.cpp
+++ b/src/gpu/ccpr/GrCCStroker.cpp
@@ -9,8 +9,8 @@
 
 #include "include/core/SkStrokeRec.h"
 #include "src/core/SkPathPriv.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
 #include "src/gpu/GrOnFlushResourceProvider.h"
+#include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/ccpr/GrCCCoverageProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
@@ -775,9 +775,9 @@
     SkASSERT(fMeshesBuffer.count() == fScissorsBuffer.count());
     GrPipeline::DynamicStateArrays dynamicStateArrays;
     dynamicStateArrays.fScissorRects = fScissorsBuffer.begin();
-    flushState->rtCommandBuffer()->draw(processor, pipeline, nullptr, &dynamicStateArrays,
-                                        fMeshesBuffer.begin(), fMeshesBuffer.count(),
-                                        SkRect::Make(drawBounds));
+    flushState->opsRenderPass()->draw(processor, pipeline, nullptr, &dynamicStateArrays,
+                                      fMeshesBuffer.begin(), fMeshesBuffer.count(),
+                                      SkRect::Make(drawBounds));
     // Don't call reset(), as that also resets the reserve count.
     fMeshesBuffer.pop_back_n(fMeshesBuffer.count());
     fScissorsBuffer.pop_back_n(fScissorsBuffer.count());

src/gpu/ccpr/GrStencilAtlasOp.cpp

diff --git a/src/gpu/ccpr/GrStencilAtlasOp.cpp b/src/gpu/ccpr/GrStencilAtlasOp.cpp
index 7192ee9..4f2e357 100644
--- a/src/gpu/ccpr/GrStencilAtlasOp.cpp
+++ b/src/gpu/ccpr/GrStencilAtlasOp.cpp
@@ -8,8 +8,8 @@
 #include "src/gpu/ccpr/GrStencilAtlasOp.h"
 
 #include "include/private/GrRecordingContext.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
 #include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/ccpr/GrCCPerFlushResources.h"
 #include "src/gpu/ccpr/GrSampleMaskProcessor.h"
@@ -129,7 +129,7 @@
             fResources->refStencilResolveBuffer(),
             fEndStencilResolveInstance - fBaseStencilResolveInstance, fBaseStencilResolveInstance,
             4);
-    flushState->rtCommandBuffer()->draw(
+    flushState->opsRenderPass()->draw(
             StencilResolveProcessor(), resolvePipeline, &scissorRectState, nullptr, &mesh, 1,
             SkRect::Make(drawBoundsRect));
 }