Mesa (master): draw: Replace varray by vsplit.
Chia-I Wu
olv at kemper.freedesktop.org
Mon Aug 16 12:53:03 UTC 2010
Module: Mesa
Branch: master
Commit: 5b6bf799e637e9020af3a4bebe514b53d7c38eca
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b6bf799e637e9020af3a4bebe514b53d7c38eca
Author: Chia-I Wu <olv at lunarg.com>
Date: Sat Aug 7 15:12:14 2010 +0800
draw: Replace varray by vsplit.
vsplit is a superset of varray. It sets the split flags comparing to
varray.
---
src/gallium/auxiliary/draw/draw_private.h | 2 +-
src/gallium/auxiliary/draw/draw_pt.c | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
index 826f5dc..18b632e 100644
--- a/src/gallium/auxiliary/draw/draw_private.h
+++ b/src/gallium/auxiliary/draw/draw_private.h
@@ -141,7 +141,7 @@ struct draw_context
struct {
struct draw_pt_front_end *vcache;
- struct draw_pt_front_end *varray;
+ struct draw_pt_front_end *vsplit;
} front;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index 2b400ed..b6debbe 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -111,8 +111,9 @@ draw_pt_arrays(struct draw_context *draw,
*/
if (draw->pt.user.elts || (opt & PT_PIPELINE)) {
frontend = draw->pt.front.vcache;
- } else {
- frontend = draw->pt.front.varray;
+ }
+ else {
+ frontend = draw->pt.front.vsplit;
}
frontend->prepare( frontend, prim, middle, opt );
@@ -134,8 +135,8 @@ boolean draw_pt_init( struct draw_context *draw )
if (!draw->pt.front.vcache)
return FALSE;
- draw->pt.front.varray = draw_pt_varray(draw);
- if (!draw->pt.front.varray)
+ draw->pt.front.vsplit = draw_pt_vsplit(draw);
+ if (!draw->pt.front.vsplit)
return FALSE;
draw->pt.middle.fetch_emit = draw_pt_fetch_emit( draw );
@@ -186,9 +187,9 @@ void draw_pt_destroy( struct draw_context *draw )
draw->pt.front.vcache = NULL;
}
- if (draw->pt.front.varray) {
- draw->pt.front.varray->destroy( draw->pt.front.varray );
- draw->pt.front.varray = NULL;
+ if (draw->pt.front.vsplit) {
+ draw->pt.front.vsplit->destroy( draw->pt.front.vsplit );
+ draw->pt.front.vsplit = NULL;
}
}
More information about the mesa-commit
mailing list