From fe5f2c8bffb770bc29954f68e1e4398df3048876 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Sat, 10 Oct 2020 10:46:15 +0200 Subject: rhi: vk: Avoid shadowing local variable Change-Id: I7ad14ff05a1ff10113f5d3985662970d74e68ead Reviewed-by: Andy Nichols --- src/gui/rhi/qrhivulkan.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/gui') diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp index 9edc2cc64f..05b7afae75 100644 --- a/src/gui/rhi/qrhivulkan.cpp +++ b/src/gui/rhi/qrhivulkan.cpp @@ -4298,13 +4298,14 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin QVkShaderResourceBindings *srbD = QRHI_RES(QVkShaderResourceBindings, srb); const int descSetIdx = srbD->hasSlottedResource ? currentFrameSlot : 0; + auto &descSetBd(srbD->boundResourceData[descSetIdx]); bool rewriteDescSet = false; // Do host writes and mark referenced shader resources as in-use. // Also prepare to ensure the descriptor set we are going to bind refers to up-to-date Vk objects. for (int i = 0, ie = srbD->sortedBindings.count(); i != ie; ++i) { - const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings.at(i).data(); - QVkShaderResourceBindings::BoundResourceData &bd(srbD->boundResourceData[descSetIdx][i]); + const QRhiShaderResourceBinding::Data *b = srbD->sortedBindings[i].data(); + QVkShaderResourceBindings::BoundResourceData &bd(descSetBd[i]); switch (b->type) { case QRhiShaderResourceBinding::UniformBuffer: { @@ -4441,9 +4442,9 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin if (b->type == QRhiShaderResourceBinding::UniformBuffer && b->u.ubuf.hasDynamicOffset) { uint32_t offset = 0; for (int i = 0; i < dynamicOffsetCount; ++i) { - const QRhiCommandBuffer::DynamicOffset &dynOfs(dynamicOffsets[i]); - if (dynOfs.first == b->binding) { - offset = dynOfs.second; + const QRhiCommandBuffer::DynamicOffset &bindingOffsetPair(dynamicOffsets[i]); + if (bindingOffsetPair.first == b->binding) { + offset = bindingOffsetPair.second; break; } } -- cgit v1.2.3