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>
diff --git a/src/gpu/ops/GrClearOp.cpp b/src/gpu/ops/GrClearOp.cpp
index 34e15de..287fc7d 100644
--- a/src/gpu/ops/GrClearOp.cpp
+++ b/src/gpu/ops/GrClearOp.cpp
@@ -8,9 +8,9 @@
#include "src/gpu/ops/GrClearOp.h"
#include "include/private/GrRecordingContext.h"
-#include "src/gpu/GrGpuCommandBuffer.h"
#include "src/gpu/GrMemoryPool.h"
#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrOpsRenderPass.h"
#include "src/gpu/GrProxyProvider.h"
#include "src/gpu/GrRecordingContextPriv.h"
@@ -60,6 +60,6 @@
}
void GrClearOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
- SkASSERT(state->rtCommandBuffer());
- state->rtCommandBuffer()->clear(fClip, fColor);
+ SkASSERT(state->opsRenderPass());
+ state->opsRenderPass()->clear(fClip, fColor);
}
diff --git a/src/gpu/ops/GrClearStencilClipOp.cpp b/src/gpu/ops/GrClearStencilClipOp.cpp
index dfe8268..7ca4063 100644
--- a/src/gpu/ops/GrClearStencilClipOp.cpp
+++ b/src/gpu/ops/GrClearStencilClipOp.cpp
@@ -8,9 +8,9 @@
#include "src/gpu/ops/GrClearStencilClipOp.h"
#include "include/private/GrRecordingContext.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"
std::unique_ptr<GrOp> GrClearStencilClipOp::Make(GrRecordingContext* context,
@@ -23,6 +23,6 @@
}
void GrClearStencilClipOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
- SkASSERT(state->rtCommandBuffer());
- state->rtCommandBuffer()->clearStencilClip(fClip, fInsideStencilMask);
+ SkASSERT(state->opsRenderPass());
+ state->opsRenderPass()->clearStencilClip(fClip, fInsideStencilMask);
}
diff --git a/src/gpu/ops/GrDebugMarkerOp.cpp b/src/gpu/ops/GrDebugMarkerOp.cpp
index ddf6b3b..8c255cd 100644
--- a/src/gpu/ops/GrDebugMarkerOp.cpp
+++ b/src/gpu/ops/GrDebugMarkerOp.cpp
@@ -9,9 +9,9 @@
#include "include/private/GrRecordingContext.h"
#include "src/gpu/GrCaps.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"
std::unique_ptr<GrOp> GrDebugMarkerOp::Make(GrRecordingContext* context,
@@ -25,6 +25,6 @@
void GrDebugMarkerOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
//SkDebugf("%s\n", fStr.c_str());
if (state->caps().gpuTracingSupport()) {
- state->commandBuffer()->insertEventMarker(fStr.c_str());
+ state->opsRenderPass()->insertEventMarker(fStr.c_str());
}
}
diff --git a/src/gpu/ops/GrDrawableOp.cpp b/src/gpu/ops/GrDrawableOp.cpp
index 6f89d74..66a63f9 100644
--- a/src/gpu/ops/GrDrawableOp.cpp
+++ b/src/gpu/ops/GrDrawableOp.cpp
@@ -9,9 +9,9 @@
#include "include/core/SkDrawable.h"
#include "include/private/GrRecordingContext.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"
std::unique_ptr<GrDrawableOp> GrDrawableOp::Make(
@@ -29,6 +29,6 @@
}
void GrDrawableOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
- SkASSERT(state->commandBuffer());
- state->rtCommandBuffer()->executeDrawable(std::move(fDrawable));
+ SkASSERT(state->opsRenderPass());
+ state->opsRenderPass()->executeDrawable(std::move(fDrawable));
}
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index fc3bce4..b671f07 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -10,9 +10,9 @@
#include "include/private/GrRecordingContext.h"
#include "src/core/SkRRectPriv.h"
#include "src/gpu/GrCaps.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/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
@@ -760,7 +760,7 @@
std::move(indexBuffer), indexCount, fInstanceBuffer, fInstanceCount, fBaseInstance,
GrPrimitiveRestart::kNo);
mesh->setVertexData(std::move(vertexBuffer));
- flushState->rtCommandBuffer()->draw(
+ flushState->opsRenderPass()->draw(
*proc, *pipeline, fixedDynamicState, nullptr, mesh, 1, this->bounds());
}
diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 6695058..0ba8e43 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -5,11 +5,12 @@
* found in the LICENSE file.
*/
-#include "src/gpu/GrGpuCommandBuffer.h"
-#include "src/gpu/GrOpFlushState.h"
-#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrOpsRenderPass.h"
+#include "src/gpu/GrResourceProvider.h"
+
GrMeshDrawOp::GrMeshDrawOp(uint32_t classID) : INHERITED(classID) {}
void GrMeshDrawOp::onPrepare(GrOpFlushState* state) { this->onPrepareDraws(state); }
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index 7aff59d..0578994 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -19,8 +19,8 @@
#include <new>
class GrCaps;
-class GrGpuCommandBuffer;
class GrOpFlushState;
+class GrOpsRenderPass;
/**
* GrOp is the base class for all Ganesh deferred GPU operations. To facilitate reordering and to