1 files changed, 3 insertions, 44 deletions

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 533840c555..89d9b36af7 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -42,7 +42,8 @@ struct vertex_buffer;
  * state setting functions, plus VBO drawing entrypoint.
  */
 struct pipe_context {
-
+   struct pipe_winsys *winsys;
+   
    void (*destroy)( struct pipe_context * );
 
    /*
@@ -175,44 +176,6 @@ struct pipe_context {
                        GLuint value);
 
 
-   /* Buffer management functions need to be exposed as well.  A pipe
-    * buffer may be used as a texture, render target or vertex/index
-    * buffer, or some combination according to flags.  
-    */
-
-   struct pipe_buffer_handle *(*create_buffer)(struct pipe_context *pipe, 
-					       unsigned alignment,
-					       unsigned flags );
-
-   void *(*buffer_map)( struct pipe_context *pipe, 
-			struct pipe_buffer_handle *buf,
-			unsigned flags );
-   
-   void (*buffer_unmap)( struct pipe_context *pipe, 
-			 struct pipe_buffer_handle *buf );
-
-   struct pipe_buffer_handle *(*buffer_reference)( struct pipe_context *pipe,
-						   struct pipe_buffer_handle *buf );
-
-   void (*buffer_unreference)( struct pipe_context *pipe, 
-			       struct pipe_buffer_handle **buf );
-
-   void (*buffer_data)(struct pipe_context *pipe, 
-		       struct pipe_buffer_handle *buf,
-		       unsigned size, const void *data );
-
-   void (*buffer_subdata)(struct pipe_context *pipe, 
-			  struct pipe_buffer_handle *buf,
-			  unsigned long offset, 
-			  unsigned long size, 
-			  const void *data);
-
-   void (*buffer_get_subdata)(struct pipe_context *pipe, 
-			      struct pipe_buffer_handle *buf,
-			      unsigned long offset, 
-			      unsigned long size, 
-			      void *data);
-
    /*
     * Texture functions
     */
@@ -220,14 +183,10 @@ struct pipe_context {
                                     struct pipe_mipmap_tree *mt );
 
 
-   /* Simple flush/finish support:
+   /* Flush rendering:
     */
    void (*flush)( struct pipe_context *pipe,
 		  unsigned flags );
-
-   void (*wait_idle)( struct pipe_context *pipe );
-
-   void (*flush_frontbuffer)( struct pipe_context *pipe );
 };