From 04bcaac383cb6d3d5bceb7ecf65ff97c10aa7111 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Feb 2004 00:28:03 +0000 Subject: [PATCH] added _tnl_allow_vertex/pixel_fog() calls --- src/mesa/drivers/dri/gamma/gamma_context.c | 4 +++- src/mesa/drivers/dri/i810/i810context.c | 4 +++- src/mesa/drivers/dri/i830/i830_context.c | 4 +++- src/mesa/drivers/dri/mach64/mach64_context.c | 4 +++- src/mesa/drivers/dri/mga/mga_xmesa.c | 4 +++- src/mesa/drivers/dri/r128/r128_context.c | 4 +++- src/mesa/drivers/dri/radeon/radeon_context.c | 4 +++- src/mesa/drivers/dri/sis/sis_context.c | 2 ++ src/mesa/drivers/dri/tdfx/tdfx_context.c | 4 +++- src/mesa/drivers/dri/unichrome/via_context.c | 4 +++- 10 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/mesa/drivers/dri/gamma/gamma_context.c b/src/mesa/drivers/dri/gamma/gamma_context.c index 66f330758a8..107eca56f6a 100644 --- a/src/mesa/drivers/dri/gamma/gamma_context.c +++ b/src/mesa/drivers/dri/gamma/gamma_context.c @@ -156,10 +156,12 @@ GLboolean gammaCreateContext( const __GLcontextModes *glVisual, _tnl_destroy_pipeline( ctx ); _tnl_install_pipeline( ctx, gamma_pipeline ); - /* Configure swrast to match hardware characteristics: + /* Configure swrast & TNL to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); gammaInitVB( ctx ); gammaDDInitExtensions( ctx ); diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c index 8de1572a9b4..780f0492e09 100644 --- a/src/mesa/drivers/dri/i810/i810context.c +++ b/src/mesa/drivers/dri/i810/i810context.c @@ -265,10 +265,12 @@ i810CreateContext( const __GLcontextModes *mesaVis, _tnl_destroy_pipeline( ctx ); _tnl_install_pipeline( ctx, i810_pipeline ); - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); /* Dri stuff */ diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c index 0d6b2b74644..a692203ce28 100644 --- a/src/mesa/drivers/dri/i830/i830_context.c +++ b/src/mesa/drivers/dri/i830/i830_context.c @@ -318,9 +318,11 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis, _tnl_destroy_pipeline( ctx ); _tnl_install_pipeline( ctx, i830_pipeline ); - /* Configure swrast to match hardware characteristics: */ + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); /* Dri stuff */ imesa->hHWContext = driContextPriv->hHWContext; diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c index 2e30bb9cf31..c0ffb21bc28 100644 --- a/src/mesa/drivers/dri/mach64/mach64_context.c +++ b/src/mesa/drivers/dri/mach64/mach64_context.c @@ -208,10 +208,12 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual, /* _tnl_destroy_pipeline( ctx ); */ /* _tnl_install_pipeline( ctx, mach64_pipeline ); */ - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); driInitExtensions( ctx, card_extensions, GL_TRUE ); diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 5e7d8cbbb1a..fa981198fec 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -635,10 +635,12 @@ mgaCreateContext( const __GLcontextModes *mesaVis, _tnl_destroy_pipeline( ctx ); _tnl_install_pipeline( ctx, mga_pipeline ); - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); mmesa->primary_offset = mmesa->mgaScreen->primary.handle; diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c index ea1c2767704..e5be8000c29 100644 --- a/src/mesa/drivers/dri/r128/r128_context.c +++ b/src/mesa/drivers/dri/r128/r128_context.c @@ -230,10 +230,12 @@ GLboolean r128CreateContext( const __GLcontextModes *glVisual, /* _tnl_destroy_pipeline( ctx ); */ /* _tnl_install_pipeline( ctx, r128_pipeline ); */ - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); driInitExtensions( ctx, card_extensions, GL_TRUE ); if (sPriv->drmMinor >= 4) diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index de197aa4dbb..c68bab5f342 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -380,10 +380,12 @@ radeonCreateContext( const __GLcontextModes *glVisual, _tnl_isolate_materials( ctx, GL_TRUE ); - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_FALSE ); _swrast_allow_vertex_fog( ctx, GL_TRUE ); + _tnl_allow_pixel_fog( ctx, GL_FALSE ); + _tnl_allow_vertex_fog( ctx, GL_TRUE ); _math_matrix_ctr( &rmesa->TexGenMatrix[0] ); diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c index 8a20f7ec0ee..e580a405f04 100644 --- a/src/mesa/drivers/dri/sis/sis_context.c +++ b/src/mesa/drivers/dri/sis/sis_context.c @@ -225,6 +225,8 @@ sisCreateContext( const __GLcontextModes *glVisual, _swrast_allow_pixel_fog( ctx, GL_TRUE ); _swrast_allow_vertex_fog( ctx, GL_FALSE ); + _tnl_allow_pixel_fog( ctx, GL_TRUE ); + _tnl_allow_vertex_fog( ctx, GL_FALSE ); /* XXX these should really go right after _mesa_init_driver_functions() */ sisDDInitStateFuncs( ctx ); diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c index 973aa6cff21..0cb5aa983f0 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_context.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c @@ -252,10 +252,12 @@ GLboolean tdfxCreateContext( const __GLcontextModes *mesaVis, _tnl_destroy_pipeline( ctx ); _tnl_install_pipeline( ctx, tdfx_pipeline ); - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog( ctx, GL_TRUE ); _swrast_allow_vertex_fog( ctx, GL_FALSE ); + _tnl_allow_pixel_fog( ctx, GL_TRUE ); + _tnl_allow_vertex_fog( ctx, GL_FALSE ); tdfxDDInitExtensions( ctx ); /* XXX these should really go right after _mesa_init_driver_functions() */ diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c index 9dd3230e049..e03f7fed929 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.c +++ b/src/mesa/drivers/dri/unichrome/via_context.c @@ -446,10 +446,12 @@ viaCreateContext(const __GLcontextModes *mesaVis, _tnl_destroy_pipeline(ctx); _tnl_install_pipeline(ctx, via_pipeline); - /* Configure swrast to match hardware characteristics: + /* Configure swrast and T&L to match hardware characteristics: */ _swrast_allow_pixel_fog(ctx, GL_FALSE); _swrast_allow_vertex_fog(ctx, GL_TRUE); + _tnl_allow_pixel_fog(ctx, GL_FALSE); + _tnl_allow_vertex_fog(ctx, GL_TRUE); #ifndef _SOLO vmesa->display = dpy; -- 2.30.2