Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

src/mesa/drivers/dri/intel_winsys/intel_context.h

@@ -35,7 +35,6 @@
 
 
 struct pipe_context;
-struct pipe_region;
 struct intel_context;
 struct _DriBufferObject;
 struct st_context;

src/mesa/pipe/p_winsys.h

@@ -45,7 +45,6 @@ struct pipe_buffer_handle;
 /** Opaque type */
 struct pipe_fence_handle;
 
-struct pipe_region;
 struct pipe_surface;
 
 
@@ -80,12 +79,6 @@ struct pipe_winsys
    /**
     * flags is bitmask of PIPE_SURFACE_FLAG_RENDER, PIPE_SURFACE_FLAG_TEXTURE
     */
-   struct pipe_region *(*region_alloc)(struct pipe_winsys *ws,
-                                       unsigned size, unsigned flags);
-
-   void (*region_release)(struct pipe_winsys *ws, struct pipe_region **r);
-
-
    unsigned (*surface_pitch)(struct pipe_winsys *ws, unsigned cpp,
 			     unsigned with, unsigned flags);
 

src/mesa/state_tracker/st_draw.c

@@ -266,9 +266,14 @@ st_draw_vbo(GLcontext *ctx,
       }
       else {
          /* attribute data is in user-space memory, not a VBO */
-         uint bytes = (arrays[mesaAttr]->Size
-                       * _mesa_sizeof_type(arrays[mesaAttr]->Type)
-                       * (max_index + 1));
+         uint bytes;
+	
+         if (!arrays[mesaAttr]->StrideB) {
+            bytes = arrays[mesaAttr]->Size
+                    * _mesa_sizeof_type(arrays[mesaAttr]->Type);
+         } else {
+            bytes = arrays[mesaAttr]->StrideB * (max_index + 1);
+         }
 
          /* wrap user data */
          vbuffer[attr].buffer

src/mesa/state_tracker/st_texture.h

@@ -33,7 +33,6 @@
 
 struct pipe_context;
 struct pipe_texture;
-struct pipe_region;
 
 
 extern struct pipe_texture *