[Mesa-dev] [PATCH 07.2/18] radeon: Use C99 initializers for primitive arrays

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Thu, Oct 1, 2015 at 12:36 AM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Using C99 initializers for the primitive arrays makes things more
> readable.
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Suggested-by: Matt Turner <mattst88 at gmail.com>
> ---
>  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.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev