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.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index 93b5e2546c..d69657daa9 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -82,10 +82,10 @@ struct i915_cache_context;
  */
 struct i915_state 
 {
-   GLuint immediate[I915_MAX_IMMEDIATE];
-   GLuint dynamic[I915_MAX_DYNAMIC];
+   unsigned immediate[I915_MAX_IMMEDIATE];
+   unsigned dynamic[I915_MAX_DYNAMIC];
    
-   GLuint id;			/* track lost context events */
+   unsigned id;			/* track lost context events */
 };
 
 
@@ -113,15 +113,15 @@ struct i915_context
    struct pipe_stencil_state stencil;
    struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
    struct pipe_viewport_state viewport;
-   GLuint dirty;
+   unsigned dirty;
 
-   GLuint *batch_start;
+   unsigned *batch_start;
 
    struct i915_state current;
-   GLuint hardware_dirty;
+   unsigned hardware_dirty;
    
-   GLuint debug;
-   GLuint pci_id;
+   unsigned debug;
+   unsigned pci_id;
 
    struct {
       unsigned is_i945:1;
@@ -179,7 +179,7 @@ unsigned *i915_passthrough_program( unsigned *dwords );
  * i915_clear.c: 
  */
 void i915_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-		GLuint clearValue);
+		unsigned clearValue);
 
 
 /***********************************************************************