-/* $Id: t_imm_fixup.c,v 1.12 2001/04/28 08:39:18 keithw Exp $ */
+/* $Id: t_imm_fixup.c,v 1.28 2001/12/03 17:47:04 keithw Exp $ */
/*
* Mesa 3-D graphics library
#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"
{
GLuint i = start;
+
for (;;) {
if ((flag[++i] & match) == 0) {
+/* fprintf(stderr, "_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;
}
GLuint i = start-1;
match |= VERT_END_VB;
+/* fprintf(stderr, "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);
}
data[i] = dflt;
}
+static void copy_from_current( GLcontext *ctx, struct immediate *IM,
+ GLuint start, GLuint 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_4FV( IM->Color[start], ctx->Current.Color);
+ }
+
+ if (copy & VERT_SPEC_RGB)
+ COPY_4FV( 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] );
+ }
+ }
+}
+
void _tnl_fixup_input( GLcontext *ctx, struct immediate *IM )
{
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;
/* 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_4FV( IM->Color[start], ctx->Current.Color);
- }
-
- if (copy & VERT_SPEC_RGB)
- COPY_4FV( 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_RGBA) {
if (orflag & VERT_RGBA)
_tnl_fixup_4f( IM->Color, IM->Flag, start, VERT_RGBA );
-/* else */
-/* fixup_first_4f( IM->Color, IM->Flag, VERT_END_VB, start, */
-/* IM->Color[start] ); */
+ /* No need for else case as the drivers understand stride
+ * zero here. (TODO - propogate this)
+ */
}
if (fixup & VERT_SPEC_RGB) {
MEMCPY(next->Material[dst], prev->Material[src], 2*sizeof(GLmaterial));
}
+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
* 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_DATA) == VERT_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_4FV( 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_ELT;
}
-
- 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_4FV( 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 */
+/* fprintf(stderr, "ADDING VERT_ELT!\n"); */
+ next->CopyOrFlag |= VERT_ELT;
+ next->CopyAndFlag &= VERT_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_FIXUP);
+ next->CopyOrFlag |= flag;
+ }
+ else {
+ /* Don't let an early 'glColor', etc. poison the elt path.
+ */
+ flag = ((prev->OrFlag|prev->Evaluated) & VERT_FIXUP);
+ }
+ next->TexSize |= tnl->ExecCopyTexSize;
+ next->CopyAndFlag &= flag;
+
- ASSERT(prev == tnl->ExecCopySource);
+/* _tnl_print_vert_flags("copy vertex components", copy); */
+/* _tnl_print_vert_flags("prev copyorflag", prev->CopyOrFlag); */
+/* _tnl_print_vert_flags("flag", flag); */
- if (--tnl->ExecCopySource->ref_count == 0)
- _tnl_free_immediate( tnl->ExecCopySource );
+ /* Copy whole vertices
+ */
+ for (i = 0 ; i < count ; i++)
+ {
+ GLuint src = elts[i+offset];
+ GLuint isrc = src - prev->CopyStart;
+ GLuint dst = next->CopyStart+i;
- next->ref_count++;
- tnl->ExecCopySource = next;
+ /* 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->Obj[dst], inputs->Obj.data[isrc] );
- tnl->ExecCopyElts[0] = next->Start-3;
- tnl->ExecCopyElts[1] = next->Start-2;
- tnl->ExecCopyElts[2] = next->Start-1;
-}
+ if (copy & VERT_NORM) {
+/* fprintf(stderr, "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->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_RGBA)
+ COPY_4FV( next->Color[dst],
+ ((GLfloat (*)[4])inputs->Color.Ptr)[isrc] );
- ASSERT(IM == TNL_CURRENT_IM(ctx));
- ASSERT(IM->Count == IM->Start);
+ if (copy & VERT_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_TEX_ANY) {
+ GLuint i;
+ for (i = 0 ; i < prev->MaxTextureUnits ; i++) {
+ if (copy & VERT_TEX(i))
+ COPY_4FV( next->TexCoord[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_ELT|VERT_EDGE|VERT_SPEC_RGB|VERT_FOG_COORD|
+ VERT_MATERIAL)) {
- 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);
+ if (prev->Flag[src] & VERT_MATERIAL)
+ copy_material(next, prev, dst, src);
+
+ next->Elt[dst] = prev->Elt[src];
+ next->EdgeFlag[dst] = prev->EdgeFlag[src];
+ COPY_4FV( next->SecondaryColor[dst], prev->SecondaryColor[src] );
+ next->FogCoord[dst] = prev->FogCoord[src];
+ }
+
+ next->Flag[dst] = flag;
+ next->CopyOrFlag |= prev->Flag[src] & (VERT_FIXUP|
+ VERT_MATERIAL|
+ VERT_OBJ);
+ }
}
- /* 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( tnl->ExecCopySource );
+
+ tnl->ExecCopySource = 0;
+ tnl->ExecCopyCount = 0;
}
+
/* 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;
+/* fprintf(stderr, "%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);
}
+ /* Naked array elements can be copied into the first cassette in a
+ * display list. Need to translate them away:
+ */
+ if (IM->CopyOrFlag & VERT_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_FIXUP;
+/* _tnl_print_vert_flags("fixup compiled", fixup); */
+
if (fixup) {
if (fixup & VERT_TEX_ANY) {
GLuint i;
fixup_first_1ui(IM->Index, IM->Flag, VERT_INDEX, start,
ctx->Current.Index );
- if (fixup & VERT_RGBA)
+ if (fixup & VERT_RGBA) {
if (IM->CopyOrFlag & VERT_RGBA)
fixup_first_4f(IM->Color, IM->Flag, VERT_RGBA, start,
ctx->Current.Color );
+ else
+ fixup &= ~VERT_RGBA;
+ }
if (fixup & VERT_SPEC_RGB)
fixup_first_4f(IM->SecondaryColor, IM->Flag, VERT_SPEC_RGB, start,
fixup_first_3f(IM->Normal, IM->Flag, VERT_NORM, start,
ctx->Current.Normal );
}
+
+ IM->CopyOrFlag |= fixup;
}
+
/* Materials:
*/
} 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;
+/* fprintf(stderr, "_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;
- }
+ ASSERT(tnl->ExecCopySource == 0);
if (prim == GL_POLYGON+1) {
tnl->ExecCopyCount = 0;
tnl->ExecCopyTexSize = 0;
tnl->ExecParity = 0;
} else {
+ /* Remember this immediate as the one to copy from.
+ */
+ IM->ref_count++;
+ tnl->ExecCopySource = IM;
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 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;
GLuint flags )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
- struct immediate *IM = tnl->ExecCopySource;
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); */
tmp->Flags = 0;
COPY_4FV( IM->Color[start], ctx->Current.Color);
+
+ /*
+ ASSERT(IM->Flag[IM->LastData+1] & VERT_END_VB);
+ */
+
fixup_first_4f( IM->Color, IM->Flag, VERT_END_VB, start,
IM->Color[start] );
VB->importable_data &= ~VERT_RGBA;
}
}
+