OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for moebius infinite loop

Browse Source
This commit is contained in:
Keith Whitwell
2001-05-03 16:49:27 +00:00
parent a03463303d
commit 652a14a215
4 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/drivers/common/t_dd_vbtmp.h
View File

@@ -1,4 +1,4 @@
/* $Id: t_dd_vbtmp.h,v 1.13 2001/04/29 08:41:09 keithw Exp $ */ /* $Id: t_dd_vbtmp.h,v 1.14 2001/05/03 16:49:28 keithw Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -519,6 +519,7 @@ static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end,
#if (DO_XYZW) && (DO_RGBA) #if (DO_XYZW) && (DO_RGBA)
#if (HAVE_PTEX_VERTICES) #if (HAVE_PTEX_VERTICES)
static GLboolean TAG(check_tex_sizes)( GLcontext *ctx ) static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
{ {

10
src/mesa/tnl/t_imm_dlist.c
View File

@@ -1,4 +1,4 @@
/* $Id: t_imm_dlist.c,v 1.15 2001/04/30 21:08:52 keithw Exp $ */ /* $Id: t_imm_dlist.c,v 1.16 2001/05/03 16:49:27 keithw Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -145,12 +145,12 @@ _tnl_compile_cassette( GLcontext *ctx, struct immediate *IM )
im->ref_count--; /* remove CURRENT_IM reference */ im->ref_count--; /* remove CURRENT_IM reference */
ASSERT(im->ref_count > 0); /* it is compiled into a display list */ ASSERT(im->ref_count > 0); /* it is compiled into a display list */
SET_IMMEDIATE( ctx, new_im ); SET_IMMEDIATE( ctx, new_im );
_tnl_reset_input( ctx, IMM_MAX_COPIED_VERTS, _tnl_reset_compile_input( ctx, IMM_MAX_COPIED_VERTS,
new_beginstate, node->SavedBeginState ); new_beginstate, node->SavedBeginState );
} else { } else {
/* Still some room in the current immediate. /* Still some room in the current immediate.
*/ */
_tnl_reset_input( ctx, im->Count+1+IMM_MAX_COPIED_VERTS, _tnl_reset_compile_input( ctx, im->Count+1+IMM_MAX_COPIED_VERTS,
new_beginstate, node->SavedBeginState); new_beginstate, node->SavedBeginState);
} }
} }
@@ -299,7 +299,7 @@ _tnl_EndList( GLcontext *ctx )
SET_IMMEDIATE( ctx, IM ); SET_IMMEDIATE( ctx, IM );
IM->ref_count++; IM->ref_count++;
_tnl_reset_input( ctx, IMM_MAX_COPIED_VERTS, 0, 0 ); _tnl_reset_exec_input( ctx, IMM_MAX_COPIED_VERTS, 0, 0 );
} }

67
src/mesa/tnl/t_imm_exec.c
View File

