Mesa (lp-surface-tiling): llvmpipe: SETUP_x enum clean-up

Brian Paul brianp at kemper.freedesktop.org
Tue Mar 30 17:39:30 PDT 2010


Module: Mesa
Branch: lp-surface-tiling
Commit: dd6014abcf86c517d159b8175e0eaeb167ea2ef6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd6014abcf86c517d159b8175e0eaeb167ea2ef6

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Mar 30 09:15:17 2010 -0600

llvmpipe: SETUP_x enum clean-up

---

 src/gallium/drivers/llvmpipe/lp_setup.c         |    7 +++++--
 src/gallium/drivers/llvmpipe/lp_setup_context.h |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index cd106c7..a3a4c5b 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -52,7 +52,7 @@
 #include "draw/draw_vbuf.h"
 
 
-static void set_scene_state( struct lp_setup_context *, unsigned );
+static void set_scene_state( struct lp_setup_context *, enum setup_state );
 
 
 struct lp_scene *
@@ -191,7 +191,7 @@ execute_clears( struct lp_setup_context *setup )
 
 static void
 set_scene_state( struct lp_setup_context *setup,
-           unsigned new_state )
+                 enum setup_state new_state )
 {
    unsigned old_state = setup->state;
 
@@ -218,6 +218,9 @@ set_scene_state( struct lp_setup_context *setup,
       else
          lp_setup_rasterize_scene( setup, TRUE );
       break;
+
+   default:
+      assert(0 && "invalid setup state mode");
    }
 
    setup->state = new_state;
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_context.h b/src/gallium/drivers/llvmpipe/lp_setup_context.h
index ca0dafa..3804adb 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_context.h
+++ b/src/gallium/drivers/llvmpipe/lp_setup_context.h
@@ -99,7 +99,7 @@ struct lp_setup_context
       union lp_rast_cmd_arg zstencil; /**< lp_rast_clear_zstencil() cmd */
    } clear;
 
-   enum {
+   enum setup_state {
       SETUP_FLUSHED,
       SETUP_CLEARED,
       SETUP_ACTIVE



More information about the mesa-commit mailing list