fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Fix variable name collision.

Browse source 
idx was aliased, and eb104e949e started
using the outer var in the inner scope ...

Fixes: eb104e949e
Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3701
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7388>
(cherry picked from commit 8943c80c9b)
This commit is contained in:
Bas Nieuwenhuizen 2020-10-30 23:41:27 +01:00 • committed by Dylan Baker
parent e8b625bc96
commit 52ef9c22a0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -517,7 +517,7 @@
"description": "radv: Fix variable name collision.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "eb104e949ee4b7e0813d14f11a4a952bae48fe80"
},

12
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -3872,17 +3872,17 @@ void radv_CmdBindDescriptorSets(
radv_get_descriptors_state(cmd_buffer, pipelineBindPoint);
for (unsigned i = 0; i < descriptorSetCount; ++i) {
unsigned idx = i + firstSet;
unsigned set_idx = i + firstSet;
RADV_FROM_HANDLE(radv_descriptor_set, set, pDescriptorSets[i]);
/* If the set is already bound we only need to update the
* (potentially changed) dynamic offsets. */
if (descriptors_state->sets[idx] != set ||
!(descriptors_state->valid & (1u << idx))) {
radv_bind_descriptor_set(cmd_buffer, pipelineBindPoint, set, idx);
if (descriptors_state->sets[set_idx] != set ||
!(descriptors_state->valid & (1u << set_idx))) {
radv_bind_descriptor_set(cmd_buffer, pipelineBindPoint, set, set_idx);
}
for(unsigned j = 0; j < layout->set[idx].dynamic_offset_count; ++j, ++dyn_idx) {
for(unsigned j = 0; j < layout->set[set_idx].dynamic_offset_count; ++j, ++dyn_idx) {
unsigned idx = j + layout->set[i + firstSet].dynamic_offset_start;
uint32_t *dst = descriptors_state->dynamic_buffers + idx * 4;
assert(dyn_idx < dynamicOffsetCount);
@ -3911,7 +3911,7 @@ void radv_CmdBindDescriptorSets(
}
}
cmd_buffer->push_constant_stages |= layout->set[idx].dynamic_offset_stages;
cmd_buffer->push_constant_stages |= layout->set[set_idx].dynamic_offset_stages;
}
}
}