1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: vk: Skip buffer/texture registration on read-after-read

Browse Source 
Change-Id: I22027cfc227d3c09e446d193e6b2903b8df34eb2
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2020-10-10 00:39:50 +02:00
parent 8c9dfd7914
commit 22de21a26c
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/rhi/qrhivulkan.cpp
View File

@ -3923,9 +3923,15 @@ void QRhiVulkan::trackedRegisterBuffer(QRhiPassResourceTracker *passResTracker,
QRhiPassResourceTracker::BufferStage stage) QRhiPassResourceTracker::BufferStage stage)
{ {
QVkBuffer::UsageState &u(bufD->usageState[slot]); QVkBuffer::UsageState &u(bufD->usageState[slot]);
const VkAccessFlags newAccess = toVkAccess(access);
const VkPipelineStageFlags newStage = toVkPipelineStage(stage);
if (u.access == newAccess && u.stage == newStage) {
if (!accessIsWrite(access))
return;
}
passResTracker->registerBuffer(bufD, slot, &access, &stage, toPassTrackerUsageState(u)); passResTracker->registerBuffer(bufD, slot, &access, &stage, toPassTrackerUsageState(u));
u.access = toVkAccess(access); u.access = newAccess;
u.stage = toVkPipelineStage(stage); u.stage = newStage;
} }
void QRhiVulkan::trackedRegisterTexture(QRhiPassResourceTracker *passResTracker, void QRhiVulkan::trackedRegisterTexture(QRhiPassResourceTracker *passResTracker,
@ -3934,10 +3940,17 @@ void QRhiVulkan::trackedRegisterTexture(QRhiPassResourceTracker *passResTracker,
QRhiPassResourceTracker::TextureStage stage) QRhiPassResourceTracker::TextureStage stage)
{ {
QVkTexture::UsageState &u(texD->usageState); QVkTexture::UsageState &u(texD->usageState);
const VkAccessFlags newAccess = toVkAccess(access);
const VkPipelineStageFlags newStage = toVkPipelineStage(stage);
const VkImageLayout newLayout = toVkLayout(access);
if (u.access == newAccess && u.stage == newStage && u.layout == newLayout) {
if (!accessIsWrite(access))
return;
}
passResTracker->registerTexture(texD, &access, &stage, toPassTrackerUsageState(u)); passResTracker->registerTexture(texD, &access, &stage, toPassTrackerUsageState(u));
u.layout = toVkLayout(access); u.layout = newLayout;
u.access = toVkAccess(access); u.access = newAccess;
u.stage = toVkPipelineStage(stage); u.stage = newStage;
} }
void QRhiVulkan::recordTransitionPassResources(QVkCommandBuffer *cbD, const QRhiPassResourceTracker &tracker) void QRhiVulkan::recordTransitionPassResources(QVkCommandBuffer *cbD, const QRhiPassResourceTracker &tracker)
@ -4272,6 +4285,7 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin
{ {
QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb); QVkCommandBuffer *cbD = QRHI_RES(QVkCommandBuffer, cb);
Q_ASSERT(cbD->recordingPass != QVkCommandBuffer::NoPass); Q_ASSERT(cbD->recordingPass != QVkCommandBuffer::NoPass);
QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
QVkGraphicsPipeline *gfxPsD = QRHI_RES(QVkGraphicsPipeline, cbD->currentGraphicsPipeline); QVkGraphicsPipeline *gfxPsD = QRHI_RES(QVkGraphicsPipeline, cbD->currentGraphicsPipeline);
QVkComputePipeline *compPsD = QRHI_RES(QVkComputePipeline, cbD->currentComputePipeline); QVkComputePipeline *compPsD = QRHI_RES(QVkComputePipeline, cbD->currentComputePipeline);
@ -4291,7 +4305,6 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin
for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) { for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) {
const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data(); const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data();
QVkShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[descSetIdx][i]); QVkShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[descSetIdx][i]);
QRhiPassResourceTracker &passResTracker(cbD->passResTrackers[cbD->currentPassResTrackerIndex]);
switch (b->type) { switch (b->type) {
case QRhiShaderResourceBinding::UniformBuffer: case QRhiShaderResourceBinding::UniformBuffer:
{ {