2 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index c6fea1f7bc..24bb4823bc 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/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
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index f49d91a069..2be53abf3a 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -33,7 +33,6 @@
 
 struct pipe_context;
 struct pipe_texture;
-struct pipe_region;
 
 
 extern struct pipe_texture *