From 46b13666d8c045acf066f2982cc0a89b6584f09d Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 30 Sep 2015 15:23:38 -0700 Subject: [PATCH] radeon: Use C99 initializers for primitive arrays MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Using C99 initializers for the primitive arrays makes things more readable. Signed-off-by: Ian Romanick Suggested-by: Matt Turner Reviewed-by: Marek Olšák Reviewed-by: Matt Turner --- src/mesa/drivers/dri/radeon/radeon_swtcl.c | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c index b671a3b..d7a02e9 100644 --- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c @@ -359,16 +359,16 @@ void r100_swtcl_flush(struct gl_context *ctx, uint32_t current_offset) #define HAVE_ELTS 0 static const GLuint hw_prim[GL_POLYGON+1] = { - RADEON_CP_VC_CNTL_PRIM_TYPE_POINT, - RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, - 0, - RADEON_CP_VC_CNTL_PRIM_TYPE_LINE_STRIP, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_STRIP, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN, - 0, - 0, - 0 + [GL_POINTS] = RADEON_CP_VC_CNTL_PRIM_TYPE_POINT, + [GL_LINES] = RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, + [GL_LINE_LOOP] = 0, + [GL_LINE_STRIP] = RADEON_CP_VC_CNTL_PRIM_TYPE_LINE_STRIP, + [GL_TRIANGLES] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, + [GL_TRIANGLE_STRIP] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_STRIP, + [GL_TRIANGLE_FAN] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN, + [GL_QUADS] = 0, + [GL_QUAD_STRIP] = 0, + [GL_POLYGON] = 0 }; static inline void @@ -468,16 +468,16 @@ const struct tnl_pipeline_stage _radeon_render_stage = static const GLuint reduced_hw_prim[GL_POLYGON+1] = { - RADEON_CP_VC_CNTL_PRIM_TYPE_POINT, - RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, - RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, - RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, - RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST + [GL_POINTS] = RADEON_CP_VC_CNTL_PRIM_TYPE_POINT, + [GL_LINES] = RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, + [GL_LINE_LOOP] = RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, + [GL_LINE_STRIP] = RADEON_CP_VC_CNTL_PRIM_TYPE_LINE, + [GL_TRIANGLES] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, + [GL_TRIANGLE_STRIP] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, + [GL_TRIANGLE_FAN] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, + [GL_QUADS] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, + [GL_QUAD_STRIP] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST, + [GL_POLYGON] = RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST }; static void radeonRasterPrimitive( struct gl_context *ctx, GLuint hwprim ); -- 2.7.4