6 files changed, 17 insertions, 14 deletions
diff --git a/src/mesa/pipe/i965simple/brw_wm_surface_state.c b/src/mesa/pipe/i965simple/brw_wm_surface_state.c
index 5c7dee5790d..fc40e0438c4 100644
--- a/src/mesa/pipe/i965simple/brw_wm_surface_state.c
+++ b/src/mesa/pipe/i965simple/brw_wm_surface_state.c
@@ -33,7 +33,7 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 
-static unsigned translate_tex_target( int target )
+static unsigned translate_tex_target( enum pipe_texture_target target )
 {
    switch (target) {
    case PIPE_TEXTURE_1D:
@@ -54,9 +54,9 @@ static unsigned translate_tex_target( int target )
    }
 }
 
-static unsigned translate_tex_format( unsigned mesa_format )
+static unsigned translate_tex_format( enum pipe_format pipe_format )
 {
-   switch( mesa_format ) {
+   switch( pipe_format ) {
    case PIPE_FORMAT_U_L8:
       return BRW_SURFACEFORMAT_L8_UNORM;
 
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index a67ed605472..c6d9c02bd91 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -115,10 +115,12 @@
 #define PIPE_STENCIL_OP_INVERT     7
 
 /** Texture types */
-#define PIPE_TEXTURE_1D   0
-#define PIPE_TEXTURE_2D   1
-#define PIPE_TEXTURE_3D   2
-#define PIPE_TEXTURE_CUBE 3
+enum pipe_texture_target {
+   PIPE_TEXTURE_1D   = 0,
+   PIPE_TEXTURE_2D   = 1,
+   PIPE_TEXTURE_3D   = 2,
+   PIPE_TEXTURE_CUBE = 3
+};
 
 #define PIPE_TEX_FACE_POS_X 0
 #define PIPE_TEX_FACE_NEG_X 1
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 16d50fdb826..76e633e930e 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -39,6 +39,7 @@
 #define PIPE_STATE_H
 
 #include "p_compiler.h"
+#include "p_defines.h"
 #include "p_format.h"
 
 /**
@@ -262,8 +263,8 @@ struct pipe_texture
 { 
    /* Effectively the key:
     */
-   unsigned target;            /**< PIPE_TEXTURE_x */
-   enum pipe_format format;    /**< PIPE_FORMAT_x */
+   enum pipe_texture_target target; /**< PIPE_TEXTURE_x */
+   enum pipe_format format;         /**< PIPE_FORMAT_x */
 
    unsigned first_level;
    unsigned last_level;
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index e813bdb47af..773fc0012e2 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -97,7 +97,7 @@ st_get_texobj_texture(struct gl_texture_object *texObj)
 }
 
 
-static unsigned
+static enum pipe_texture_target
 gl_target_to_pipe(GLenum target)
 {
    switch (target) {
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index c7d28eeca20..a2bdf846caf 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -61,8 +61,8 @@ target_to_target(GLenum target)
 
 struct pipe_texture *
 st_texture_create(struct st_context *st,
-                  unsigned target,
-		  unsigned format,
+                  enum pipe_texture_target target,
+		  enum pipe_format format,
 		  GLuint first_level,
 		  GLuint last_level,
 		  GLuint width0,
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index 7524c219e06..d8b1bcad9d5 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -37,8 +37,8 @@ struct pipe_texture;
 
 extern struct pipe_texture *
 st_texture_create(struct st_context *st,
-                  unsigned target,
-		  unsigned format,
+                  enum pipe_texture_target target,
+		  enum pipe_format format,
                   GLuint first_level,
                   GLuint last_level,
                   GLuint width0,