Add addtional resolve calls to vulkan backend
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2215363003
Review-Url: https://codereview.chromium.org/2215363003
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 4f177ff..0a713f4 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -284,7 +284,8 @@
return true;
}
- if (renderTarget && this->vkCaps().isConfigRenderable(renderTarget->config(), false)) {
+ if (renderTarget && this->vkCaps().isConfigRenderable(renderTarget->config(),
+ renderTarget->numColorSamples() > 1)) {
ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
bool configsAreRBSwaps = GrPixelConfigSwapRAndB(srcConfig) == dstSurface->config();
@@ -366,7 +367,8 @@
}
void GrVkGpu::onResolveRenderTarget(GrRenderTarget* target) {
- if (target->needsResolve() && target->numColorSamples() > 1) {
+ if (target->needsResolve()) {
+ SkASSERT(target->numColorSamples() > 1);
GrVkRenderTarget* rt = static_cast<GrVkRenderTarget*>(target);
SkASSERT(rt->msaaImage());
@@ -817,12 +819,6 @@
return;
}
- // We currently don't support generating mipmaps for images that are multisampled.
- // TODO: Add support for mipmapping the resolve target of a multisampled image
- if (tex->asRenderTarget() && tex->asRenderTarget()->numColorSamples() > 1) {
- return;
- }
-
// determine if we can blit to and from this format
const GrVkCaps& caps = this->vkCaps();
if (!caps.configCanBeDstofBlit(tex->config(), false) ||
@@ -831,6 +827,12 @@
return;
}
+ // We may need to resolve the texture first if it is also a render target
+ GrVkRenderTarget* texRT = static_cast<GrVkRenderTarget*>(tex->asRenderTarget());
+ if (texRT) {
+ this->onResolveRenderTarget(texRT);
+ }
+
int width = tex->width();
int height = tex->height();
VkImageBlit blitRegion;
@@ -1433,7 +1435,7 @@
const GrVkImage* dstImage,
const GrVkImage* srcImage,
const GrVkGpu* gpu) {
- // We require that all vulkan GrSurfaces have been created with transfer_dst and transfer_src
+ // We require that all vulkan GrSurfaces have been created with transfer_dst and transfer_src
// as image usage flags.
const GrVkCaps& caps = gpu->vkCaps();
if (!caps.configCanBeDstofBlit(dst->config(), dstImage->isLinearTiled()) ||
@@ -1615,7 +1617,7 @@
return true;
}
- if (this->vkCaps().isConfigRenderable(readConfig, false)) {
+ if (this->vkCaps().isConfigRenderable(readConfig, srcSurface->desc().fSampleCnt > 1)) {
ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
tempDrawInfo->fTempSurfaceDesc.fConfig = readConfig;
tempDrawInfo->fReadConfig = readConfig;
@@ -1635,17 +1637,36 @@
return false;
}
- GrVkTexture* tgt = static_cast<GrVkTexture*>(surface->asTexture());
- if (!tgt) {
+ GrVkImage* image = nullptr;
+ GrVkRenderTarget* rt = static_cast<GrVkRenderTarget*>(surface->asRenderTarget());
+ if (rt) {
+ // resolve the render target if necessary
+ switch (rt->getResolveType()) {
+ case GrVkRenderTarget::kCantResolve_ResolveType:
+ return false;
+ case GrVkRenderTarget::kAutoResolves_ResolveType:
+ break;
+ case GrVkRenderTarget::kCanResolve_ResolveType:
+ this->onResolveRenderTarget(rt);
+ break;
+ default:
+ SkFAIL("Unknown resolve type");
+ }
+ image = rt;
+ } else {
+ image = static_cast<GrVkTexture*>(surface->asTexture());
+ }
+
+ if (!image) {
return false;
}
// Change layout of our target so it can be used as copy
- tgt->setImageLayout(this,
- VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
- VK_ACCESS_TRANSFER_READ_BIT,
- VK_PIPELINE_STAGE_TRANSFER_BIT,
- false);
+ image->setImageLayout(this,
+ VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+ VK_ACCESS_TRANSFER_READ_BIT,
+ VK_PIPELINE_STAGE_TRANSFER_BIT,
+ false);
GrVkTransferBuffer* transferBuffer =
static_cast<GrVkTransferBuffer*>(this->createBuffer(rowBytes * height,
@@ -1670,7 +1691,7 @@
region.imageExtent = { (uint32_t)width, (uint32_t)height, 1 };
fCurrentCmdBuffer->copyImageToBuffer(this,
- tgt,
+ image,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
transferBuffer,
1,
@@ -1778,5 +1799,7 @@
fCurrentCmdBuffer->beginRenderPass(this, renderPass, 1, colorClear, *target, *pBounds, true);
fCurrentCmdBuffer->executeCommands(this, buffer);
fCurrentCmdBuffer->endRenderPass(this);
+
+ this->didWriteToSurface(target, pBounds);
}
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index 841329c..ff9c3c7 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -128,6 +128,8 @@
}
#endif
+ void onResolveRenderTarget(GrRenderTarget* target) override;
+
void submitSecondaryCommandBuffer(GrVkSecondaryCommandBuffer*,
const GrVkRenderPass*,
const VkClearValue*,
@@ -147,7 +149,7 @@
// in the main heap.
kOptimalImage_Heap,
kSmallOptimalImage_Heap,
- // We have separate vertex and image heaps, because it's possible that
+ // We have separate vertex and image heaps, because it's possible that
// a given Vulkan driver may allocate them separately.
kVertexBuffer_Heap,
kIndexBuffer_Heap,
@@ -199,8 +201,6 @@
GrPixelConfig config, GrBuffer* transferBuffer,
size_t offset, size_t rowBytes) override { return false; }
- void onResolveRenderTarget(GrRenderTarget* target) override;
-
// Ends and submits the current command buffer to the queue and then creates a new command
// buffer and begins it. If sync is set to kForce_SyncQueue, the function will wait for all
// work in the queue to finish before returning.
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
index b233649..77a038a 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
@@ -346,6 +346,13 @@
const GrTextureAccess& texAccess = processor.textureAccess(i);
GrVkTexture* vkTexture = static_cast<GrVkTexture*>(processor.texture(i));
SkASSERT(vkTexture);
+
+ // We may need to resolve the texture first if it is also a render target
+ GrVkRenderTarget* texRT = static_cast<GrVkRenderTarget*>(vkTexture->asRenderTarget());
+ if (texRT) {
+ gpu->onResolveRenderTarget(texRT);
+ }
+
const GrTextureParams& params = texAccess.getParams();
// Check if we need to regenerate any mip maps
if (GrTextureParams::kMipMap_FilterMode == params.filterMode()) {
diff --git a/src/gpu/vk/GrVkRenderTarget.h b/src/gpu/vk/GrVkRenderTarget.h
index 019f567..e3ebefb 100644
--- a/src/gpu/vk/GrVkRenderTarget.h
+++ b/src/gpu/vk/GrVkRenderTarget.h
@@ -60,7 +60,10 @@
// override of GrRenderTarget
ResolveType getResolveType() const override {
- return kCanResolve_ResolveType;
+ if (this->numColorSamples() > 1) {
+ return kCanResolve_ResolveType;
+ }
+ return kAutoResolves_ResolveType;
}
bool canAttemptStencilAttachment() const override {