Start breaking the #include dependencies between pipe drivers and mesa.

Pipe drivers shouldn't really know much about mesa and certainly shouldn't
be #including files from src/mesa/main and the like.

I've also (in i915simple especially) moved over from GL types to
more conventional int/unsigned usage.  This probably isn't really the
ultimate desired set of types to use - possibly C99 would be better.  It
may even be that a subset of the GL types is preferable.

4 files changed, 16 insertions, 13 deletions

diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index 2d69b6e0dc..14ddf0c306 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -44,7 +44,7 @@
  */
 void
 softpipe_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-               GLuint clearValue)
+               unsigned clearValue)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
    GLint x, y, w, h;
diff --git a/src/mesa/pipe/softpipe/sp_clear.h b/src/mesa/pipe/softpipe/sp_clear.h
index e706e731c2..a8ed1c4ecc 100644
--- a/src/mesa/pipe/softpipe/sp_clear.h
+++ b/src/mesa/pipe/softpipe/sp_clear.h
@@ -37,7 +37,7 @@ struct pipe_context;
 
 extern void
 softpipe_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-               GLuint clearValue);
+               unsigned clearValue);
 
 
 #endif /* SP_CLEAR_H */
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index b68d0f95ac..70a80aff88 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -32,13 +32,15 @@
  * all the enabled attributes run contiguously.
  */
 
-#include "glheader.h"
-#include "imports.h"
+#include "main/mtypes.h"
+
+#include "pipe/p_util.h"
+#include "tgsi/core/tgsi_core.h"
+
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_quad.h"
 #include "sp_tex_sample.h"
-#include "tgsi/core/tgsi_core.h"
 
 #if 0
 #if defined __GNUC__
@@ -71,9 +73,9 @@ struct exec_machine {
    const struct setup_coefficient *coef; /**< will point to quad->coef */
 
 #if ALIGNED_ATTRIBS
-   GLfloat attr[FRAG_ATTRIB_MAX][NUM_CHANNELS][QUAD_SIZE] __attribute__(( aligned( 16 ) ));
+   GLfloat attr[PIPE_ATTRIB_MAX][NUM_CHANNELS][QUAD_SIZE] __attribute__(( aligned( 16 ) ));
 #else
-   GLfloat attr[FRAG_ATTRIB_MAX][NUM_CHANNELS][QUAD_SIZE];
+   GLfloat attr[PIPE_ATTRIB_MAX][NUM_CHANNELS][QUAD_SIZE];
 #endif
 };
 
diff --git a/src/mesa/pipe/softpipe/sp_tex_layout.c b/src/mesa/pipe/softpipe/sp_tex_layout.c
index bd5f5e930d..fda1b46ab4 100644
--- a/src/mesa/pipe/softpipe/sp_tex_layout.c
+++ b/src/mesa/pipe/softpipe/sp_tex_layout.c
@@ -33,6 +33,7 @@
 #include "macros.h"
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
+#include "pipe/p_defines.h"
 #include "sp_tex_layout.h"
 
 
@@ -250,18 +251,18 @@ softpipe_mipmap_tree_layout(struct pipe_context *pipe, struct pipe_mipmap_tree *
                switch (d) {
                case 4:
                   switch (face) {
-                  case FACE_POS_X:
-                  case FACE_NEG_X:
+                  case PIPE_TEX_FACE_POS_X:
+                  case PIPE_TEX_FACE_NEG_X:
                      x += step_offsets[face][0] * d;
                      y += step_offsets[face][1] * d;
                      break;
-                  case FACE_POS_Y:
-                  case FACE_NEG_Y:
+                  case PIPE_TEX_FACE_POS_Y:
+                  case PIPE_TEX_FACE_NEG_Y:
                      y += 12;
                      x -= 8;
                      break;
-                  case FACE_POS_Z:
-                  case FACE_NEG_Z:
+                  case PIPE_TEX_FACE_POS_Z:
+                  case PIPE_TEX_FACE_NEG_Z:
                      y = mt->total_height - 4;
                      x = (face - 4) * 8;
                      break;