fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 05:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove debug, reenable inplace splitting.

Browse source
This commit is contained in:
keithw 2007-01-15 14:10:42 +00:00
parent 5464cd0a60
commit 82152a2a8e
4 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/tnl/t_draw.c
View file

@ -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

2
src/mesa/vbo/vbo_save_api.c
View file

@ -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; \

3
src/mesa/vbo/vbo_save_loopback.c
View file

@ -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)
{

16
src/mesa/vbo/vbo_split_inplace.c
View file

@ -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;