gallium: Massage the interface to more closely resemble ARB_map_buffer_range

1 files changed, 10 insertions, 19 deletions

diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 69db80ee3f..48f6b69d92 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -56,13 +56,6 @@ struct pipe_buffer;
 
 
 
-struct pipe_buffer_range 
-{
-   unsigned offset;
-   unsigned size;
-};
-
-
 /**
  * Gallium screen/adapter context.  Basically everything
  * hardware-specific that doesn't actually require a rendering
@@ -216,10 +209,6 @@ struct pipe_screen {
    void *(*buffer_map)( struct pipe_screen *screen,
 			struct pipe_buffer *buf,
 			unsigned usage );
-
-   void (*buffer_unmap)( struct pipe_screen *screen,
-			 struct pipe_buffer *buf );
-
    /**
     * Map a subrange of the buffer data store into the client's address space.
     *
@@ -228,18 +217,20 @@ struct pipe_screen {
     */
    void *(*buffer_map_range)( struct pipe_screen *screen,
                               struct pipe_buffer *buf,
-                              struct pipe_buffer_range read,
-                              struct pipe_buffer_range write,
-                              unsigned usage /* XXX: deprecated? */);
+                              unsigned offset,
+                              unsigned length,
+                              unsigned usage);
 
    /**
-    * Unmap a buffer.
-    *
     * written is the range that the client actually wrote. 
     */
-   void (*buffer_unmap_range)( struct pipe_screen *screen,
-                               struct pipe_buffer *buf,
-                               struct pipe_buffer_range written);
+   void (*buffer_flush_mapped_range)( struct pipe_screen *screen,
+                                      struct pipe_buffer *buf,
+                                      unsigned offset,
+                                      unsigned length);
+
+   void (*buffer_unmap)( struct pipe_screen *screen,
+                         struct pipe_buffer *buf );
 
    void (*buffer_destroy)( struct pipe_screen *screen,
 			   struct pipe_buffer *buf );