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

anv: Take the set of stages to flush in flush_descriptor_sets

Browse Source 
Tested-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8594>
This commit is contained in:
Jason Ekstrand
2021-01-20 11:29:53 -06:00
committed by Marge Bot
parent 16a81cabb5
commit 72c7a68c2b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -2863,10 +2863,10 @@ emit_samplers(struct anv_cmd_buffer *cmd_buffer,
static uint32_t
flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer,
struct anv_cmd_pipeline_state *pipe_state,
const VkShaderStageFlags dirty,
struct anv_shader_bin **shaders,
uint32_t num_shaders)
{
const VkShaderStageFlags dirty = cmd_buffer->state.descriptors_dirty;
VkShaderStageFlags flushed = 0;
VkResult result = VK_SUCCESS;
@@ -2929,8 +2929,6 @@ flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer,
}
}
cmd_buffer->state.descriptors_dirty &= ~flushed;
return flushed;
}
@@ -3611,8 +3609,10 @@ genX(cmd_buffer_flush_state)(struct anv_cmd_buffer *cmd_buffer)
if (cmd_buffer->state.descriptors_dirty) {
dirty = flush_descriptor_sets(cmd_buffer,
&cmd_buffer->state.gfx.base,
cmd_buffer->state.descriptors_dirty,
pipeline->shaders,
ARRAY_SIZE(pipeline->shaders));
cmd_buffer->state.descriptors_dirty &= ~dirty;
}
if (dirty || cmd_buffer->state.push_constants_dirty) {
@@ -4424,7 +4424,9 @@ genX(cmd_buffer_flush_compute_state)(struct anv_cmd_buffer *cmd_buffer)
cmd_buffer->state.compute.pipeline_dirty) {
flush_descriptor_sets(cmd_buffer,
&cmd_buffer->state.compute.base,
VK_SHADER_STAGE_COMPUTE_BIT,
&pipeline->cs, 1);
cmd_buffer->state.descriptors_dirty &= ~VK_SHADER_STAGE_COMPUTE_BIT;
#if GEN_GEN <= 12 && !GEN_IS_GEN12HP
uint32_t iface_desc_data_dw[GENX(INTERFACE_DESCRIPTOR_DATA_length)];