1 files changed, 3 insertions, 55 deletions

diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/mesa/pipe/i915simple/i915_winsys.h
index a3dadbfd3d..803ee9073c 100644
--- a/src/mesa/pipe/i915simple/i915_winsys.h
+++ b/src/mesa/pipe/i915simple/i915_winsys.h
@@ -47,57 +47,10 @@
  */
 
 struct pipe_buffer_handle;
+struct pipe_winsys;
 
 struct i915_winsys {
 
-   /* Do any special operations to ensure frontbuffer contents are
-    * displayed, eg copy fake frontbuffer.
-    */
-   void (*flush_frontbuffer)( struct i915_winsys *sws );
-
-
-   /* debug output 
-    */
-   void (*printf)( struct i915_winsys *sws, 
-		   const char *, ... );	
-
-   /* 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 *(*buffer_create)(struct i915_winsys *sws, 
-					       unsigned alignment );
-
-   void *(*buffer_map)( struct i915_winsys *sws, 
-			struct pipe_buffer_handle *buf );
-   
-   void (*buffer_unmap)( struct i915_winsys *sws, 
-			 struct pipe_buffer_handle *buf );
-
-   struct pipe_buffer_handle *(*buffer_reference)( struct i915_winsys *sws,
-						   struct pipe_buffer_handle *buf );
-
-   void (*buffer_unreference)( struct i915_winsys *sws, 
-			       struct pipe_buffer_handle **buf );
-
-   void (*buffer_data)(struct i915_winsys *sws, 
-		       struct pipe_buffer_handle *buf,
-		       unsigned size, const void *data );
-
-   void (*buffer_subdata)(struct i915_winsys *sws, 
-			  struct pipe_buffer_handle *buf,
-			  unsigned long offset, 
-			  unsigned long size, 
-			  const void *data);
-
-   void (*buffer_get_subdata)(struct i915_winsys *sws, 
-			      struct pipe_buffer_handle *buf,
-			      unsigned long offset, 
-			      unsigned long size, 
-			      void *data);
-
-
    /* An over-simple batchbuffer mechanism.  Will want to improve the
     * performance of this, perhaps based on the cmdstream stuff.  It
     * would be pretty impossible to implement swz on top of this
@@ -116,20 +69,15 @@ struct i915_winsys {
 			unsigned access_flags,
 			unsigned delta );
    void (*batch_flush)( struct i915_winsys *sws );
-   void (*batch_wait_idle)( struct i915_winsys *sws );
-   
 
-   /* Printf???
-    */
-   void (*dpf)( const char *fmt, ... );
-   
 };
 
 #define I915_BUFFER_ACCESS_WRITE   0x1 
 #define I915_BUFFER_ACCESS_READ    0x2
 
 
-struct pipe_context *i915_create( struct i915_winsys *,
+struct pipe_context *i915_create( struct pipe_winsys *,
+				  struct i915_winsys *,
 				  unsigned pci_id );