diff options
| author | Brian Paul <[email protected]> | 2002-09-17 15:46:34 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-09-17 15:46:34 +0000 |
| commit | a9be374f82ace523c126c661399030c869201dab (patch) | |
| tree | 9aea742129bab4b8dad092cdf9084962b7a57d67 /src/mesa/swrast_setup | |
| parent | e1cb2fb571ee47b59020db7627e554b7d227e454 (diff) | |
pull-in changes from DRI/Mesa-4.0.4
Diffstat (limited to 'src/mesa/swrast_setup')
| -rw-r--r-- | src/mesa/swrast_setup/ss_context.c | 12 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_context.h | 7 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c index 6adcef9b75c..58d85faa1f8 100644 --- a/src/mesa/swrast_setup/ss_context.c +++ b/src/mesa/swrast_setup/ss_context.c @@ -1,4 +1,3 @@ -/* $Id: ss_context.c,v 1.16 2002/08/08 00:41:11 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -49,7 +48,6 @@ #define _SWSETUP_NEW_RENDERINDEX (_NEW_POLYGON|_NEW_LIGHT) - GLboolean _swsetup_CreateContext( GLcontext *ctx ) { @@ -117,19 +115,13 @@ _swsetup_RenderStart( GLcontext *ctx ) swsetup->NewState = 0; - if (swsetup->Driver.Start) - swsetup->Driver.Start( ctx ); + _swrast_render_start( ctx ); } static void _swsetup_RenderFinish( GLcontext *ctx ) { - SScontext *swsetup = SWSETUP_CONTEXT(ctx); - - _swrast_flush( ctx ); - - if (swsetup->Driver.Finish) - swsetup->Driver.Finish( ctx ); + _swrast_render_finish( ctx ); } void diff --git a/src/mesa/swrast_setup/ss_context.h b/src/mesa/swrast_setup/ss_context.h index ed4da78d629..3174c95de12 100644 --- a/src/mesa/swrast_setup/ss_context.h +++ b/src/mesa/swrast_setup/ss_context.h @@ -1,4 +1,3 @@ -/* $Id: ss_context.h,v 1.9 2001/07/17 19:39:32 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -44,12 +43,6 @@ typedef struct { */ struct gl_client_array ChanColor; struct gl_client_array ChanSecondaryColor; - - - struct { - void (*Start)( GLcontext * ); - void (*Finish)( GLcontext * ); - } Driver; } SScontext; #define SWSETUP_CONTEXT(ctx) ((SScontext *)ctx->swsetup_context) |