diff options
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/dd.h | 6 | ||||
| -rw-r--r-- | src/mesa/tnl/t_context.c | 16 | ||||
| -rw-r--r-- | src/mesa/tnl/t_context.h | 8 |
5 files changed, 2 insertions, 36 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 105d023635..8503135a87 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -226,7 +226,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->SaveFlushVertices = NULL; driver->NotifySaveBegin = NULL; driver->LightingSpaceChange = NULL; - driver->MakeCurrent = NULL; /* display list */ driver->NewList = NULL; diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f51adb59da..d660dfd8fe 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1598,13 +1598,6 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, } } - /* Alert the driver - usually passed on to the sw t&l module, - * but also used to detect threaded cases in the radeon codegen - * hw t&l module. - */ - if (newCtx->Driver.MakeCurrent) - newCtx->Driver.MakeCurrent( newCtx, drawBuffer, readBuffer ); - /* We can use this to help debug user's problems. Tell them to set * the MESA_INFO env variable before running their app. Then the * first time each context is made current we'll print some useful diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 55bb66cb01..5f680116e5 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -903,12 +903,6 @@ struct dd_function_table { void (*LightingSpaceChange)( GLcontext *ctx ); /** - * Let the T&L component know when the context becomes current. - */ - void (*MakeCurrent)( GLcontext *ctx, GLframebuffer *drawBuffer, - GLframebuffer *readBuffer ); - - /** * Called by glNewList(). * * Let the T&L component know what is going on with display lists diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index dab0eb61b0..472b97bfe5 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * @@ -47,15 +47,6 @@ -void -_tnl_MakeCurrent( GLcontext *ctx, - GLframebuffer *drawBuffer, - GLframebuffer *readBuffer ) -{ - (void) ctx; (void) drawBuffer; (void) readBuffer; -} - - static void install_driver_callbacks( GLcontext *ctx ) { @@ -63,7 +54,6 @@ install_driver_callbacks( GLcontext *ctx ) ctx->Driver.EndList = _tnl_EndList; ctx->Driver.FlushVertices = _tnl_FlushVertices; ctx->Driver.SaveFlushVertices = _tnl_SaveFlushVertices; - ctx->Driver.MakeCurrent = _tnl_MakeCurrent; ctx->Driver.BeginCallList = _tnl_BeginCallList; ctx->Driver.EndCallList = _tnl_EndCallList; } @@ -212,10 +202,6 @@ _tnl_wakeup_exec( GLcontext *ctx ) */ _mesa_install_exec_vtxfmt( ctx, &tnl->exec_vtxfmt ); - /* Call all appropriate driver callbacks to revive state. - */ - _tnl_MakeCurrent( ctx, ctx->DrawBuffer, ctx->ReadBuffer ); - /* Assume we haven't been getting state updates either: */ _tnl_InvalidateState( ctx, ~0 ); diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index cdaa252e8f..08fb96b6a4 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -1,6 +1,6 @@ /* * mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * @@ -790,11 +790,5 @@ typedef struct #define TYPE_IDX(t) ((t) & 0xf) #define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1 /* 0xa + 1 */ -extern void _tnl_MakeCurrent( GLcontext *ctx, - GLframebuffer *drawBuffer, - GLframebuffer *readBuffer ); - - - #endif |