KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lavapipe: accurately set image/ssbo access based on shader usage 

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15286>
This commit is contained in:
Mike Blumenkrantz 2022-03-03 13:37:51 -05:00 committed by Marge Bot
parent 878784dbec
commit 4ff28bd5d8
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@ -43,6 +43,7 @@
#include "util/u_prim_restart.h"
#include "util/format/u_format_zs.h"
#include "util/ptralloc.h"
#include "tgsi/tgsi_from_mesa.h"
#include "vk_cmd_enqueue_entrypoints.h"
#include "vk_util.h"
@ -127,6 +128,7 @@ struct rendering_state {
struct pipe_vertex_buffer vb[PIPE_MAX_ATTRIBS];
struct cso_velems_state velem;
struct lvp_access_info access[MESA_SHADER_STAGES];
struct pipe_sampler_view *sv[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
int num_sampler_views[PIPE_SHADER_TYPES];
struct pipe_sampler_state ss[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
@ -397,7 +399,7 @@ static void emit_state(struct rendering_state *state)
if (state->sb_dirty[sh]) {
state->pctx->set_shader_buffers(state->pctx, sh,
0, state->num_shader_buffers[sh],
state->sb[sh], (1 << state->num_shader_buffers[sh]) - 1);
state->sb[sh], state->access[tgsi_processor_to_shader_stage(sh)].buffers_written);
}
}
@ -450,6 +452,13 @@ static void handle_compute_pipeline(struct vk_cmd_queue_entry *cmd,
if (!state->has_pcbuf[PIPE_SHADER_COMPUTE] && !pipeline->layout->stage[MESA_SHADER_COMPUTE].uniform_block_count)
state->pcbuf_dirty[PIPE_SHADER_COMPUTE] = false;
state->iv_dirty[MESA_SHADER_COMPUTE] |= state->num_shader_images[MESA_SHADER_COMPUTE] &&
(state->access[MESA_SHADER_COMPUTE].images_read != pipeline->access[MESA_SHADER_COMPUTE].images_read ||
state->access[MESA_SHADER_COMPUTE].images_written != pipeline->access[MESA_SHADER_COMPUTE].images_written);
state->sb_dirty[MESA_SHADER_COMPUTE] |= state->num_shader_buffers[MESA_SHADER_COMPUTE] &&
state->access[MESA_SHADER_COMPUTE].buffers_written != pipeline->access[MESA_SHADER_COMPUTE].buffers_written;
memcpy(&state->access[MESA_SHADER_COMPUTE], &pipeline->access[MESA_SHADER_COMPUTE], sizeof(struct lvp_access_info));
state->dispatch_info.block[0] = pipeline->pipeline_nir[MESA_SHADER_COMPUTE]->info.workgroup_size[0];
state->dispatch_info.block[1] = pipeline->pipeline_nir[MESA_SHADER_COMPUTE]->info.workgroup_size[1];
state->dispatch_info.block[2] = pipeline->pipeline_nir[MESA_SHADER_COMPUTE]->info.workgroup_size[2];
@ -559,6 +568,14 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
unsigned fb_samples = 0;
bool clip_halfz = state->rs_state.clip_halfz;
for (enum pipe_shader_type sh = PIPE_SHADER_VERTEX; sh < PIPE_SHADER_COMPUTE; sh++) {
state->iv_dirty[sh] |= state->num_shader_images[sh] &&
(state->access[sh].images_read != pipeline->access[sh].images_read ||
state->access[sh].images_written != pipeline->access[sh].images_written);
state->sb_dirty[sh] |= state->num_shader_buffers[sh] && state->access[sh].buffers_written != pipeline->access[sh].buffers_written;
}
memcpy(state->access, pipeline->access, sizeof(struct lvp_access_info) * 5); //4 vertex stages + fragment
memset(dynamic_states, 0, sizeof(dynamic_states));
if (pipeline->graphics_create_info.pDynamicState)
{
@ -1219,8 +1236,19 @@ static void fill_image_view_stage(struct rendering_state *state,
state->iv[p_stage][idx].u.tex.last_layer = 0;
state->iv[p_stage][idx].u.tex.level = 0;
}
state->iv[p_stage][idx].access = PIPE_IMAGE_ACCESS_READ_WRITE;
state->iv[p_stage][idx].shader_access = PIPE_IMAGE_ACCESS_READ_WRITE;
assert(idx < 32);
state->iv[p_stage][idx].access = 0;
state->iv[p_stage][idx].shader_access = 0;
if (state->access[stage].images_read & BITFIELD_BIT(idx)) {
state->iv[p_stage][idx].access |= PIPE_IMAGE_ACCESS_READ;
state->iv[p_stage][idx].shader_access |= PIPE_IMAGE_ACCESS_READ;
}
if (state->access[stage].images_written & BITFIELD_BIT(idx)) {
state->iv[p_stage][idx].access |= PIPE_IMAGE_ACCESS_WRITE;
state->iv[p_stage][idx].shader_access |= PIPE_IMAGE_ACCESS_WRITE;
}
if (state->num_shader_images[p_stage] <= idx)
state->num_shader_images[p_stage] = idx + 1;