From 8376fb0f3336f3b7dce827ba997adf9df3e18e33 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 23 May 2022 14:53:49 +0200 Subject: [PATCH] iris: do not do STATIC_ASSERT on variables Reviewed-by: Yonggang Luo Part-of: --- src/gallium/drivers/iris/iris_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 00114113062..f95339f2a5b 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2345,7 +2345,7 @@ static void alloc_surface_states(struct iris_surface_state *surf_state, unsigned aux_usages) { - const unsigned surf_size = 4 * GENX(RENDER_SURFACE_STATE_length); + enum { surf_size = 4 * GENX(RENDER_SURFACE_STATE_length) }; /* If this changes, update this to explicitly align pointers */ STATIC_ASSERT(surf_size == SURFACE_STATE_ALIGNMENT); @@ -6235,7 +6235,7 @@ iris_upload_dirty_render_state(struct iris_context *ice, for (int i = 0; i < 4; i++) { struct iris_stream_output_target *tgt = (void *) ice->state.so_target[i]; - const uint32_t dwords = GENX(3DSTATE_SO_BUFFER_length); + enum { dwords = GENX(3DSTATE_SO_BUFFER_length) }; uint32_t *so_buffers = genx->so_buffers + i * dwords; bool zero_offset = false;