diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2000-12-26 05:09:27 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2000-12-26 05:09:27 +0000 |
| commit | cab974cf6c2dbfbf5dd5d291e1aae0f8eeb34290 (patch) | |
| tree | 45385bd755d8e3876c54b2b0113636f5ceb7976a /src/mesa/drivers/glide/fxsetup.c | |
| parent | d1ff1f6798b003a820f5de9fad835ff352f31afe (diff) | |
Major rework of tnl module
New array_cache module
Support 8 texture units in core mesa (now support 8 everywhere)
Rework core mesa statechange operations to avoid flushing on many
noop statechanges.
Diffstat (limited to 'src/mesa/drivers/glide/fxsetup.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxsetup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c index f4fde1214e..5b768848ce 100644 --- a/src/mesa/drivers/glide/fxsetup.c +++ b/src/mesa/drivers/glide/fxsetup.c @@ -71,7 +71,7 @@ static void fxSetupScissor(GLcontext *ctx); static void fxSetupCull(GLcontext *ctx); static void fx_print_state_flags( const char *msg, GLuint flags); /*static GLboolean fxMultipassBlend(struct vertex_buffer *, GLuint);*/ -static GLboolean fxMultipassTexture( struct vertex_buffer *, GLuint ); +static GLboolean fxMultipassTexture( GLcontext *, GLuint ); static void fxTexValidate(GLcontext *ctx, struct gl_texture_object *tObj) { @@ -1671,7 +1671,7 @@ static GLboolean fxMultipassBlend(struct vertex_buffer *VB, GLuint pass) case 2: /* Reset everything back to normal */ fxMesa->unitsState = fxMesa->restoreUnitsState; - fxMesa->setupdone &= XXX; + fxMesa->setup_gone |= XXX; fxSetupTextureSingleTMU(ctx, XXX); fxSetupBlend(ctx); fxSetupDepthTest(ctx); @@ -1694,12 +1694,12 @@ static GLboolean fxMultipassBlend(struct vertex_buffer *VB, GLuint pass) * voodoo 1. In all other cases for both voodoo 1 and 2, we fall back * to software rendering, satisfying the spec if not the user. */ -static GLboolean fxMultipassTexture( struct vertex_buffer *VB, GLuint pass ) +static GLboolean fxMultipassTexture( GLcontext *ctx, GLuint pass ) { - GLcontext *ctx = VB->ctx; - fxVertex *v = FX_DRIVER_DATA(VB)->verts; - fxVertex *last = FX_DRIVER_DATA(VB)->last_vert; fxMesaContext fxMesa = FX_CONTEXT(ctx); + TNLcontext *tnl = TNL_CONTEXT(ctx); + fxVertex *v = fxMesa->verts; + fxVertex *last = fxMesa->verts + tnl->vb.Count; switch (pass) { case 1: @@ -1742,7 +1742,7 @@ static GLboolean fxMultipassTexture( struct vertex_buffer *VB, GLuint pass ) */ fxMesa->tmu_source[0] = 0; fxMesa->unitsState = fxMesa->restoreUnitsState; - fxMesa->setupdone &= ~SETUP_TMU0; + fxMesa->setup_gone |= SETUP_TMU0; fxSetupTextureSingleTMU( ctx, 0 ); fxSetupBlend( ctx ); fxSetupDepthTest( ctx ); |