From d80392a6df9313225893f245d45fa8d404f2888e Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Wed, 16 Aug 2023 16:57:45 +0200 Subject: [PATCH] r600: use correct cso pointer for fetch shader Fixes: 76725452 (gallium: move vertex stride to CSO) Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9567 Signed-off-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/evergreen_state.c | 2 +- src/gallium/drivers/r600/r600_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 517e5d5..4ae1208 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -2139,7 +2139,7 @@ static void evergreen_emit_vertex_buffers(struct r600_context *rctx, struct r600_resource *rbuffer; uint64_t va; unsigned buffer_index = u_bit_scan(&dirty_mask); - struct r600_fetch_shader *shader = (struct r600_fetch_shader*)&rctx->vertex_fetch_shader; + struct r600_fetch_shader *shader = (struct r600_fetch_shader*)rctx->vertex_fetch_shader.cso; unsigned stride = pkt_flags == RADEON_CP_PACKET3_COMPUTE_MODE ? 1 : shader->strides[buffer_index]; diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 6e686de..df1514c 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1670,7 +1670,7 @@ static void r600_emit_vertex_buffers(struct r600_context *rctx, struct r600_atom struct r600_resource *rbuffer; unsigned offset; unsigned buffer_index = u_bit_scan(&dirty_mask); - struct r600_fetch_shader *shader = (struct r600_fetch_shader*)&rctx->vertex_fetch_shader; + struct r600_fetch_shader *shader = (struct r600_fetch_shader*)rctx->vertex_fetch_shader.cso; unsigned stride = shader->strides[buffer_index]; vb = &rctx->vertex_buffer_state.vb[buffer_index]; -- 2.7.4