OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Do not access set layout during vkCmdBindDescriptorSets.

Browse Source 
The spec says:

"
VkDescriptorSetLayout objects may be accessed by commands that operate on descriptor sets allocated using that layout
"

So our behavior is valid here, but this is a temporary workaround for an issue with Baldur's Gate 3.

CC: mesa-stable
Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3607
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7207>
This commit is contained in:
Bas Nieuwenhuizen
2020-10-18 15:14:36 +02:00
committed by Marge Bot
parent 29999e6b9d
commit eb104e949e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -3850,7 +3850,6 @@ radv_bind_descriptor_set(struct radv_cmd_buffer *cmd_buffer,
radv_set_descriptor_set(cmd_buffer, bind_point, set, idx); radv_set_descriptor_set(cmd_buffer, bind_point, set, idx);
assert(set); assert(set);
assert(!(set->layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR));
if (!cmd_buffer->device->use_global_bo_list) { if (!cmd_buffer->device->use_global_bo_list) {
for (unsigned j = 0; j < set->buffer_count; ++j) for (unsigned j = 0; j < set->buffer_count; ++j)
@@ -3891,7 +3890,7 @@ void radv_CmdBindDescriptorSets(
radv_bind_descriptor_set(cmd_buffer, pipelineBindPoint, set, idx); radv_bind_descriptor_set(cmd_buffer, pipelineBindPoint, set, idx);
} }
for(unsigned j = 0; j < set->layout->dynamic_offset_count; ++j, ++dyn_idx) { for(unsigned j = 0; j < layout->set[idx].dynamic_offset_count; ++j, ++dyn_idx) {
unsigned idx = j + layout->set[i + firstSet].dynamic_offset_start; unsigned idx = j + layout->set[i + firstSet].dynamic_offset_start;
uint32_t *dst = descriptors_state->dynamic_buffers + idx * 4; uint32_t *dst = descriptors_state->dynamic_buffers + idx * 4;
assert(dyn_idx < dynamicOffsetCount); assert(dyn_idx < dynamicOffsetCount);
@@ -3920,8 +3919,7 @@ void radv_CmdBindDescriptorSets(
} }
} }
cmd_buffer->push_constant_stages |= cmd_buffer->push_constant_stages |= layout->set[idx].dynamic_offset_stages;
set->layout->dynamic_shader_stages;
} }
} }
} }

10
src/amd/vulkan/radv_descriptor_set.c
View File

@@ -439,10 +439,16 @@ VkResult radv_CreatePipelineLayout(
layout->set[set].layout = set_layout; layout->set[set].layout = set_layout;
layout->set[set].dynamic_offset_start = dynamic_offset_count; layout->set[set].dynamic_offset_start = dynamic_offset_count;
layout->set[set].dynamic_offset_count = 0;
layout->set[set].dynamic_offset_stages = 0;
for (uint32_t b = 0; b < set_layout->binding_count; b++) { for (uint32_t b = 0; b < set_layout->binding_count; b++) {
dynamic_offset_count += set_layout->binding[b].array_size * set_layout->binding[b].dynamic_offset_count; layout->set[set].dynamic_offset_count +=
dynamic_shader_stages |= set_layout->dynamic_shader_stages; set_layout->binding[b].array_size * set_layout->binding[b].dynamic_offset_count;
layout->set[set].dynamic_offset_stages |= set_layout->dynamic_shader_stages;
} }
dynamic_offset_count += layout->set[set].dynamic_offset_count;
dynamic_shader_stages |= layout->set[set].dynamic_offset_stages;
_mesa_sha1_update(&ctx, set_layout, set_layout->layout_size); _mesa_sha1_update(&ctx, set_layout, set_layout->layout_size);
} }

4
src/amd/vulkan/radv_descriptor_set.h
View File

@@ -89,7 +89,9 @@ struct radv_pipeline_layout {
struct { struct {
struct radv_descriptor_set_layout *layout; struct radv_descriptor_set_layout *layout;
uint32_t size; uint32_t size;
uint32_t dynamic_offset_start; uint16_t dynamic_offset_start;
uint16_t dynamic_offset_count;
VkShaderStageFlags dynamic_offset_stages;
} set[MAX_SETS]; } set[MAX_SETS];
uint32_t num_sets; uint32_t num_sets;