5 files changed, 14 insertions, 18 deletions

diff --git a/src/mesa/pipe/i915simple/i915_buffer.c b/src/mesa/pipe/i915simple/i915_buffer.c
index eaaf3c1bebd..680213182b4 100644
--- a/src/mesa/pipe/i915simple/i915_buffer.c
+++ b/src/mesa/pipe/i915simple/i915_buffer.c
@@ -40,12 +40,12 @@
  * evolve in separate directions...  Don't try and remove this yet.
  */
 static struct pipe_buffer_handle *
-i915_create_buffer(struct pipe_context *pipe, 
+i915_buffer_create(struct pipe_context *pipe, 
 		 unsigned alignment,
 		 unsigned flags)
 {
    struct i915_context *i915 = i915_context( pipe );
-   return i915->winsys->create_buffer( i915->winsys, alignment );
+   return i915->winsys->buffer_create( i915->winsys, alignment );
 }
 
 static void *i915_buffer_map(struct pipe_context *pipe, 
@@ -110,7 +110,7 @@ static void i915_buffer_get_subdata(struct pipe_context *pipe,
 void
 i915_init_buffer_functions( struct i915_context *i915 )
 {
-   i915->pipe.create_buffer = i915_create_buffer;
+   i915->pipe.create_buffer = i915_buffer_create;
    i915->pipe.buffer_map = i915_buffer_map;
    i915->pipe.buffer_unmap = i915_buffer_unmap;
    i915->pipe.buffer_reference = i915_buffer_reference;
diff --git a/src/mesa/pipe/i915simple/i915_regions.c b/src/mesa/pipe/i915simple/i915_regions.c
index 52181cf9f47..e2b807f959a 100644
--- a/src/mesa/pipe/i915simple/i915_regions.c
+++ b/src/mesa/pipe/i915simple/i915_regions.c
@@ -89,7 +89,7 @@ i915_region_alloc(struct pipe_context *pipe,
    region->height = height;     /* needed? */
    region->refcount = 1;
 
-   region->buffer = i915->winsys->create_buffer( i915->winsys, 64 );
+   region->buffer = i915->winsys->buffer_create( i915->winsys, 64 );
 
    i915->winsys->buffer_data( i915->winsys,
 			      region->buffer, 
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/mesa/pipe/i915simple/i915_state.c
index d732e879db0..ebc55eb6346 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/mesa/pipe/i915simple/i915_state.c
@@ -135,12 +135,11 @@ static void i915_set_sampler_state(struct pipe_context *pipe,
 
 
 static void i915_set_texture_state(struct pipe_context *pipe,
-                           GLuint unit,
-                           struct pipe_texture_object *texture)
+				   GLuint unit,
+				   struct pipe_mipmap_tree *texture)
 {
    struct i915_context *i915 = i915_context(pipe);
 
-   assert(unit < PIPE_MAX_SAMPLERS);
    i915->texture[unit] = texture;  /* ptr, not struct */
 
    i915->dirty |= I915_NEW_TEXTURE;
diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/mesa/pipe/i915simple/i915_state_emit.c
index ba8cbdacf37..c0539daa6e3 100644
--- a/src/mesa/pipe/i915simple/i915_state_emit.c
+++ b/src/mesa/pipe/i915simple/i915_state_emit.c
@@ -189,7 +189,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
 
       OUT_RELOC(cbuf_region->buffer,
 		I915_BUFFER_ACCESS_WRITE,
-		/*cbuf_region->draw_offset*/0);
+		0);
    }
 
    /* What happens if no zbuf??
@@ -207,7 +207,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
 
       OUT_RELOC(depth_region->buffer,
 		I915_BUFFER_ACCESS_WRITE,
-		/*depth_region->draw_offset*/0);
+		0);
    }
 
    
diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/mesa/pipe/i915simple/i915_winsys.h
index 514c53c7b21..50cb231422d 100644
--- a/src/mesa/pipe/i915simple/i915_winsys.h
+++ b/src/mesa/pipe/i915simple/i915_winsys.h
@@ -51,16 +51,12 @@ struct pipe_buffer_handle;
 struct i915_winsys {
 
 
-   /* The buffer manager is modeled after the dri_bugmgr interface,
-    * but this is the subset that i915 cares about.  Remember that
-    * i915 gets to choose the interface it needs, and the window
-    * systems must then implement that interface (rather than the
-    * other way around...).
-    *
-    * I915 only really wants to make system memory allocations,
-    * right?? 
+   /* Many of the winsys's are probably going to have a similar
+    * buffer-manager interface, as something almost identical is
+    * currently exposed in the pipe interface.  Probably want to avoid
+    * endless repetition of this code somehow.
     */
-   struct pipe_buffer_handle *(*create_buffer)(struct i915_winsys *sws, 
+   struct pipe_buffer_handle *(*buffer_create)(struct i915_winsys *sws, 
 					       unsigned alignment );
 
    void *(*buffer_map)( struct i915_winsys *sws, 
@@ -110,6 +106,7 @@ struct i915_winsys {
 			unsigned access_flags,
 			unsigned delta );
    void (*batch_flush)( struct i915_winsys *sws );
+   void (*batch_wait_idle)( struct i915_winsys *sws );
    
 
    /* Printf???