From 1182ffeec39bf419928ba862c225e80a439fee7a Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 12 Jul 2001 22:09:21 +0000 Subject: Rename some of the tnl->Driver.* functions to tnl->Driver.Render.*, to make it clear that these are owned by t_vb_render.c. Make swrast_setup opaque - it now hooks itself directly into tnl->Driver.Render.*. Add a _swsetup_Wakeup() call that does this. Update X11 (tested), osmesa and FX drivers for this change. FX compiles but is probably broken as the changes there are large. It was the only remaining driver that used the internal _swsetup_ functions for interp and copy_pv. This usage has been replaced with code from the DRI tdfx driver. --- src/mesa/drivers/osmesa/osmesa.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/mesa/drivers/osmesa/osmesa.c') diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 85679d6a92..a0f2823f1d 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -1,4 +1,4 @@ -/* $Id: osmesa.c,v 1.60 2001/07/05 15:12:13 brianp Exp $ */ +/* $Id: osmesa.c,v 1.61 2001/07/12 22:09:21 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -346,6 +346,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits, _tnl_CreateContext( ctx ); _swsetup_CreateContext( ctx ); + _swsetup_Wakeup( ctx ); osmesa_register_swrast_functions( ctx ); } } @@ -2072,20 +2073,6 @@ static void osmesa_update_state( GLcontext *ctx, GLuint new_state ) swdd->SetReadBuffer = set_read_buffer; tnl->Driver.RunPipeline = _tnl_run_pipeline; - tnl->Driver.RenderStart = _swsetup_RenderStart; - tnl->Driver.RenderFinish = _swsetup_RenderFinish; - tnl->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices; - tnl->Driver.RenderPrimitive = _swsetup_RenderPrimitive; - tnl->Driver.PointsFunc = _swsetup_Points; - tnl->Driver.LineFunc = _swsetup_Line; - tnl->Driver.TriangleFunc = _swsetup_Triangle; - tnl->Driver.QuadFunc = _swsetup_Quad; - tnl->Driver.ResetLineStipple = _swrast_ResetLineStipple; - tnl->Driver.RenderInterp = _swsetup_RenderInterp; - tnl->Driver.RenderCopyPV = _swsetup_RenderCopyPV; - tnl->Driver.RenderClippedLine = _swsetup_RenderClippedLine; - tnl->Driver.RenderClippedPolygon = _swsetup_RenderClippedPolygon; - _swrast_InvalidateState( ctx, new_state ); _swsetup_InvalidateState( ctx, new_state ); -- cgit v1.2.3