-/* $Id: t_imm_fixup.c,v 1.11 2001/04/26 14:53:48 keithw Exp $ */
+/* $Id: t_imm_fixup.c,v 1.39 2002/10/29 20:29:03 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 4.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
/*
* Authors:
- * Keith Whitwell <keithw@valinux.com>
+ * Keith Whitwell <keith@tungstengraphics.com>
*/
#include "colormac.h"
#include "light.h"
#include "macros.h"
-#include "mem.h"
+#include "imports.h"
#include "mmath.h"
#include "state.h"
#include "mtypes.h"
#include "t_context.h"
#include "t_imm_alloc.h"
#include "t_imm_debug.h"
+#include "t_imm_elt.h"
#include "t_imm_fixup.h"
+#include "t_imm_exec.h"
#include "t_pipeline.h"
for (;;) {
if ((flag[++i] & match) == 0) {
COPY_4FV(data[i], data[i-1]);
- if (flag[i] & VERT_END_VB) break;
+ if (flag[i] & VERT_BIT_END_VB) break;
}
}
}
{
GLuint i = start;
+
for (;;) {
if ((flag[++i] & match) == 0) {
+/* _mesa_debug(NULL, "_tnl_fixup_3f copy to %p values %f %f %f\n", */
+/* data[i], */
+/* data[i-1][0], */
+/* data[i-1][1], */
+/* data[i-1][2]); */
COPY_3V(data[i], data[i-1]);
- if (flag[i] & VERT_END_VB) break;
+ if (flag[i] & VERT_BIT_END_VB) break;
}
}
}
for (;;) {
if ((flag[++i] & match) == 0) {
data[i] = data[i-1];
- if (flag[i] & VERT_END_VB) break;
+ if (flag[i] & VERT_BIT_END_VB) break;
}
}
flag[i] |= match;
for (;;) {
if ((flag[++i] & match) == 0) {
data[i] = data[i-1];
- if (flag[i] & VERT_END_VB) break;
+ if (flag[i] & VERT_BIT_END_VB) break;
}
}
flag[i] |= match;
for (;;) {
if ((flag[++i] & match) == 0) {
data[i] = data[i-1];
- if (flag[i] & VERT_END_VB) break;
- }
- }
- flag[i] |= match;
-}
-
-
-void
-_tnl_fixup_4chan( GLchan data[][4], GLuint flag[], GLuint start, GLuint match )
-{
- GLuint i = start;
-
- for (;;) {
- if ((flag[++i] & match) == 0) {
- COPY_CHAN4(data[i], data[i-1]);
- if (flag[i] & VERT_END_VB) break;
+ if (flag[i] & VERT_BIT_END_VB) break;
}
}
flag[i] |= match;
GLuint start, GLfloat *dflt )
{
GLuint i = start-1;
- match |= VERT_END_VB;
+ match |= VERT_BIT_END_VB;
while ((flag[++i]&match) == 0)
COPY_4FV(data[i], dflt);
}
+#if 0
static void
fixup_first_3f( GLfloat data[][3], GLuint flag[], GLuint match,
GLuint start, GLfloat *dflt )
{
GLuint i = start-1;
- match |= VERT_END_VB;
+ match |= VERT_BIT_END_VB;
+
+/* _mesa_debug(NULL, "fixup_first_3f default: %f %f %f start: %d\n", */
+/* dflt[0], dflt[1], dflt[2], start); */
while ((flag[++i]&match) == 0)
COPY_3FV(data[i], dflt);
}
-
+#endif
static void
fixup_first_1ui( GLuint data[], GLuint flag[], GLuint match,
GLuint start, GLuint dflt )
{
GLuint i = start-1;
- match |= VERT_END_VB;
+ match |= VERT_BIT_END_VB;
while ((flag[++i]&match) == 0)
data[i] = dflt;
}
+#if 00
static void
fixup_first_1f( GLfloat data[], GLuint flag[], GLuint match,
GLuint start, GLfloat dflt )
{
GLuint i = start-1;
- match |= VERT_END_VB;
+ match |= VERT_BIT_END_VB;
while ((flag[++i]&match) == 0)
data[i] = dflt;
}
-
+#endif
static void
fixup_first_1ub( GLubyte data[], GLuint flag[], GLuint match,
GLuint start, GLubyte dflt )
{
GLuint i = start-1;
- match |= VERT_END_VB;
+ match |= VERT_BIT_END_VB;
while ((flag[++i]&match) == 0)
data[i] = dflt;
}
-
-static void
-fixup_first_4chan( GLchan data[][4], GLuint flag[], GLuint match,
- GLuint start, GLchan dflt[4] )
+/*
+ * Copy vertex attributes from the ctx->Current group into the immediate
+ * struct at the given position according to copyMask.
+ */
+static void copy_from_current( GLcontext *ctx, struct immediate *IM,
+ GLuint pos, GLuint copyMask )
{
- GLuint i = start-1;
- match |= VERT_END_VB;
+ GLuint attrib, attribBit;
- while ((flag[++i]&match) == 0)
- COPY_CHAN4(data[i], dflt);
+ if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
+ _tnl_print_vert_flags("copy from current", copyMask);
+
+#if 0
+ if (copyMask & VERT_BIT_NORMAL) {
+ COPY_4V(IM->Attrib[VERT_ATTRIB_NORMAL][pos],
+ ctx->Current.Attrib[VERT_ATTRIB_NORMAL]);
+ }
+
+ if (copyMask & VERT_BIT_COLOR0) {
+ COPY_4FV( IM->Attrib[VERT_ATTRIB_COLOR0][pos],
+ ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+ }
+
+ if (copyMask & VERT_BIT_COLOR1)
+ COPY_4FV( IM->Attrib[VERT_ATTRIB_COLOR1][pos],
+ ctx->Current.Attrib[VERT_ATTRIB_COLOR1]);
+
+ if (copyMask & VERT_BIT_FOG)
+ IM->Attrib[VERT_ATTRIB_FOG][pos][0] = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+
+ if (copyMask & VERT_BITS_TEX_ANY) {
+ GLuint i;
+ for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) {
+ if (copyMask & VERT_BIT_TEX(i))
+ COPY_4FV(IM->Attrib[VERT_ATTRIB_TEX0 + i][pos],
+ ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i]);
+ }
+ }
+#else
+ for (attrib = 0, attribBit = 1; attrib < 16; attrib++, attribBit <<= 1) {
+ if (copyMask & attribBit) {
+ COPY_4FV( IM->Attrib[attrib][pos], ctx->Current.Attrib[attrib]);
+ }
+ }
+#endif
+
+ if (copyMask & VERT_BIT_INDEX)
+ IM->Index[pos] = ctx->Current.Index;
+
+ if (copyMask & VERT_BIT_EDGEFLAG)
+ IM->EdgeFlag[pos] = ctx->Current.EdgeFlag;
}
TNLcontext *tnl = TNL_CONTEXT(ctx);
GLuint start = IM->CopyStart;
GLuint andflag = IM->CopyAndFlag;
- GLuint orflag = IM->CopyOrFlag;
+ GLuint orflag = IM->CopyOrFlag | IM->Evaluated;
GLuint fixup;
IM->CopyTexSize = IM->TexSize;
-/* fprintf(stderr, "Fixup input, Start: %u Count: %u LastData: %u\n", */
+/* _mesa_debug(ctx, "Fixup input, Start: %u Count: %u LastData: %u\n", */
/* IM->Start, IM->Count, IM->LastData); */
/* _tnl_print_vert_flags("Orflag", orflag); */
/* _tnl_print_vert_flags("Andflag", andflag); */
- fixup = ~andflag & VERT_FIXUP;
+ fixup = ~andflag & VERT_BITS_FIXUP;
if (!ctx->CompileFlag)
fixup &= tnl->pipeline.inputs;
if (!ctx->ExecuteFlag)
fixup &= orflag;
- if ((orflag & (VERT_OBJ|VERT_EVAL_ANY)) == 0)
+ if ((orflag & (VERT_BIT_POS|VERT_BITS_EVAL_ANY)) == 0)
fixup = 0;
if (fixup) {
/* Equivalent to a lazy copy-from-current when setting up the
* immediate.
*/
- if (ctx->ExecuteFlag && copy) {
-
- if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
- _tnl_print_vert_flags("copy from current", copy);
-
- if (copy & VERT_NORM) {
- COPY_3V( IM->Normal[start], ctx->Current.Normal );
- }
-
- if (copy & VERT_RGBA) {
- COPY_CHAN4( IM->Color[start], ctx->Current.Color);
- }
-
- if (copy & VERT_SPEC_RGB)
- COPY_CHAN4( IM->SecondaryColor[start], ctx->Current.SecondaryColor);
-
- if (copy & VERT_FOG_COORD)
- IM->FogCoord[start] = ctx->Current.FogCoord;
-
- if (copy & VERT_INDEX)
- IM->Index[start] = ctx->Current.Index;
-
- if (copy & VERT_EDGE)
- IM->EdgeFlag[start] = ctx->Current.EdgeFlag;
-
- if (copy & VERT_TEX_ANY) {
- GLuint i;
- for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) {
- if (copy & VERT_TEX(i))
- COPY_4FV( IM->TexCoord[i][start], ctx->Current.Texcoord[i] );
- }
- }
- }
+ if (ctx->ExecuteFlag && copy)
+ copy_from_current( ctx, IM, start, copy );
if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
_tnl_print_vert_flags("fixup", fixup);
- if (fixup & VERT_TEX_ANY) {
+ /* XXX replace these conditionals with a loop over the 16
+ * vertex attributes.
+ */
+
+ if (fixup & VERT_BITS_TEX_ANY) {
GLuint i;
for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) {
- if (fixup & VERT_TEX(i)) {
- if (orflag & VERT_TEX(i))
- _tnl_fixup_4f( IM->TexCoord[i], IM->Flag, start,
- VERT_TEX(i) );
+ if (fixup & VERT_BIT_TEX(i)) {
+ if (orflag & VERT_BIT_TEX(i))
+ _tnl_fixup_4f( IM->Attrib[VERT_ATTRIB_TEX0 + i], IM->Flag,
+ start, VERT_BIT_TEX(i) );
else
- fixup_first_4f( IM->TexCoord[i], IM->Flag, VERT_END_VB, start,
- IM->TexCoord[i][start]);
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_TEX0 + i], IM->Flag,
+ VERT_BIT_END_VB, start,
+ IM->Attrib[VERT_ATTRIB_TEX0 + i][start]);
}
}
}
- if (fixup & VERT_EDGE) {
- if (orflag & VERT_EDGE)
- _tnl_fixup_1ub( IM->EdgeFlag, IM->Flag, start, VERT_EDGE );
+ if (fixup & VERT_BIT_EDGEFLAG) {
+ if (orflag & VERT_BIT_EDGEFLAG)
+ _tnl_fixup_1ub( IM->EdgeFlag, IM->Flag, start, VERT_BIT_EDGEFLAG );
else
- fixup_first_1ub( IM->EdgeFlag, IM->Flag, VERT_END_VB, start,
+ fixup_first_1ub( IM->EdgeFlag, IM->Flag, VERT_BIT_END_VB, start,
IM->EdgeFlag[start] );
}
- if (fixup & VERT_INDEX) {
- if (orflag & VERT_INDEX)
- _tnl_fixup_1ui( IM->Index, IM->Flag, start, VERT_INDEX );
+ if (fixup & VERT_BIT_INDEX) {
+ if (orflag & VERT_BIT_INDEX)
+ _tnl_fixup_1ui( IM->Index, IM->Flag, start, VERT_BIT_INDEX );
else
- fixup_first_1ui( IM->Index, IM->Flag, VERT_END_VB, start,
+ fixup_first_1ui( IM->Index, IM->Flag, VERT_BIT_END_VB, start,
IM->Index[start] );
}
- if (fixup & VERT_RGBA) {
- if (orflag & VERT_RGBA)
- _tnl_fixup_4chan( IM->Color, IM->Flag, start, VERT_RGBA );
- else
- fixup_first_4chan( IM->Color, IM->Flag, VERT_END_VB, start,
- IM->Color[start] );
+ if (fixup & VERT_BIT_COLOR0) {
+ if (orflag & VERT_BIT_COLOR0)
+ _tnl_fixup_4f( IM->Attrib[VERT_ATTRIB_COLOR0], IM->Flag, start,
+ VERT_BIT_COLOR0 );
+ /* No need for else case as the drivers understand stride
+ * zero here. (TODO - propogate this)
+ */
}
- if (fixup & VERT_SPEC_RGB) {
- if (orflag & VERT_SPEC_RGB)
- _tnl_fixup_4chan( IM->SecondaryColor, IM->Flag, start,
- VERT_SPEC_RGB );
+ if (fixup & VERT_BIT_COLOR1) {
+ if (orflag & VERT_BIT_COLOR1)
+ _tnl_fixup_4f( IM->Attrib[VERT_ATTRIB_COLOR1], IM->Flag, start,
+ VERT_BIT_COLOR1 );
else
- fixup_first_4chan( IM->SecondaryColor, IM->Flag, VERT_END_VB, start,
- IM->SecondaryColor[start] );
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_COLOR1], IM->Flag, VERT_BIT_END_VB, start,
+ IM->Attrib[VERT_ATTRIB_COLOR1][start] );
}
- if (fixup & VERT_FOG_COORD) {
- if (orflag & VERT_FOG_COORD)
- _tnl_fixup_1f( IM->FogCoord, IM->Flag, start, VERT_FOG_COORD );
+ if (fixup & VERT_BIT_FOG) {
+ if (orflag & VERT_BIT_FOG)
+ _tnl_fixup_4f( IM->Attrib[VERT_ATTRIB_FOG], IM->Flag,
+ start, VERT_BIT_FOG );
else
- fixup_first_1f( IM->FogCoord, IM->Flag, VERT_END_VB, start,
- IM->FogCoord[start] );
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_FOG], IM->Flag, VERT_BIT_END_VB,
+ start, IM->Attrib[VERT_ATTRIB_FOG][start] );
}
- if (fixup & VERT_NORM) {
- if (orflag & VERT_NORM)
- _tnl_fixup_3f( IM->Normal, IM->Flag, start, VERT_NORM );
+ if (fixup & VERT_BIT_NORMAL) {
+ if (orflag & VERT_BIT_NORMAL)
+ _tnl_fixup_4f( IM->Attrib[VERT_ATTRIB_NORMAL], IM->Flag, start,
+ VERT_BIT_NORMAL );
else
- fixup_first_3f( IM->Normal, IM->Flag, VERT_END_VB, start,
- IM->Normal[start] );
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_NORMAL], IM->Flag,
+ VERT_BIT_END_VB, start,
+ IM->Attrib[VERT_ATTRIB_NORMAL][start] );
}
}
/* Prune possible half-filled slot.
*/
- IM->Flag[IM->LastData+1] &= ~VERT_END_VB;
- IM->Flag[IM->Count] |= VERT_END_VB;
+ IM->Flag[IM->LastData+1] &= ~VERT_BIT_END_VB;
+ IM->Flag[IM->Count] |= VERT_BIT_END_VB;
/* Materials:
GLuint i = IM->Start;
do {
- while (!(IM->Flag[i] & VERT_MATERIAL))
+ while (!(IM->Flag[i] & VERT_BIT_MATERIAL))
i++;
vulnerable &= ~IM->MaterialMask[i];
vulnerable );
+ ++i;
} while (vulnerable);
}
}
-
-
-static void copy_material( struct immediate *next,
- struct immediate *prev,
- GLuint dst, GLuint src )
+static void
+copy_material( struct immediate *next,
+ struct immediate *prev,
+ GLuint dst, GLuint src )
{
+/* _mesa_debug(NULL, "%s\n", __FUNCTION__); */
+
if (next->Material == 0) {
- next->Material = (GLmaterial (*)[2]) MALLOC( sizeof(GLmaterial) *
- IMM_SIZE * 2 );
+ next->Material = (struct gl_material (*)[2])
+ MALLOC( sizeof(struct gl_material) * IMM_SIZE * 2 );
next->MaterialMask = (GLuint *) MALLOC( sizeof(GLuint) * IMM_SIZE );
}
next->MaterialMask[dst] = prev->MaterialOrMask;
- MEMCPY(next->Material[dst], prev->Material[src], 2*sizeof(GLmaterial));
+ MEMCPY(next->Material[dst], prev->Material[src],
+ 2 * sizeof(struct gl_material));
}
+static GLboolean is_fan_like[GL_POLYGON+1] = {
+ GL_FALSE,
+ GL_FALSE,
+ GL_TRUE, /* line loop */
+ GL_FALSE,
+ GL_FALSE,
+ GL_FALSE,
+ GL_TRUE, /* tri fan */
+ GL_FALSE,
+ GL_FALSE,
+ GL_TRUE /* polygon */
+};
+
+
/* Copy the untransformed data from the shared vertices of a primitive
* that wraps over two immediate structs. This is done prior to
* set_immediate so that prev and next may point to the same
* Have to be careful with the transitions between display list
* replay, compile and normal execute modes.
*/
-static void copy_vertices( GLcontext *ctx,
- struct immediate *next,
- struct immediate *prev,
- GLuint count,
- GLuint *elts )
+void _tnl_copy_immediate_vertices( GLcontext *ctx, struct immediate *next )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
+ struct immediate *prev = tnl->ExecCopySource;
+ struct vertex_arrays *inputs = &tnl->imm_inputs;
+ GLuint count = tnl->ExecCopyCount;
+ GLuint *elts = tnl->ExecCopyElts;
GLuint offset = IMM_MAX_COPIED_VERTS - count;
GLuint i;
+ if (!prev) {
+ ASSERT(tnl->ExecCopyCount == 0);
+ return;
+ }
+
next->CopyStart = next->Start - count;
- /* Copy the vertices
- */
- for (i = 0 ; i < count ; i++)
+ if ((prev->CopyOrFlag & VERT_BITS_DATA) == VERT_BIT_ELT &&
+ ctx->Array.LockCount &&
+ ctx->Array.Vertex.Enabled)
{
- GLuint src = elts[i+offset];
- GLuint dst = next->CopyStart+i;
-
- COPY_4FV( next->Obj[dst], prev->Obj[src] );
- COPY_3FV( next->Normal[dst], prev->Normal[src] );
- COPY_CHAN4( next->Color[dst], prev->Color[src] );
-
- if (prev->OrFlag & VERT_TEX_ANY) {
- GLuint i;
- for (i = 0 ; i < prev->MaxTextureUnits ; i++) {
- if (prev->OrFlag & VERT_TEX(i))
- COPY_4FV( next->TexCoord[i][dst], prev->TexCoord[i][src] );
- }
+ /* Copy Elt values only
+ */
+ for (i = 0 ; i < count ; i++)
+ {
+ GLuint src = elts[i+offset];
+ GLuint dst = next->CopyStart+i;
+ next->Elt[dst] = prev->Elt[src];
+ next->Flag[dst] = VERT_BIT_ELT;
+ elts[i+offset] = dst;
}
-
- if (prev->Flag[src] & VERT_MATERIAL)
- copy_material(next, prev, dst, src);
-
- next->Elt[dst] = prev->Elt[src];
- next->EdgeFlag[dst] = prev->EdgeFlag[src];
- next->Index[dst] = prev->Index[src];
- COPY_CHAN4( next->SecondaryColor[dst], prev->SecondaryColor[src] );
- next->FogCoord[dst] = prev->FogCoord[src];
- next->Flag[dst] = (prev->CopyOrFlag & VERT_FIXUP);
- next->CopyOrFlag |= prev->Flag[src]; /* redundant for current_im */
- next->CopyAndFlag &= prev->Flag[src]; /* redundant for current_im */
+/* _mesa_debug(ctx, "ADDING VERT_BIT_ELT!\n"); */
+ next->CopyOrFlag |= VERT_BIT_ELT;
+ next->CopyAndFlag &= VERT_BIT_ELT;
}
+ else {
+ GLuint copy = tnl->pipeline.inputs & (prev->CopyOrFlag|prev->Evaluated);
+ GLuint flag;
+
+ if (is_fan_like[ctx->Driver.CurrentExecPrimitive]) {
+ flag = ((prev->CopyOrFlag|prev->Evaluated) & VERT_BITS_FIXUP);
+ next->CopyOrFlag |= flag;
+ }
+ else {
+ /* Don't let an early 'glColor', etc. poison the elt path.
+ */
+ flag = ((prev->OrFlag|prev->Evaluated) & VERT_BITS_FIXUP);
+ }
+ next->TexSize |= tnl->ExecCopyTexSize;
+ next->CopyAndFlag &= flag;
+
- ASSERT(prev == tnl->ExecCopySource);
-
- if (--tnl->ExecCopySource->ref_count == 0)
- _tnl_free_immediate( tnl->ExecCopySource );
-
- next->ref_count++;
- tnl->ExecCopySource = next;
+/* _tnl_print_vert_flags("copy vertex components", copy); */
+/* _tnl_print_vert_flags("prev copyorflag", prev->CopyOrFlag); */
+/* _tnl_print_vert_flags("flag", flag); */
- tnl->ExecCopyElts[0] = next->Start-3;
- tnl->ExecCopyElts[1] = next->Start-2;
- tnl->ExecCopyElts[2] = next->Start-1;
-}
+ /* Copy whole vertices
+ */
+ for (i = 0 ; i < count ; i++)
+ {
+ GLuint src = elts[i+offset];
+ GLuint isrc = src - prev->CopyStart;
+ GLuint dst = next->CopyStart+i;
+
+ /* Values subject to eval must be copied out of the 'inputs'
+ * struct. (Copied rows should not be evaluated twice).
+ *
+ * Note these pointers are null when inactive.
+ */
+ COPY_4FV( next->Attrib[VERT_ATTRIB_POS][dst],
+ inputs->Obj.data[isrc] );
+
+ if (copy & VERT_BIT_NORMAL) {
+/* _mesa_debug(ctx, "copy vert norm %d to %d (%p): %f %f %f\n", */
+/* isrc, dst, */
+/* next->Normal[dst], */
+/* inputs->Normal.data[isrc][0], */
+/* inputs->Normal.data[isrc][1], */
+/* inputs->Normal.data[isrc][2]); */
+ COPY_3FV( next->Attrib[VERT_ATTRIB_NORMAL][dst], inputs->Normal.data[isrc] );
+ }
-/* Copy vertices to an empty immediate struct.
- */
-void _tnl_copy_immediate_vertices( GLcontext *ctx, struct immediate *IM )
-{
- TNLcontext *tnl = TNL_CONTEXT(ctx);
+ if (copy & VERT_BIT_COLOR0)
+ COPY_4FV( next->Attrib[VERT_ATTRIB_COLOR0][dst],
+ ((GLfloat (*)[4])inputs->Color.Ptr)[isrc] );
- ASSERT(IM == TNL_CURRENT_IM(ctx));
- ASSERT(IM->Count == IM->Start);
+ if (copy & VERT_BIT_INDEX)
+ next->Index[dst] = inputs->Index.data[isrc];
- /* Need to push this in now as it won't be computed anywhere else/
- */
- IM->TexSize = tnl->ExecCopyTexSize;
+ if (copy & VERT_BITS_TEX_ANY) {
+ GLuint i;
+ for (i = 0 ; i < prev->MaxTextureUnits ; i++) {
+ if (copy & VERT_BIT_TEX(i))
+ COPY_4FV( next->Attrib[VERT_ATTRIB_TEX0 + i][dst],
+ inputs->TexCoord[i].data[isrc] );
+ }
+ }
- /* A wrapped primitive. We may be copying into a revived
- * display list immediate, or onto the front of a new execute-mode
- * immediate.
- */
- copy_vertices( ctx, IM,
- tnl->ExecCopySource,
- tnl->ExecCopyCount,
- tnl->ExecCopyElts );
+ /* Remaining values should be the same in the 'input' struct and the
+ * original immediate.
+ */
+ if (copy & (VERT_BIT_ELT|VERT_BIT_EDGEFLAG|VERT_BIT_COLOR1|VERT_BIT_FOG|
+ VERT_BIT_MATERIAL)) {
+
+ if (prev->Flag[src] & VERT_BIT_MATERIAL)
+ copy_material(next, prev, dst, src);
+
+ next->Elt[dst] = prev->Elt[src];
+ next->EdgeFlag[dst] = prev->EdgeFlag[src];
+ COPY_4FV( next->Attrib[VERT_ATTRIB_COLOR1][dst],
+ prev->Attrib[VERT_ATTRIB_COLOR1][src] );
+ COPY_4FV( next->Attrib[VERT_ATTRIB_FOG][dst],
+ prev->Attrib[VERT_ATTRIB_FOG][src] );
+ }
- if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) {
- /* Immediates are built by default to be correct in this state,
- * and copying to the first slots of an immediate doesn't remove
- * this property.
- */
- ASSERT(tnl->ExecCopyTexSize == 0);
- ASSERT(tnl->ExecCopyCount == 0);
- ASSERT(IM->CopyStart == IM->Start);
+ next->Flag[dst] = flag;
+ next->CopyOrFlag |= prev->Flag[src] & (VERT_BITS_FIXUP|
+ VERT_BIT_MATERIAL|
+ VERT_BIT_POS);
+ elts[i+offset] = dst;
+ }
}
- /* Copy the primitive information:
- */
- IM->Primitive[IM->CopyStart] = (ctx->Driver.CurrentExecPrimitive | PRIM_LAST);
- IM->LastPrimitive = IM->CopyStart;
- if (tnl->ExecParity)
- IM->Primitive[IM->CopyStart] |= PRIM_PARITY;
+ if (--tnl->ExecCopySource->ref_count == 0)
+ _tnl_free_immediate( ctx, tnl->ExecCopySource );
+
+ tnl->ExecCopySource = next; next->ref_count++;
}
+
/* Revive a compiled immediate struct - propogate new 'Current'
* values. Often this is redundant because the current values were
- * known and fixed up at compile time.
+ * known and fixed up at compile time (or in the first execution of
+ * the cassette).
*/
void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
GLuint fixup;
- GLuint count = IM->Count;
GLuint start = IM->Start;
- if (count == start)
- return;
+/* _mesa_debug(ctx, "%s\n", __FUNCTION__); */
- IM->CopyOrFlag = IM->OrFlag; /* redundant for current_im */
- IM->CopyAndFlag = IM->AndFlag; /* redundant for current_im */
+ IM->Evaluated = 0;
+ IM->CopyOrFlag = IM->OrFlag;
+ IM->CopyAndFlag = IM->AndFlag;
IM->CopyTexSize = IM->TexSize | tnl->ExecCopyTexSize;
- copy_vertices( ctx, IM,
- tnl->ExecCopySource,
- tnl->ExecCopyCount,
- tnl->ExecCopyElts );
+ _tnl_copy_immediate_vertices( ctx, IM );
if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) {
- ASSERT(tnl->ExecCopyTexSize == 0);
- ASSERT(tnl->ExecCopyCount == 0);
ASSERT(IM->CopyStart == IM->Start);
}
- fixup = tnl->pipeline.inputs & ~IM->Flag[start] & VERT_FIXUP;
+ /* Naked array elements can be copied into the first cassette in a
+ * display list. Need to translate them away:
+ */
+ if (IM->CopyOrFlag & VERT_BIT_ELT) {
+ GLuint copy = tnl->pipeline.inputs & ~ctx->Array._Enabled;
+ GLuint i;
+
+ ASSERT(IM->CopyStart < IM->Start);
+
+ _tnl_translate_array_elts( ctx, IM, IM->CopyStart, IM->Start );
+
+ for (i = IM->CopyStart ; i < IM->Start ; i++)
+ copy_from_current( ctx, IM, i, copy );
+
+ _tnl_copy_to_current( ctx, IM, ctx->Array._Enabled, IM->Start );
+ }
+
+ fixup = tnl->pipeline.inputs & ~IM->Flag[start] & VERT_BITS_FIXUP;
+
+/* _tnl_print_vert_flags("fixup compiled", fixup); */
if (fixup) {
- if (fixup & VERT_TEX_ANY) {
+
+ /* XXX try to replace this code with a loop over the 16 vertex
+ * attributes.
+ */
+
+ if (fixup & VERT_BIT_NORMAL) {
+ fixup_first_4f(IM->Attrib[VERT_ATTRIB_NORMAL], IM->Flag,
+ VERT_BIT_NORMAL, start,
+ ctx->Current.Attrib[VERT_ATTRIB_NORMAL] );
+ }
+
+ if (fixup & VERT_BIT_COLOR0) {
+ if (IM->CopyOrFlag & VERT_BIT_COLOR0)
+ fixup_first_4f(IM->Attrib[VERT_ATTRIB_COLOR0], IM->Flag,
+ VERT_BIT_COLOR0, start,
+ ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
+ else
+ fixup &= ~VERT_BIT_COLOR0;
+ }
+
+ if (fixup & VERT_BIT_COLOR1)
+ fixup_first_4f(IM->Attrib[VERT_ATTRIB_COLOR1], IM->Flag,
+ VERT_BIT_COLOR1, start,
+ ctx->Current.Attrib[VERT_ATTRIB_COLOR1] );
+
+ if (fixup & VERT_BIT_FOG)
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_FOG], IM->Flag,
+ VERT_BIT_FOG, start,
+ ctx->Current.Attrib[VERT_ATTRIB_FOG] );
+
+ if (fixup & VERT_BITS_TEX_ANY) {
GLuint i;
for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) {
- if (fixup & VERT_TEX(i))
- fixup_first_4f( IM->TexCoord[i], IM->Flag, VERT_TEX(i), start,
- ctx->Current.Texcoord[i] );
+ if (fixup & VERT_BIT_TEX(i))
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_TEX0 + i], IM->Flag,
+ VERT_BIT_TEX(i), start,
+ ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i] );
}
}
- if (fixup & VERT_EDGE)
- fixup_first_1ub(IM->EdgeFlag, IM->Flag, VERT_EDGE, start,
+ if (fixup & VERT_BIT_EDGEFLAG)
+ fixup_first_1ub(IM->EdgeFlag, IM->Flag, VERT_BIT_EDGEFLAG, start,
ctx->Current.EdgeFlag );
- if (fixup & VERT_INDEX)
- fixup_first_1ui(IM->Index, IM->Flag, VERT_INDEX, start,
+ if (fixup & VERT_BIT_INDEX)
+ fixup_first_1ui(IM->Index, IM->Flag, VERT_BIT_INDEX, start,
ctx->Current.Index );
- if (fixup & VERT_RGBA)
- fixup_first_4chan(IM->Color, IM->Flag, VERT_RGBA, start,
- ctx->Current.Color );
-
- if (fixup & VERT_SPEC_RGB)
- fixup_first_4chan(IM->SecondaryColor, IM->Flag, VERT_SPEC_RGB, start,
- ctx->Current.SecondaryColor );
-
- if (fixup & VERT_FOG_COORD)
- fixup_first_1f(IM->FogCoord, IM->Flag, VERT_FOG_COORD, start,
- ctx->Current.FogCoord );
-
- if (fixup & VERT_NORM) {
- fixup_first_3f(IM->Normal, IM->Flag, VERT_NORM, start,
- ctx->Current.Normal );
- }
+ IM->CopyOrFlag |= fixup;
}
+
/* Materials:
*/
GLuint i = IM->Start;
do {
- while (!(IM->Flag[i] & VERT_MATERIAL))
+ while (!(IM->Flag[i] & VERT_BIT_MATERIAL))
i++;
vulnerable &= ~IM->MaterialMask[i];
vulnerable );
+ ++i;
} while (vulnerable);
}
-
- /* Can potentially overwrite primitive details - need to save the
- * first slot:
- */
- tnl->DlistPrimitive = IM->Primitive[IM->Start];
- tnl->DlistPrimitiveLength = IM->PrimitiveLength[IM->Start];
- tnl->DlistLastPrimitive = IM->LastPrimitive;
-
- /* The first primitive may be different from what was recorded in
- * the immediate struct. Consider an immediate that starts with a
- * glBegin, compiled in a display list, which is called from within
- * an existing Begin/End object.
- */
- if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) {
- GLuint i;
-
- if (IM->BeginState & VERT_ERROR_1)
- _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd");
-
- for (i = IM->Start ; i <= IM->Count ; i += IM->PrimitiveLength[i])
- if (IM->Flag[i] & (VERT_BEGIN|VERT_END_VB))
- break;
-
- /* Would like to just ignore vertices upto this point. Can't
- * set copystart because it might skip materials?
- */
- ASSERT(IM->Start == IM->CopyStart);
- if (i > IM->CopyStart) {
- IM->Primitive[IM->CopyStart] = GL_POLYGON+1;
- IM->PrimitiveLength[IM->CopyStart] = i - IM->CopyStart;
- if (IM->Flag[i] & VERT_END_VB) {
- IM->Primitive[IM->CopyStart] |= PRIM_LAST;
- IM->LastPrimitive = IM->CopyStart;
- }
- }
- /* Shouldn't immediates be set up to have this structure *by default*?
- */
- } else {
- GLuint i;
-
- if (IM->BeginState & VERT_ERROR_0)
- _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd");
-
- if (IM->CopyStart == IM->Start &&
- IM->Flag[IM->Start] & (VERT_END|VERT_END_VB))
- {
- }
- else
- {
- IM->Primitive[IM->CopyStart] = ctx->Driver.CurrentExecPrimitive;
- if (tnl->ExecParity)
- IM->Primitive[IM->CopyStart] |= PRIM_PARITY;
-
-
- for (i = IM->Start ; i <= IM->Count ; i += IM->PrimitiveLength[i])
- if (IM->Flag[i] & (VERT_END|VERT_END_VB)) {
- IM->PrimitiveLength[IM->CopyStart] = i - IM->CopyStart;
- if (IM->Flag[i] & VERT_END_VB) {
- IM->Primitive[IM->CopyStart] |= PRIM_LAST;
- IM->LastPrimitive = IM->CopyStart;
- }
- if (IM->Flag[i] & VERT_END) {
- IM->Primitive[IM->CopyStart] |= PRIM_END;
- }
- break;
- }
- }
- }
-
- if (IM->Primitive[IM->LastPrimitive] & PRIM_END)
- ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
- else
- ctx->Driver.CurrentExecPrimitive =
- IM->Primitive[IM->LastPrimitive] & PRIM_MODE_MASK;
-}
-
-
-/* Undo any changes potentially made to the immediate in the range
- * IM->Start..IM->Count above.
- */
-void _tnl_restore_compiled_cassette( GLcontext *ctx, struct immediate *IM )
-{
- TNLcontext *tnl = TNL_CONTEXT(ctx);
- IM->Primitive[IM->Start] = tnl->DlistPrimitive;
- IM->PrimitiveLength[IM->Start] = tnl->DlistPrimitiveLength;
}
GLuint pintro = intro[prim];
GLuint ovf = 0;
+/* _mesa_debug(ctx, "_tnl_get_exec_copy_verts %s\n", */
+/* _mesa_lookup_enum_by_nr(prim)); */
- if (tnl->ExecCopySource != IM) {
- if (--tnl->ExecCopySource->ref_count == 0)
- _tnl_free_immediate( tnl->ExecCopySource );
- IM->ref_count++;
- tnl->ExecCopySource = IM;
- }
+ if (tnl->ExecCopySource)
+ if (--tnl->ExecCopySource->ref_count == 0)
+ _tnl_free_immediate( ctx, tnl->ExecCopySource );
if (prim == GL_POLYGON+1) {
+ tnl->ExecCopySource = 0;
tnl->ExecCopyCount = 0;
tnl->ExecCopyTexSize = 0;
tnl->ExecParity = 0;
} else {
+ /* Remember this immediate as the one to copy from.
+ */
+ tnl->ExecCopySource = IM; IM->ref_count++;
tnl->ExecCopyCount = 0;
tnl->ExecCopyTexSize = IM->CopyTexSize;
- tnl->ExecParity = IM->PrimitiveLength[IM->LastPrimitive] & 1;
+
+ if (IM->LastPrimitive != IM->CopyStart)
+ tnl->ExecParity = 0;
+
+ tnl->ExecParity ^= IM->PrimitiveLength[IM->LastPrimitive] & 1;
+
if (pincr != 1 && (IM->Count - last - pintro))
ovf = (IM->Count - last - pintro) % pincr;
}
-/*
+/* Recalculate ExecCopyElts, ExecParity, etc.
*/
-void _tnl_fixup_purged_eval( GLcontext *ctx, struct immediate *IM )
+void
+_tnl_get_purged_copy_verts( GLcontext *ctx, struct immediate *IM )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
- /* Recalculate ExecCopyElts, ExecParity, etc. These don't need the
- * post-eval values, so using the original immediate is fine, but
- * copied vertices will need to be re-evaluated.
- */
- if (tnl->CurrentPrimitive != GL_POLYGON+1) {
+ if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {
GLuint last = IM->LastPrimitive;
GLenum prim = IM->Primitive[last];
GLuint pincr = increment[prim];
GLuint pintro = intro[prim];
- GLuint ovf, i;
+ GLuint ovf = 0, i;
tnl->ExecCopyCount = 0;
- tnl->ExecParity = IM->PrimitiveLength[last] & 1;
+ if (IM->LastPrimitive != IM->CopyStart)
+ tnl->ExecParity = 0;
+
+ tnl->ExecParity ^= IM->PrimitiveLength[IM->LastPrimitive] & 1;
if (pincr != 1 && (IM->Count - last - pintro))
ovf = (IM->Count - last - pintro) % pincr;
tnl->ExecCopyElts[i] = IM->Elt[tnl->ExecCopyElts[i]];
}
}
+
+
+void _tnl_upgrade_current_data( GLcontext *ctx,
+ GLuint required,
+ GLuint flags )
+{
+ TNLcontext *tnl = TNL_CONTEXT(ctx);
+ struct vertex_buffer *VB = &tnl->vb;
+ struct immediate *IM = (struct immediate *)VB->import_source;
+
+ ASSERT(IM);
+
+/* _tnl_print_vert_flags("_tnl_upgrade_client_data", required); */
+
+ if ((required & VERT_BIT_COLOR0) && (VB->ColorPtr[0]->Flags & CA_CLIENT_DATA)) {
+ struct gl_client_array *tmp = &tnl->imm_inputs.Color;
+ GLuint start = IM->CopyStart;
+
+ tmp->Ptr = IM->Attrib[VERT_ATTRIB_COLOR0] + start;
+ tmp->StrideB = 4 * sizeof(GLfloat);
+ tmp->Flags = 0;
+
+ COPY_4FV( IM->Attrib[VERT_ATTRIB_COLOR0][start],
+ ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
+
+ /*
+ ASSERT(IM->Flag[IM->LastData+1] & VERT_BIT_END_VB);
+ */
+
+ fixup_first_4f( IM->Attrib[VERT_ATTRIB_COLOR0], IM->Flag,
+ VERT_BIT_END_VB,
+ start, IM->Attrib[VERT_ATTRIB_COLOR0][start] );
+
+ VB->importable_data &= ~VERT_BIT_COLOR0;
+ }
+}
+
projects / mesa.git / blobdiff