fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 22:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bring the FX driver into line with core mesa changes.

Browse source
This commit is contained in:
Keith Whitwell 2001-01-08 04:06:56 +00:00
parent e9bf776711
commit 44d8de433e
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/glide/fxdd.c
View file

@ -1026,6 +1026,10 @@ static void fxDDUpdateDDPointers(GLcontext *ctx, GLuint new_state)
#endif #endif
} }
static void fxDDRenderPrimitive( GLcontext *ctx, GLenum mode )
{
(void) ctx; (void) mode;
}
void fxSetupDDPointers(GLcontext *ctx) void fxSetupDDPointers(GLcontext *ctx)
@ -1061,6 +1065,7 @@ void fxSetupDDPointers(GLcontext *ctx)
ctx->Driver.RenderStart=fxSetupFXUnits; ctx->Driver.RenderStart=fxSetupFXUnits;
ctx->Driver.RenderFinish=_swrast_flush; ctx->Driver.RenderFinish=_swrast_flush;
ctx->Driver.ResetLineStipple=_swrast_ResetLineStipple; ctx->Driver.ResetLineStipple=_swrast_ResetLineStipple;
ctx->Driver.RenderPrimitive=fxDDRenderPrimitive;
ctx->Driver.TexImage2D = fxDDTexImage2D; ctx->Driver.TexImage2D = fxDDTexImage2D;
ctx->Driver.TexSubImage2D = fxDDTexSubImage2D; ctx->Driver.TexSubImage2D = fxDDTexSubImage2D;

31
src/mesa/drivers/glide/fxtris.c
View file

@ -457,19 +457,6 @@ fx_null_tri( GLcontext *ctx,
#define POINT_FALLBACK (DD_POINT_SMOOTH )
#define LINE_FALLBACK (DD_LINE_STIPPLE)
#define TRI_FALLBACK (DD_TRI_SMOOTH | DD_TRI_STIPPLE )
#define ANY_FALLBACK (POINT_FALLBACK | LINE_FALLBACK | TRI_FALLBACK)
#define ANY_RENDER_FLAGS (DD_FLATSHADE | \
DD_TRI_LIGHT_TWOSIDE | \
DD_TRI_OFFSET | \
DD_TRI_UNFILLED)
/**********************************************************************/ /**********************************************************************/
/* Render whole begin/end objects */ /* Render whole begin/end objects */
@ -518,6 +505,24 @@ fx_null_tri( GLcontext *ctx,
#include "tnl/t_vb_rendertmp.h" #include "tnl/t_vb_rendertmp.h"
/**********************************************************************/
/* Choose render functions */
/**********************************************************************/
#define POINT_FALLBACK (DD_POINT_SMOOTH )
#define LINE_FALLBACK (DD_LINE_STIPPLE)
#define TRI_FALLBACK (DD_TRI_SMOOTH | DD_TRI_STIPPLE )
#define ANY_FALLBACK (POINT_FALLBACK | LINE_FALLBACK | TRI_FALLBACK)
#define ANY_RENDER_FLAGS (DD_FLATSHADE | \
DD_TRI_LIGHT_TWOSIDE | \
DD_TRI_OFFSET | \
DD_TRI_UNFILLED)
/* Setup the Point, Line, Triangle and Quad functions based on the /* Setup the Point, Line, Triangle and Quad functions based on the

20
src/mesa/drivers/glide/fxvb.c
View file

@ -288,12 +288,13 @@ void fxDDSetupInit( void )
void fx_validate_BuildProjVerts(GLcontext *ctx, GLuint start, GLuint count, void fx_validate_BuildProjVerts(GLcontext *ctx, GLuint start, GLuint count,
GLuint newinputs ) GLuint newinputs )
{ {
GLuint setupindex = SETUP_XYZW;
fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx; fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
if (!fxMesa->is_in_hardware) if (!fxMesa->is_in_hardware)
ctx->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices; ctx->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices;
else { else {
GLuint setupindex = SETUP_XYZW;
fxMesa->tmu_source[0] = 0; fxMesa->tmu_source[0] = 0;
fxMesa->tmu_source[1] = 1; fxMesa->tmu_source[1] = 1;
fxMesa->tex_dest[0] = SETUP_TMU0; fxMesa->tex_dest[0] = SETUP_TMU0;
@ -357,20 +358,13 @@ void fx_BuildProjVerts( GLcontext *ctx, GLuint start, GLuint count,
ind &= fxMesa->setupindex; ind &= fxMesa->setupindex;
} }
if (0) {
_tnl_print_vert_flags("newinputs", newinputs);
fxPrintSetupFlags("setup function", ind);
}
if (ind) { if (ind) {
if (fxMesa->new_state) if (fxMesa->new_state)
fxSetupFXUnits( ctx ); fxSetupFXUnits( ctx ); /* why? */
if (VB->importable_data) if (VB->importable_data & newinputs)
VB->import_data( ctx, VB->importable_data & newinputs, VB->import_data( ctx, VB->importable_data & newinputs,
(VB->ClipOrMask VEC_BAD_STRIDE );
? VEC_NOT_WRITEABLE|VEC_BAD_STRIDE
: VEC_BAD_STRIDE));
setupfuncs[ind]( ctx, start, count ); setupfuncs[ind]( ctx, start, count );
} }