summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-12-10 21:09:52 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-12-10 21:09:52 +1100
commit18fe9776b4977af092582630b181893b2bc6de40 (patch)
tree1de97fc646272c47d0aad8bc483618f527ac0ab5 /src
parentaab6f8f9485e73eb4098e7c4b497da5c30f1cf06 (diff)
parentf7195b32323d50e9541a5c5cb3143e83d05bd8d8 (diff)
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h1
-rw-r--r--src/mesa/pipe/p_winsys.h7
-rw-r--r--src/mesa/state_tracker/st_draw.c11
-rw-r--r--src/mesa/state_tracker/st_texture.h1
4 files changed, 8 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index eac5cd8b4c..b01370c049 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/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;
diff --git a/src/mesa/pipe/p_winsys.h b/src/mesa/pipe/p_winsys.h
index f2be7655f4..1418af6918 100644
--- a/src/mesa/pipe/p_winsys.h
+++ b/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);
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 *