Don't pass in RT to individual Gpu CommandBuffer calls
The Vulkan backend already stored a GrVkRT, but was inconsistent
in sometimes using the stored value and sometimes the passed in
value (though they should be the same). This just cleans up the
code so that everyone uses a stored RT.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3126
Change-Id: I571de4bfb1da612d61171321d5224a9a19d8e545
Reviewed-on: https://skia-review.googlesource.com/3126
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/gpu/GrGpuCommandBuffer.cpp b/src/gpu/GrGpuCommandBuffer.cpp
index 022c166..d30844c 100644
--- a/src/gpu/GrGpuCommandBuffer.cpp
+++ b/src/gpu/GrGpuCommandBuffer.cpp
@@ -19,22 +19,22 @@
this->onSubmit(bounds);
}
-void GrGpuCommandBuffer::clear(const GrFixedClip& clip, GrColor color, GrRenderTarget* rt) {
+void GrGpuCommandBuffer::clear(const GrFixedClip& clip, GrColor color) {
+#ifdef SK_DEBUG
+ GrRenderTarget* rt = this->renderTarget();
SkASSERT(rt);
SkASSERT(!clip.scissorEnabled() ||
(SkIRect::MakeWH(rt->width(), rt->height()).contains(clip.scissorRect()) &&
SkIRect::MakeWH(rt->width(), rt->height()) != clip.scissorRect()));
- this->onClear(rt, clip, color);
+#endif
+ this->onClear(clip, color);
}
void GrGpuCommandBuffer::clearStencilClip(const GrFixedClip& clip,
- bool insideStencilMask,
- GrRenderTarget* rt) {
- SkASSERT(rt);
- this->onClearStencilClip(rt, clip, insideStencilMask);
+ bool insideStencilMask) {
+ this->onClearStencilClip(clip, insideStencilMask);
}
-
bool GrGpuCommandBuffer::draw(const GrPipeline& pipeline,
const GrPrimitiveProcessor& primProc,
const GrMesh* mesh,
diff --git a/src/gpu/GrGpuCommandBuffer.h b/src/gpu/GrGpuCommandBuffer.h
index 2336dc5..0d5220a 100644
--- a/src/gpu/GrGpuCommandBuffer.h
+++ b/src/gpu/GrGpuCommandBuffer.h
@@ -66,18 +66,20 @@
/**
* Clear the passed in render target. Ignores the draw state and clip.
*/
- void clear(const GrFixedClip&, GrColor, GrRenderTarget*);
+ void clear(const GrFixedClip&, GrColor);
- void clearStencilClip(const GrFixedClip&, bool insideStencilMask, GrRenderTarget*);
+ void clearStencilClip(const GrFixedClip&, bool insideStencilMask);
/**
* Discards the contents render target. nullptr indicates that the current render target should
* be discarded.
**/
// TODO: This should be removed in the future to favor using the load and store ops for discard
- virtual void discard(GrRenderTarget* = nullptr) = 0;
+ virtual void discard() = 0;
private:
virtual GrGpu* gpu() = 0;
+ virtual GrRenderTarget* renderTarget() = 0;
+
virtual void onSubmit(const SkIRect& bounds) = 0;
// overridden by backend-specific derived class to perform the draw call.
@@ -87,10 +89,9 @@
int meshCount) = 0;
// overridden by backend-specific derived class to perform the clear.
- virtual void onClear(GrRenderTarget*, const GrFixedClip&, GrColor) = 0;
+ virtual void onClear(const GrFixedClip&, GrColor) = 0;
- virtual void onClearStencilClip(GrRenderTarget*,
- const GrFixedClip&,
+ virtual void onClearStencilClip(const GrFixedClip&,
bool insideStencilMask) = 0;
};
diff --git a/src/gpu/batches/GrClearBatch.h b/src/gpu/batches/GrClearBatch.h
index 16f1ddd..c4bbadc 100644
--- a/src/gpu/batches/GrClearBatch.h
+++ b/src/gpu/batches/GrClearBatch.h
@@ -95,7 +95,7 @@
void onPrepare(GrBatchFlushState*) override {}
void onDraw(GrBatchFlushState* state) override {
- state->commandBuffer()->clear(fClip, fColor, fRenderTarget.get());
+ state->commandBuffer()->clear(fClip, fColor);
}
GrFixedClip fClip;
diff --git a/src/gpu/batches/GrClearStencilClipBatch.h b/src/gpu/batches/GrClearStencilClipBatch.h
index e510821..d9d5b2e 100644
--- a/src/gpu/batches/GrClearStencilClipBatch.h
+++ b/src/gpu/batches/GrClearStencilClipBatch.h
@@ -51,7 +51,7 @@
void onPrepare(GrBatchFlushState*) override {}
void onDraw(GrBatchFlushState* state) override {
- state->commandBuffer()->clearStencilClip(fClip, fInsideStencilMask, fRenderTarget.get());
+ state->commandBuffer()->clearStencilClip(fClip, fInsideStencilMask);
}
const GrFixedClip fClip;
diff --git a/src/gpu/batches/GrDiscardBatch.h b/src/gpu/batches/GrDiscardBatch.h
index 04e0ddb..c9aa7d6 100644
--- a/src/gpu/batches/GrDiscardBatch.h
+++ b/src/gpu/batches/GrDiscardBatch.h
@@ -44,7 +44,7 @@
void onPrepare(GrBatchFlushState*) override {}
void onDraw(GrBatchFlushState* state) override {
- state->commandBuffer()->discard(fRenderTarget.get());
+ state->commandBuffer()->discard();
}
GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> fRenderTarget;
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 8c0373a..56f01ed 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -2642,7 +2642,7 @@
GrRenderTarget* target,
const GrGpuCommandBuffer::LoadAndStoreInfo& colorInfo,
const GrGpuCommandBuffer::LoadAndStoreInfo& stencilInfo) {
- return new GrGLGpuCommandBuffer(this);
+ return new GrGLGpuCommandBuffer(this, static_cast<GrGLRenderTarget*>(target));
}
void GrGLGpu::finishDrawTarget() {
diff --git a/src/gpu/gl/GrGLGpuCommandBuffer.h b/src/gpu/gl/GrGLGpuCommandBuffer.h
index 4ad2b13..0c9ddc2 100644
--- a/src/gpu/gl/GrGLGpuCommandBuffer.h
+++ b/src/gpu/gl/GrGLGpuCommandBuffer.h
@@ -12,6 +12,8 @@
#include "GrGLGpu.h"
+class GrGLRenderTarget;
+
class GrGLGpuCommandBuffer : public GrGpuCommandBuffer {
/**
* We do not actually buffer up draws or do any work in the this class for GL. Instead commands
@@ -19,16 +21,17 @@
* pass through functions to corresponding calls in the GrGLGpu class.
*/
public:
- GrGLGpuCommandBuffer(GrGLGpu* gpu) : fGpu(gpu) {}
+ GrGLGpuCommandBuffer(GrGLGpu* gpu, GrGLRenderTarget* rt) : fGpu(gpu), fRenderTarget(rt) {}
virtual ~GrGLGpuCommandBuffer() {}
void end() override {}
- void discard(GrRenderTarget* rt) override {}
+ void discard() override {}
private:
GrGpu* gpu() override { return fGpu; }
+ GrRenderTarget* renderTarget() override { return fRenderTarget; }
void onSubmit(const SkIRect& bounds) override {}
@@ -39,17 +42,17 @@
fGpu->draw(pipeline, primProc, mesh, meshCount);
}
- void onClear(GrRenderTarget* rt, const GrFixedClip& clip, GrColor color) override {
- fGpu->clear(clip, color, rt);
+ void onClear(const GrFixedClip& clip, GrColor color) override {
+ fGpu->clear(clip, color, fRenderTarget);
}
- void onClearStencilClip(GrRenderTarget* rt,
- const GrFixedClip& clip,
+ void onClearStencilClip(const GrFixedClip& clip,
bool insideStencilMask) override {
- fGpu->clearStencilClip(clip, insideStencilMask, rt);
+ fGpu->clearStencilClip(clip, insideStencilMask, fRenderTarget);
}
GrGLGpu* fGpu;
+ GrGLRenderTarget* fRenderTarget;
typedef GrGpuCommandBuffer INHERITED;
};
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
index e0cfce3..f4ac7c8 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
@@ -91,6 +91,7 @@
}
GrGpu* GrVkGpuCommandBuffer::gpu() { return fGpu; }
+GrRenderTarget* GrVkGpuCommandBuffer::renderTarget() { return fRenderTarget; }
void GrVkGpuCommandBuffer::end() {
fCommandBuffer->end(fGpu);
@@ -136,7 +137,7 @@
fRenderTarget, bounds);
}
-void GrVkGpuCommandBuffer::discard(GrRenderTarget* target) {
+void GrVkGpuCommandBuffer::discard() {
if (fIsEmpty) {
// We will change the render pass to do a clear load instead
GrVkRenderPass::LoadStoreOps vkColorOps(VK_ATTACHMENT_LOAD_OP_DONT_CARE,
@@ -146,15 +147,14 @@
const GrVkRenderPass* oldRP = fRenderPass;
- GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(target);
const GrVkResourceProvider::CompatibleRPHandle& rpHandle =
- vkRT->compatibleRenderPassHandle();
+ fRenderTarget->compatibleRenderPassHandle();
if (rpHandle.isValid()) {
fRenderPass = fGpu->resourceProvider().findRenderPass(rpHandle,
vkColorOps,
vkStencilOps);
} else {
- fRenderPass = fGpu->resourceProvider().findRenderPass(*vkRT,
+ fRenderPass = fGpu->resourceProvider().findRenderPass(*fRenderTarget,
vkColorOps,
vkStencilOps);
}
@@ -165,14 +165,11 @@
}
}
-void GrVkGpuCommandBuffer::onClearStencilClip(GrRenderTarget* target,
- const GrFixedClip& clip,
+void GrVkGpuCommandBuffer::onClearStencilClip(const GrFixedClip& clip,
bool insideStencilMask) {
- SkASSERT(target);
SkASSERT(!clip.hasWindowRectangles());
- GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(target);
- GrStencilAttachment* sb = target->renderTargetPriv().getStencilAttachment();
+ GrStencilAttachment* sb = fRenderTarget->renderTargetPriv().getStencilAttachment();
// this should only be called internally when we know we have a
// stencil buffer.
SkASSERT(sb);
@@ -193,13 +190,13 @@
// Flip rect if necessary
SkIRect vkRect;
if (!clip.scissorEnabled()) {
- vkRect.setXYWH(0, 0, vkRT->width(), vkRT->height());
- } else if (kBottomLeft_GrSurfaceOrigin != vkRT->origin()) {
+ vkRect.setXYWH(0, 0, fRenderTarget->width(), fRenderTarget->height());
+ } else if (kBottomLeft_GrSurfaceOrigin != fRenderTarget->origin()) {
vkRect = clip.scissorRect();
} else {
const SkIRect& scissor = clip.scissorRect();
- vkRect.setLTRB(scissor.fLeft, vkRT->height() - scissor.fBottom,
- scissor.fRight, vkRT->height() - scissor.fTop);
+ vkRect.setLTRB(scissor.fLeft, fRenderTarget->height() - scissor.fBottom,
+ scissor.fRight, fRenderTarget->height() - scissor.fTop);
}
clearRect.rect.offset = { vkRect.fLeft, vkRect.fTop };
@@ -220,16 +217,13 @@
fIsEmpty = false;
}
-void GrVkGpuCommandBuffer::onClear(GrRenderTarget* target, const GrFixedClip& clip, GrColor color) {
+void GrVkGpuCommandBuffer::onClear(const GrFixedClip& clip, GrColor color) {
// parent class should never let us get here with no RT
- SkASSERT(target);
SkASSERT(!clip.hasWindowRectangles());
VkClearColorValue vkColor;
GrColorToRGBAFloat(color, vkColor.float32);
- GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(target);
-
if (fIsEmpty && !clip.scissorEnabled()) {
// We will change the render pass to do a clear load instead
GrVkRenderPass::LoadStoreOps vkColorOps(VK_ATTACHMENT_LOAD_OP_CLEAR,
@@ -240,13 +234,13 @@
const GrVkRenderPass* oldRP = fRenderPass;
const GrVkResourceProvider::CompatibleRPHandle& rpHandle =
- vkRT->compatibleRenderPassHandle();
+ fRenderTarget->compatibleRenderPassHandle();
if (rpHandle.isValid()) {
fRenderPass = fGpu->resourceProvider().findRenderPass(rpHandle,
vkColorOps,
vkStencilOps);
} else {
- fRenderPass = fGpu->resourceProvider().findRenderPass(*vkRT,
+ fRenderPass = fGpu->resourceProvider().findRenderPass(*fRenderTarget,
vkColorOps,
vkStencilOps);
}
@@ -264,13 +258,13 @@
// Flip rect if necessary
SkIRect vkRect;
if (!clip.scissorEnabled()) {
- vkRect.setXYWH(0, 0, vkRT->width(), vkRT->height());
- } else if (kBottomLeft_GrSurfaceOrigin != vkRT->origin()) {
+ vkRect.setXYWH(0, 0, fRenderTarget->width(), fRenderTarget->height());
+ } else if (kBottomLeft_GrSurfaceOrigin != fRenderTarget->origin()) {
vkRect = clip.scissorRect();
} else {
const SkIRect& scissor = clip.scissorRect();
- vkRect.setLTRB(scissor.fLeft, vkRT->height() - scissor.fBottom,
- scissor.fRight, vkRT->height() - scissor.fTop);
+ vkRect.setLTRB(scissor.fLeft, fRenderTarget->height() - scissor.fBottom,
+ scissor.fRight, fRenderTarget->height() - scissor.fTop);
}
clearRect.rect.offset = { vkRect.fLeft, vkRect.fTop };
clearRect.rect.extent = { (uint32_t)vkRect.width(), (uint32_t)vkRect.height() };
@@ -378,9 +372,7 @@
if (!meshCount) {
return;
}
- GrRenderTarget* rt = pipeline.getRenderTarget();
- GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(rt);
- const GrVkRenderPass* renderPass = vkRT->simpleRenderPass();
+ const GrVkRenderPass* renderPass = fRenderTarget->simpleRenderPass();
SkASSERT(renderPass);
prepare_sampled_images(primProc, fGpu);
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.h b/src/gpu/vk/GrVkGpuCommandBuffer.h
index d91271e..cc73eb4 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.h
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.h
@@ -32,10 +32,11 @@
void end() override;
- void discard(GrRenderTarget* rt) override;
+ void discard() override;
private:
GrGpu* gpu() override;
+ GrRenderTarget* renderTarget() override;
void onSubmit(const SkIRect& bounds) override;
@@ -52,9 +53,9 @@
const GrMesh* mesh,
int meshCount) override;
- void onClear(GrRenderTarget* rt, const GrFixedClip&, GrColor color) override;
+ void onClear(const GrFixedClip&, GrColor color) override;
- void onClearStencilClip(GrRenderTarget*, const GrFixedClip&, bool insideStencilMask) override;
+ void onClearStencilClip(const GrFixedClip&, bool insideStencilMask) override;
const GrVkRenderPass* fRenderPass;
GrVkSecondaryCommandBuffer* fCommandBuffer;