From 90b0925588d42a367bdc34dea8856691b33a44ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 29 Jan 2024 22:27:42 -0500 Subject: [PATCH] radeonsi: constify struct pipe_vertex_buffer * Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_state.h | 2 +- src/gallium/drivers/radeonsi/si_state_draw.cpp | 8 ++++---- src/gallium/drivers/radeonsi/si_state_shaders.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index e60defabd50..a984c7d6918 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -690,7 +690,7 @@ void si_update_tess_io_layout_state(struct si_context *sctx); void si_cp_dma_prefetch(struct si_context *sctx, struct pipe_resource *buf, unsigned offset, unsigned size); void si_set_vertex_buffer_descriptor(struct si_screen *sscreen, struct si_vertex_elements *velems, - struct pipe_vertex_buffer *vb, unsigned element_index, + const struct pipe_vertex_buffer *vb, unsigned element_index, uint32_t *out); void si_emit_buffered_compute_sh_regs(struct si_context *sctx); void si_init_draw_functions_GFX6(struct si_context *sctx); diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index aa9a6fd9861..961f6d129e2 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -1696,7 +1696,7 @@ static void si_emit_draw_packets(struct si_context *sctx, const struct pipe_draw /* Return false if not bound. */ template static void ALWAYS_INLINE si_set_vb_descriptor(struct si_vertex_elements *velems, - struct pipe_vertex_buffer *vb, + const struct pipe_vertex_buffer *vb, unsigned index, /* vertex element index */ uint32_t *desc) /* where to upload descriptors */ { @@ -1727,7 +1727,7 @@ static void ALWAYS_INLINE si_set_vb_descriptor(struct si_vertex_elements *velems #if GFX_VER == 6 /* declare this function only once because it supports all chips. */ void si_set_vertex_buffer_descriptor(struct si_screen *sscreen, struct si_vertex_elements *velems, - struct pipe_vertex_buffer *vb, unsigned element_index, + const struct pipe_vertex_buffer *vb, unsigned element_index, uint32_t *out) { switch (sscreen->info.gfx_level) { @@ -1891,7 +1891,7 @@ static bool si_upload_and_prefetch_VB_descriptors(struct si_context *sctx, /* the first iteration always executes */ do { unsigned vbo_index = velems->vertex_buffer_index[i]; - struct pipe_vertex_buffer *vb = &sctx->vertex_buffer[vbo_index]; + const struct pipe_vertex_buffer *vb = &sctx->vertex_buffer[vbo_index]; uint32_t *desc; radeon_emit_array_get_ptr(4, &desc); @@ -1906,7 +1906,7 @@ static bool si_upload_and_prefetch_VB_descriptors(struct si_context *sctx, /* the first iteration always executes */ do { unsigned vbo_index = velems->vertex_buffer_index[i]; - struct pipe_vertex_buffer *vb = &sctx->vertex_buffer[vbo_index]; + const struct pipe_vertex_buffer *vb = &sctx->vertex_buffer[vbo_index]; uint32_t *desc = &ptr[(i - num_vbos_in_user_sgprs) * 4]; si_set_vb_descriptor(velems, vb, i, desc); diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp index 39a651e2364..058a269526f 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp +++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp @@ -2297,7 +2297,7 @@ void si_vs_key_update_inputs(struct si_context *sctx) unsigned i = u_bit_scan(&mask); unsigned log_hw_load_size = 1 + ((elts->hw_load_is_dword >> i) & 1); unsigned vbidx = elts->vertex_buffer_index[i]; - struct pipe_vertex_buffer *vb = &sctx->vertex_buffer[vbidx]; + const struct pipe_vertex_buffer *vb = &sctx->vertex_buffer[vbidx]; unsigned align_mask = (1 << log_hw_load_size) - 1; if (vb->buffer_offset & align_mask) { fix |= 1 << i;