fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Emit image attribs for compute in panfrost_update_shader_state()

Browse source 
This will make the job-frontend split easier, and it also makes sense
to update image attributes here for compute.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26221>
This commit is contained in:
Boris Brezillon 2023-10-05 10:29:04 +02:00 • committed by Marge Bot
parent 3db963a135
commit 9ac3117e3e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -2894,7 +2894,10 @@ panfrost_update_shader_state(struct panfrost_batch *batch,
batch->rsd[st] = panfrost_emit_frag_shader_meta(batch);
}
if (frag && (dirty & PAN_DIRTY_STAGE_IMAGE)) {
/* Vertex shaders need to mix vertex data and image descriptors in the
* attribute array. This is taken care of in panfrost_update_state_3d().
*/
if (st != PIPE_SHADER_VERTEX && (dirty & PAN_DIRTY_STAGE_IMAGE)) {
batch->attribs[st] =
panfrost_emit_image_attribs(batch, &batch->attrib_bufs[st], st);
}
@ -3824,8 +3827,8 @@ panfrost_launch_grid_on_batch(struct pipe_context *pipe,
pan_section_pack(t.cpu, COMPUTE_JOB, DRAW, cfg) {
cfg.state = batch->rsd[PIPE_SHADER_COMPUTE];
cfg.attributes = panfrost_emit_image_attribs(
batch, &cfg.attribute_buffers, PIPE_SHADER_COMPUTE);
cfg.attributes = batch->attribs[PIPE_SHADER_COMPUTE];
cfg.attribute_buffers = batch->attrib_bufs[PIPE_SHADER_COMPUTE];
cfg.thread_storage = panfrost_emit_shared_memory(batch, info);
cfg.uniform_buffers = batch->uniform_buffers[PIPE_SHADER_COMPUTE];
cfg.push_uniforms = batch->push_uniforms[PIPE_SHADER_COMPUTE];