AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switched GrVkCopyManager to use secondary command buffer instead of AMD-specific workaround

Browse Source 
Bug: skia:
Change-Id: I4f607b1ce7166b90c2984515f5f09eba74cb8ddb
Reviewed-on: https://skia-review.googlesource.com/c/173995
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Ethan Nicholas 2018-12-06 10:44:30 -05:00 committed by Skia Commit-Bot
parent 47be94abd1
commit 6dafa22edb
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gpu/vk/GrVkCopyManager.cpp
View File

@ -156,11 +156,6 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu,
return false;
}
if (gpu->vkCaps().newCBOnPipelineChange()) {
// We bind a new pipeline here for the copy so we must start a new command buffer.
gpu->finishFlush(0, nullptr);
}
GrVkRenderTarget* rt = static_cast<GrVkRenderTarget*>(dst->asRenderTarget());
if (!rt) {
return false;
@ -295,8 +290,6 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu,
gpu->onResolveRenderTarget(texRT);
}
GrVkPrimaryCommandBuffer* cmdBuffer = gpu->currentCommandBuffer();
// TODO: Make tighter bounds and then adjust bounds for origin and granularity if we see
// any perf issues with using the whole bounds
SkIRect bounds = SkIRect::MakeWH(rt->width(), rt->height());
@ -355,9 +348,17 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu,
SkASSERT(renderPass->isCompatible(*rt->simpleRenderPass()));
GrVkPrimaryCommandBuffer* cmdBuffer = gpu->currentCommandBuffer();
cmdBuffer->beginRenderPass(gpu, renderPass, nullptr, *rt, bounds, true);
cmdBuffer->beginRenderPass(gpu, renderPass, nullptr, *rt, bounds, false);
cmdBuffer->bindPipeline(gpu, pipeline);
GrVkSecondaryCommandBuffer* secondary =
gpu->resourceProvider().findOrCreateSecondaryCommandBuffer();
if (!secondary) {
return false;
}
secondary->begin(gpu, rt->framebuffer(), renderPass);
secondary->bindPipeline(gpu, pipeline);
// Uniform DescriptorSet, Sampler DescriptorSet, and vertex shader uniformBuffer
SkSTArray<3, const GrVkRecycledResource*> descriptorRecycledResources;
@ -371,7 +372,7 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu,
descriptorResources.push_back(srcTex->textureView());
descriptorResources.push_back(srcTex->resource());
cmdBuffer->bindDescriptorSets(gpu,
secondary->bindDescriptorSets(gpu,
descriptorRecycledResources,
descriptorResources,
fPipelineLayout,
@ -390,7 +391,7 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu,
viewport.height = SkIntToScalar(rt->height());
viewport.minDepth = 0.0f;
viewport.maxDepth = 1.0f;
cmdBuffer->setViewport(gpu, 0, 1, &viewport);
secondary->setViewport(gpu, 0, 1, &viewport);
// We assume the scissor is not enabled so just set it to the whole RT
VkRect2D scissor;
@ -398,11 +399,14 @@ bool GrVkCopyManager::copySurfaceAsDraw(GrVkGpu* gpu,
scissor.extent.height = rt->height();
scissor.offset.x = 0;
scissor.offset.y = 0;
cmdBuffer->setScissor(gpu, 0, 1, &scissor);
secondary->setScissor(gpu, 0, 1, &scissor);
cmdBuffer->bindInputBuffer(gpu, 0, fVertexBuffer.get());
cmdBuffer->draw(gpu, 4, 1, 0, 0);
secondary->bindInputBuffer(gpu, 0, fVertexBuffer.get());
secondary->draw(gpu, 4, 1, 0, 0);
secondary->end(gpu);
cmdBuffer->executeCommands(gpu, secondary);
cmdBuffer->endRenderPass(gpu);
secondary->unref(gpu);
// Release all temp resources which should now be reffed by the cmd buffer
pipeline->unref(gpu);