From: Zack Rusin <zack@tungstengraphics.com>
Date: Mon, 29 Oct 2007 12:35:08 +0000 (-0400)
Subject: Remove typedefs from enums.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a70c5e37f1c2e43738469e4799ad2b9e7c604782;p=mesa.git

Remove typedefs from enums.

typedefs are rather evil, remove them and use the enum
keyword explicitely.
---

diff --git a/src/mesa/pipe/draw/draw_flatshade.c b/src/mesa/pipe/draw/draw_flatshade.c
index 2ba0d5820e9..3b22c01b34e 100644
--- a/src/mesa/pipe/draw/draw_flatshade.c
+++ b/src/mesa/pipe/draw/draw_flatshade.c
@@ -56,7 +56,7 @@ static INLINE void copy_colors( struct draw_stage *stage,
                                 const struct vertex_header *src )
 {
    const uint num_attribs = stage->draw->vertex_info.num_attribs;
-   const interp_mode *interp = stage->draw->vertex_info.interp_mode;
+   const enum interp_mode *interp = stage->draw->vertex_info.interp_mode;
    uint i;
 
    /* Look for constant/flat attribs and duplicate from src to dst vertex */
diff --git a/src/mesa/pipe/draw/draw_vertex.c b/src/mesa/pipe/draw/draw_vertex.c
index 1204a944dea..ce76cb043c9 100644
--- a/src/mesa/pipe/draw/draw_vertex.c
+++ b/src/mesa/pipe/draw/draw_vertex.c
@@ -44,7 +44,7 @@
 
 static INLINE void
 emit_vertex_attr(struct vertex_info *vinfo,
-                 attrib_format format, interp_mode interp)
+                 enum attrib_format format, enum interp_mode interp)
 {
    const uint n = vinfo->num_attribs;
    vinfo->interp_mode[n] = interp;
@@ -95,7 +95,7 @@ draw_compute_vertex_size(struct vertex_info *vinfo)
 void
 draw_set_vertex_attributes( struct draw_context *draw,
                             const uint *slot_to_vf_attr,
-                            const interp_mode *interps,
+                            const enum interp_mode *interps,
                             unsigned nr_attrs )
 {
    struct vertex_info *vinfo = &draw->vertex_info;
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/mesa/pipe/draw/draw_vertex.h
index 29689817084..a1fa7aae5a1 100644
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/mesa/pipe/draw/draw_vertex.h
@@ -40,7 +40,7 @@ struct draw_context;
 /**
  * Vertex attribute format
  */
-typedef enum {
+enum attrib_format {
    FORMAT_OMIT,
    FORMAT_1F,
    FORMAT_2F,
@@ -48,18 +48,18 @@ typedef enum {
    FORMAT_4F,
    FORMAT_4F_VIEWPORT,
    FORMAT_4UB
-} attrib_format;
+};
 
 
 /**
  * Attribute interpolation mode
  */
-typedef enum {
+enum interp_mode {
    INTERP_NONE,      /**< never interpolate vertex header info */
    INTERP_CONSTANT,
    INTERP_LINEAR,
    INTERP_PERSPECTIVE
-} interp_mode;
+};
 
 
 /**
@@ -69,8 +69,8 @@ struct vertex_info
 {
    uint num_attribs;
    uint hwfmt[4];      /**< hardware format info for this format */
-   interp_mode interp_mode[PIPE_MAX_SHADER_OUTPUTS];
-   attrib_format format[PIPE_MAX_SHADER_OUTPUTS];   /**< FORMAT_x */
+   enum interp_mode interp_mode[PIPE_MAX_SHADER_OUTPUTS];
+   enum attrib_format format[PIPE_MAX_SHADER_OUTPUTS];   /**< FORMAT_x */
    uint size;          /**< total vertex size in dwords */
 };
 
@@ -82,7 +82,7 @@ struct vertex_info
  */
 static INLINE uint
 draw_emit_vertex_attr(struct vertex_info *vinfo,
-                      attrib_format format, interp_mode interp)
+                      enum attrib_format format, enum interp_mode interp)
 {
    const uint n = vinfo->num_attribs;
    assert(n < PIPE_MAX_SHADER_OUTPUTS);
@@ -95,7 +95,7 @@ draw_emit_vertex_attr(struct vertex_info *vinfo,
 
 extern void draw_set_vertex_attributes( struct draw_context *draw,
                                         const uint *attrs,
-                                        const interp_mode *interps,
+                                        const enum interp_mode *interps,
                                         unsigned nr_attrs );
 
 extern void draw_set_twoside_attributes(struct draw_context *draw,
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index 5d312286f60..5c748ea896c 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -130,7 +130,7 @@ struct i915_depth_stencil_state {
 struct i915_rasterizer_state {
    int light_twoside : 1;
    unsigned st;
-   interp_mode color_interp;
+   enum interp_mode color_interp;
 
    unsigned LIS4;
    unsigned LIS7;
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/mesa/pipe/i915simple/i915_state_derived.c
index 95f705929e3..ed1521fcce2 100644
--- a/src/mesa/pipe/i915simple/i915_state_derived.c
+++ b/src/mesa/pipe/i915simple/i915_state_derived.c
@@ -44,7 +44,7 @@
 static void calculate_vertex_layout( struct i915_context *i915 )
 {
    const struct pipe_shader_state *fs = i915->fs;
-   const interp_mode colorInterp = i915->rasterizer->color_interp;
+   const enum interp_mode colorInterp = i915->rasterizer->color_interp;
    struct vertex_info vinfo;
    uint front0 = 0, back0 = 0, front1 = 0, back1 = 0;
    boolean needW = 0;
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c
index 0b1b592bbe3..21d643bfe09 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.c
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.c
@@ -471,7 +471,7 @@ static void tri_persp_coeff( struct setup_stage *setup,
  */
 static void setup_tri_coefficients( struct setup_stage *setup )
 {
-   const interp_mode *interp = setup->softpipe->vertex_info.interp_mode;
+   const enum interp_mode *interp = setup->softpipe->vertex_info.interp_mode;
    unsigned slot, j;
 
    /* z and w are done by linear interpolation:
@@ -701,7 +701,7 @@ line_persp_coeff(struct setup_stage *setup, unsigned slot, unsigned i)
 static INLINE void
 setup_line_coefficients(struct setup_stage *setup, struct prim_header *prim)
 {
-   const interp_mode *interp = setup->softpipe->vertex_info.interp_mode;
+   const enum interp_mode *interp = setup->softpipe->vertex_info.interp_mode;
    unsigned slot, j;
 
    /* use setup->vmin, vmax to point to vertices */
@@ -927,7 +927,7 @@ static void
 setup_point(struct draw_stage *stage, struct prim_header *prim)
 {
    struct setup_stage *setup = setup_stage( stage );
-   const interp_mode *interp = setup->softpipe->vertex_info.interp_mode;
+   const enum interp_mode *interp = setup->softpipe->vertex_info.interp_mode;
    const struct vertex_header *v0 = prim->v[0];
    const int sizeAttr = setup->softpipe->psize_slot;
    const float size
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index b6145df8e25..e5ca953e604 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -45,7 +45,7 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
 {
    const struct pipe_shader_state *vs = softpipe->vs->state;
    const struct pipe_shader_state *fs = softpipe->fs;
-   const interp_mode colorInterp
+   const enum interp_mode colorInterp
       = softpipe->rasterizer->flatshade ? INTERP_CONSTANT : INTERP_LINEAR;
    struct vertex_info *vinfo = &softpipe->vertex_info;
    boolean emitBack0 = FALSE, emitBack1 = FALSE, emitPsize = FALSE;
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index d7d9a1d203b..065e157bc68 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -325,7 +325,7 @@ set_feedback_vertex_format(GLcontext *ctx)
 {
    struct st_context *st = ctx->st;
    uint attrs[PIPE_MAX_SHADER_OUTPUTS];
-   interp_mode interp[PIPE_MAX_SHADER_OUTPUTS];
+   enum interp_mode interp[PIPE_MAX_SHADER_OUTPUTS];
    GLuint n, i;
 
    if (ctx->RenderMode == GL_FEEDBACK) {