Module: Mesa Branch: main Commit: a125f2d8c7cf0bc773017b58a6642ec2965c31e0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a125f2d8c7cf0bc773017b58a6642ec2965c31e0
Author: Erik Faye-Lund <[email protected]> Date: Tue Oct 11 16:02:29 2022 +0200 mesa/st: move static asserts out of translate_prim Reviewed-by: Yonggang Luo <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19034> --- src/mesa/state_tracker/st_draw.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 848f04b9606..41765c77bfa 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -67,6 +67,11 @@ #include "draw/draw_context.h" #include "cso_cache/cso_context.h" +/* GL prims should match Gallium prims, spot-check a few */ +static_assert(GL_POINTS == PIPE_PRIM_POINTS, "enum mismatch"); +static_assert(GL_QUADS == PIPE_PRIM_QUADS, "enum mismatch"); +static_assert(GL_TRIANGLE_STRIP_ADJACENCY == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY, "enum mismatch"); +static_assert(GL_PATCHES == PIPE_PRIM_PATCHES, "enum mismatch"); /** * Translate OpenGL primtive type (GL_POINTS, GL_TRIANGLE_STRIP, etc) to @@ -75,12 +80,6 @@ static unsigned translate_prim(const struct gl_context *ctx, unsigned prim) { - /* GL prims should match Gallium prims, spot-check a few */ - STATIC_ASSERT(GL_POINTS == PIPE_PRIM_POINTS); - STATIC_ASSERT(GL_QUADS == PIPE_PRIM_QUADS); - STATIC_ASSERT(GL_TRIANGLE_STRIP_ADJACENCY == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY); - STATIC_ASSERT(GL_PATCHES == PIPE_PRIM_PATCHES); - return prim; }
