aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkeithw <keithw@keithw-laptop.(none)>2007-01-15 14:10:42 +0000
committerkeithw <keithw@keithw-laptop.(none)>2007-01-15 14:10:42 +0000
commit82152a2a8e1afeb61710318e769b1379be6c02c6 (patch)
treed213205849aa3d6792490847951229aecd325e7e
parent5464cd0a60f474753abc6af047fd21b0e29b8ac4 (diff)
Remove debug, reenable inplace splitting.
-rw-r--r--src/mesa/tnl/t_draw.c16
-rw-r--r--src/mesa/vbo/vbo_save_api.c2
-rw-r--r--src/mesa/vbo/vbo_save_loopback.c3
-rw-r--r--src/mesa/vbo/vbo_split_inplace.c16
4 files changed, 12 insertions, 25 deletions
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index 25b8708948e..0e7c2b6a689 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -375,7 +375,6 @@ void _tnl_draw_prims( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
GLint max = VB->Size;
- GLuint i;
#ifdef TEST_SPLIT
max = 8 + MAX_CLIPPED_VERTICES;
@@ -387,12 +386,15 @@ void _tnl_draw_prims( GLcontext *ctx,
VB->Elts = NULL;
#if 0
- _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
- for (i = 0; i < nr_prims; i++)
- _mesa_printf("prim %d: %s start %d count %d\n", i,
- _mesa_lookup_enum_by_nr(prim[i].mode),
- prim[i].start,
- prim[i].count);
+ {
+ GLuint i;
+ _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
+ for (i = 0; i < nr_prims; i++)
+ _mesa_printf("prim %d: %s start %d count %d\n", i,
+ _mesa_lookup_enum_by_nr(prim[i].mode),
+ prim[i].start,
+ prim[i].count);
+ }
#endif
/* The software TNL pipeline has a fixed amount of storage for
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index f339436f84c..ade48d220e6 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -598,8 +598,6 @@ do { \
if (save->active_sz[A] != N) \
save_fixup_vertex(ctx, A, N); \
\
- _mesa_printf("Attr %d, sz %d: %f %f %f %f\n", A, N, V0, V1, V2, V3 ); \
- \
{ \
GLfloat *dest = save->attrptr[A]; \
if (N>0) dest[0] = V0; \
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
index 2c28126cab2..430333b84dd 100644
--- a/src/mesa/vbo/vbo_save_loopback.c
+++ b/src/mesa/vbo/vbo_save_loopback.c
@@ -45,7 +45,8 @@ typedef void (*attr_func)( GLcontext *ctx, GLint target, const GLfloat * );
/* This file makes heavy use of the aliasing of NV vertex attributes
- * with the legacy attributes.
+ * with the legacy attributes, and also with ARB and Material
+ * attributes as currently implemented.
*/
static void VertexAttrib1fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
{
diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c
index 66c94aceaa2..d3649c59db3 100644
--- a/src/mesa/vbo/vbo_split_inplace.c
+++ b/src/mesa/vbo/vbo_split_inplace.c
@@ -49,9 +49,6 @@ struct split_context {
const struct split_limits *limits;
-/* GLuint out_maxindex; */
-/* GLuint out_minindex; */
-
struct _mesa_prim dstprim[MAX_PRIM];
GLuint dstprim_nr;
};
@@ -151,13 +148,6 @@ static void split_prims( struct split_context *split)
GLuint available = align(split->limits->max_verts - csr - 1, 2);
assert(split->limits->max_verts >= csr);
- _mesa_printf("%s: prim %d: %s %d..%d\n", __FUNCTION__,
- i,
- _mesa_lookup_enum_by_nr(prim->mode),
- prim->start, prim->count);
-
- _mesa_printf("a: available %d\n", available);
-
if (prim->count < first)
continue;
@@ -171,15 +161,13 @@ static void split_prims( struct split_context *split)
available = align(split->limits->max_verts - csr - 1, 2);
}
- _mesa_printf("b: available %d\n", available);
-
if (available >= count) {
struct _mesa_prim *outprim = next_outprim(split);
*outprim = *prim;
csr += prim->count;
available = align(split->limits->max_verts - csr - 1, 2);
}
- else if (0 && split_inplace) {
+ else if (split_inplace) {
GLuint j, nr;
@@ -207,8 +195,6 @@ static void split_prims( struct split_context *split)
else {
/* Wrapped the primitive:
*/
- _mesa_printf("wrap %d %d\n", nr, first-incr);
-
j += nr - (first - incr);
flush_vertex(split);
csr = 0;