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

panfrost: Emit attribs in panfrost_update_state_3d() on bifrost/midgard

Browse Source 
The dirty state tracking should allow us to conditionally re-emit the
vertex attribute and attribute buffer arrays if something relevant
changed.

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 09:05:23 +02:00
committed by Marge Bot
parent ac486a0115
commit 3db963a135
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@@ -2930,6 +2930,17 @@ panfrost_update_state_3d(struct panfrost_batch *batch)
batch->attrib_bufs[PIPE_SHADER_VERTEX] =
panfrost_emit_vertex_buffers(batch);
}
#else
unsigned vt_shader_dirty = ctx->dirty_shader[PIPE_SHADER_VERTEX];
/* Vertex data, vertex shader and images accessed by the vertex shader have
* an impact on the attributes array, we need to re-emit anytime one of these
* parameters changes. */
if ((dirty & PAN_DIRTY_VERTEX) ||
(vt_shader_dirty & (PAN_DIRTY_STAGE_IMAGE | PAN_DIRTY_STAGE_SHADER))) {
batch->attribs[PIPE_SHADER_VERTEX] = panfrost_emit_vertex_data(
batch, &batch->attrib_bufs[PIPE_SHADER_VERTEX]);
}
#endif
}
@@ -3606,9 +3617,6 @@ panfrost_direct_draw(struct panfrost_batch *batch,
panfrost_emit_varying_descriptor(
batch, ctx->padded_count * ctx->instance_count, &vs_vary, &fs_vary,
&varyings, NULL, &pos, &psiz, info->mode == MESA_PRIM_POINTS);
mali_ptr attribs, attrib_bufs;
attribs = panfrost_emit_vertex_data(batch, &attrib_bufs);
#endif
panfrost_update_state_3d(batch);
@@ -3616,6 +3624,9 @@ panfrost_direct_draw(struct panfrost_batch *batch,
panfrost_update_shader_state(batch, PIPE_SHADER_FRAGMENT);
panfrost_clean_state_3d(ctx);
UNUSED mali_ptr attrib_bufs = batch->attrib_bufs[PIPE_SHADER_VERTEX];
UNUSED mali_ptr attribs = batch->attribs[PIPE_SHADER_VERTEX];
if (ctx->uncompiled[PIPE_SHADER_VERTEX]->xfb) {
#if PAN_ARCH >= 9
mali_ptr attribs = 0, attrib_bufs = 0;