Merge commit 'origin/master' into gallium-map-range

diff --cc src/gallium/include/pipe/p_inlines.h
Simple merge

diff --cc src/gallium/include/pipe/p_screen.h
index 48f6b69d921298b9523b2385ac7ea13cf8f7457f,3688d5811861a2d8d1c5639ffebbb8bf2142a377..d7e79ec655e87b722d0790669434aa07e47778de
--- 1/src/gallium/include/pipe/p_screen.h
--- 2/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@@ -209,31 -202,11 +202,30 @@@ struct pipe_screen 
     void *(*buffer_map)( struct pipe_screen *screen,
                        struct pipe_buffer *buf,
                        unsigned usage );
 +   /**
 +    * Map a subrange of the buffer data store into the client's address space.
 +    *
 +    * Return pointer is always relative to offset 0, regardless of the 
 +    * read/write ranges.
 +    */
 +   void *(*buffer_map_range)( struct pipe_screen *screen,
 +                              struct pipe_buffer *buf,
 +                              unsigned offset,
 +                              unsigned length,
 +                              unsigned usage);
 +
 +   /**
 +    * written is the range that the client actually wrote. 
 +    */
 +   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 );
 +                         struct pipe_buffer *buf );
  
-    void (*buffer_destroy)( struct pipe_screen *screen,
-                          struct pipe_buffer *buf );
+    void (*buffer_destroy)( struct pipe_buffer *buf );
  
  
     /**

diff --cc src/mesa/state_tracker/st_cb_bufferobjects.c
Simple merge