From a70c5e37f1c2e43738469e4799ad2b9e7c604782 Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Mon, 29 Oct 2007 08:35:08 -0400
Subject: Remove typedefs from enums.

typedefs are rather evil, remove them and use the enum
keyword explicitely.
---
 src/mesa/pipe/draw/draw_flatshade.c |  2 +-
 src/mesa/pipe/draw/draw_vertex.c    |  4 ++--
 src/mesa/pipe/draw/draw_vertex.h    | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/mesa/pipe/draw')

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,
-- 
cgit v1.2.3