diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-01-08 04:06:56 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-01-08 04:06:56 +0000 |
| commit | 44d8de433e684cb4c2bc4dfc5cc6919af1f3cc55 (patch) | |
| tree | 5aca3833a642fecf26946668f189a623d0f099ed /src/mesa/drivers/glide/fxvb.c | |
| parent | e9bf776711b22ce336cd462adf534ad3e2d61eec (diff) | |
Bring the FX driver into line with core mesa changes.
Diffstat (limited to 'src/mesa/drivers/glide/fxvb.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxvb.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c index 3138d59649..d95cfca579 100644 --- a/src/mesa/drivers/glide/fxvb.c +++ b/src/mesa/drivers/glide/fxvb.c @@ -288,12 +288,13 @@ void fxDDSetupInit( void ) void fx_validate_BuildProjVerts(GLcontext *ctx, GLuint start, GLuint count, GLuint newinputs ) { - GLuint setupindex = SETUP_XYZW; fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx; if (!fxMesa->is_in_hardware) - ctx->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices; + ctx->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices; else { + GLuint setupindex = SETUP_XYZW; + fxMesa->tmu_source[0] = 0; fxMesa->tmu_source[1] = 1; fxMesa->tex_dest[0] = SETUP_TMU0; @@ -357,20 +358,13 @@ void fx_BuildProjVerts( GLcontext *ctx, GLuint start, GLuint count, ind &= fxMesa->setupindex; } - if (0) { - _tnl_print_vert_flags("newinputs", newinputs); - fxPrintSetupFlags("setup function", ind); - } - if (ind) { if (fxMesa->new_state) - fxSetupFXUnits( ctx ); - - if (VB->importable_data) + fxSetupFXUnits( ctx ); /* why? */ + + if (VB->importable_data & newinputs) VB->import_data( ctx, VB->importable_data & newinputs, - (VB->ClipOrMask - ? VEC_NOT_WRITEABLE|VEC_BAD_STRIDE - : VEC_BAD_STRIDE)); + VEC_BAD_STRIDE ); setupfuncs[ind]( ctx, start, count ); } |