Mesa (main): v3dv: do not do STATIC_ASSERT on variables

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 3 07:49:47 UTC 2022


Module: Mesa
Branch: main
Commit: cf52d79d2472c83ae6d8de8f8fc0796174beb854
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf52d79d2472c83ae6d8de8f8fc0796174beb854

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon May 23 14:58:48 2022 +0200

v3dv: do not do STATIC_ASSERT on variables

Use an enum value instead, so it's guaranteed to be constant.

Reviewed-by: Yonggang Luo <luoyonggang at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16670>

---

 src/gallium/drivers/v3d/v3dx_draw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
index a3bc11907d7..9c956761d7b 100644
--- a/src/gallium/drivers/v3d/v3dx_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -739,8 +739,7 @@ v3d_emit_gl_shader_state(struct v3d_context *v3d,
                 if (!rsc)
                         continue;
 
-                const uint32_t size =
-                        cl_packet_length(GL_SHADER_STATE_ATTRIBUTE_RECORD);
+                enum { size = cl_packet_length(GL_SHADER_STATE_ATTRIBUTE_RECORD) };
                 cl_emit_with_prepacked(&job->indirect,
                                        GL_SHADER_STATE_ATTRIBUTE_RECORD,
                                        &vtx->attrs[i * size], attr) {



More information about the mesa-commit mailing list