From 04d7b9c396ffa615ff39fcd6b46cf31e3851454d Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 29 Jan 2024 14:23:12 +0100 Subject: [PATCH] panvk: Stop declaring one push constant array per graphics stage The push constant array is shared by all stages anyway, so let's just declare one array. While at it, change the name into push_uniforms to be consistent with the name we have in panvk_dispatch. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index cfd115fe07c..14c2d0ceb6e 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -71,8 +71,8 @@ struct panvk_draw_info { mali_ptr varyings; mali_ptr attributes; mali_ptr attribute_bufs; - mali_ptr push_constants; } stages[MESA_SHADER_STAGES]; + mali_ptr push_uniforms; mali_ptr varying_bufs; mali_ptr textures; mali_ptr samplers; @@ -1129,7 +1129,7 @@ panvk_draw_prepare_vertex_job(struct panvk_cmd_buffer *cmdbuf, cfg.instance_size = draw->instance_count > 1 ? draw->padded_vertex_count : 1; cfg.uniform_buffers = draw->ubos; - cfg.push_uniforms = draw->stages[PIPE_SHADER_VERTEX].push_constants; + cfg.push_uniforms = draw->push_uniforms; cfg.textures = draw->textures; cfg.samplers = draw->samplers; } @@ -1219,7 +1219,7 @@ panvk_emit_tiler_dcd(const struct panvk_pipeline *pipeline, cfg.instance_size = draw->instance_count > 1 ? draw->padded_vertex_count : 1; cfg.uniform_buffers = draw->ubos; - cfg.push_uniforms = draw->stages[PIPE_SHADER_FRAGMENT].push_constants; + cfg.push_uniforms = draw->push_uniforms; cfg.textures = draw->textures; cfg.samplers = draw->samplers;