@@ -1,4 +1,4 @@
/* $Id: t_imm_exec.c,v 1.20 2001/05/01 13:15:28 keithw Exp $ */ /* $Id: t_imm_exec.c,v 1.21 2001/05/03 16:49:27 keithw Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -57,12 +57,11 @@
void _tnl_reset_input( GLcontext *ctx, static void reset_input( GLcontext *ctx,
GLuint start, GLuint start,
GLuint beginstate, GLuint beginstate,
GLuint savedbeginstate ) GLuint savedbeginstate )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct immediate *IM = TNL_CURRENT_IM(ctx); struct immediate *IM = TNL_CURRENT_IM(ctx);
/* Clear the dirty part of the flag array. /* Clear the dirty part of the flag array.
@@ -70,23 +69,12 @@ void _tnl_reset_input( GLcontext *ctx,
if (start < IM->Count+2) if (start < IM->Count+2)
MEMSET(IM->Flag + start, 0, sizeof(GLuint) * (IM->Count+2-start)); MEMSET(IM->Flag + start, 0, sizeof(GLuint) * (IM->Count+2-start));
IM->Start = IM->Count = start; IM->Start = start;
IM->CopyStart = IM->Start - tnl->ExecCopyCount; IM->Count = start;
IM->Primitive[IM->CopyStart] = ctx->Driver.CurrentExecPrimitive; IM->LastMaterial = start;
if (tnl->ExecParity)
IM->Primitive[IM->CopyStart] |= PRIM_PARITY;
if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) {
ASSERT(tnl->ExecCopyTexSize == 0);
ASSERT(tnl->ExecCopyCount == 0);
ASSERT(IM->CopyStart == IM->Start);
}
IM->LastPrimitive = IM->CopyStart;
IM->BeginState = beginstate; IM->BeginState = beginstate;
IM->SavedBeginState = savedbeginstate; IM->SavedBeginState = savedbeginstate;
IM->TexSize = 0; IM->TexSize = 0;
IM->LastMaterial = IM->Start;
IM->MaterialOrMask = 0; IM->MaterialOrMask = 0;
if (IM->MaterialMask) if (IM->MaterialMask)
@@ -96,6 +84,39 @@ void _tnl_reset_input( GLcontext *ctx,
IM->ArrayEltIncr = ctx->Array.Vertex.Enabled ? 1 : 0; IM->ArrayEltIncr = ctx->Array.Vertex.Enabled ? 1 : 0;
IM->ArrayEltFlush = !ctx->Array.LockCount; IM->ArrayEltFlush = !ctx->Array.LockCount;
} }
void _tnl_reset_exec_input( GLcontext *ctx,
GLuint start,
GLuint beginstate,
GLuint savedbeginstate )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct immediate *IM = TNL_CURRENT_IM(ctx);
reset_input( ctx, start, beginstate, savedbeginstate );
IM->CopyStart = start - tnl->ExecCopyCount;
IM->Primitive[IM->CopyStart] = ctx->Driver.CurrentExecPrimitive;
if (tnl->ExecParity)
IM->Primitive[IM->CopyStart] |= PRIM_PARITY;
IM->LastPrimitive = IM->CopyStart;
}
void _tnl_reset_compile_input( GLcontext *ctx,
GLuint start,
GLuint beginstate,
GLuint savedbeginstate )
{
struct immediate *IM = TNL_CURRENT_IM(ctx);
reset_input( ctx, start, beginstate, savedbeginstate );
IM->CopyStart = start;
IM->LastPrimitive = IM->Start;
}
@@ -462,8 +483,8 @@ void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM )
IM->ref_count++; IM->ref_count++;
_tnl_reset_input( ctx, IMM_MAX_COPIED_VERTS, _tnl_reset_exec_input( ctx, IMM_MAX_COPIED_VERTS,
begin_state, saved_begin_state ); begin_state, saved_begin_state );
} }
if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1)
@@ -522,7 +543,7 @@ void _tnl_imm_init( GLcontext *ctx )
/* Install the first immediate. Intially outside begin/end. /* Install the first immediate. Intially outside begin/end.
*/ */
_tnl_reset_input( ctx, IMM_MAX_COPIED_VERTS, 0, 0 ); _tnl_reset_exec_input( ctx, IMM_MAX_COPIED_VERTS, 0, 0 );
tnl->ReplayHardBeginEnd = 0; tnl->ReplayHardBeginEnd = 0;
_tnl_imm_vtxfmt_init( ctx ); _tnl_imm_vtxfmt_init( ctx );

15
src/mesa/tnl/t_imm_exec.h
View File

@@ -1,4 +1,4 @@
/* $Id: t_imm_exec.h,v 1.4 2001/03/12 00:48:43 gareth Exp $ */ /* $Id: t_imm_exec.h,v 1.5 2001/05/03 16:49:27 keithw Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -52,10 +52,15 @@ extern void _tnl_imm_init( GLcontext *ctx );
extern void _tnl_imm_destroy( GLcontext *ctx ); extern void _tnl_imm_destroy( GLcontext *ctx );
extern void _tnl_reset_input( GLcontext *ctx, extern void _tnl_reset_exec_input( GLcontext *ctx,
GLuint start, GLuint start,
GLuint beginstate, GLuint beginstate,
GLuint savedbeginstate ); GLuint savedbeginstate );
extern void _tnl_reset_compile_input( GLcontext *ctx,
GLuint start,
GLuint beginstate,
GLuint savedbeginstate );
extern void _tnl_compute_orflag( struct immediate *IM ); extern void _tnl_compute_orflag( struct immediate *IM );
extern void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM ); extern void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM );