Use the routines supplied in the __DRIinterfaceMethods structure to create a

destroy __GLcontextModes structures.  This eliminates the need for DRI
drivers to ever link with glcontextmodes.c.
This commit is contained in:
Ian Romanick
2005-07-28 23:33:18 +00:00
parent f7c9eafa85
commit 82e3ecf413
3 changed files with 3 additions and 6 deletions

View File

@@ -10,8 +10,7 @@ COMMON_SOURCES = \
../common/vblank.c \ ../common/vblank.c \
../common/dri_util.c \ ../common/dri_util.c \
../common/xmlconfig.c \ ../common/xmlconfig.c \
../common/drirenderbuffer.c \ ../common/drirenderbuffer.c
../common/glcontextmodes.c
ifeq ($(WINDOW_SYSTEM),dri) ifeq ($(WINDOW_SYSTEM),dri)
WINOBJ=../dri_client/dri.a WINOBJ=../dri_client/dri.a

View File

@@ -31,7 +31,6 @@
#include "dri_util.h" #include "dri_util.h"
#include "drm_sarea.h" #include "drm_sarea.h"
#include "glcontextmodes.h"
#ifndef GLX_OML_sync_control #ifndef GLX_OML_sync_control
typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRInativeDisplay *dpy, __DRIid drawable, int32_t *numerator, int32_t *denominator); typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRInativeDisplay *dpy, __DRIid drawable, int32_t *numerator, int32_t *denominator);
@@ -836,7 +835,7 @@ static void driDestroyScreen(__DRInativeDisplay *dpy, int scrn, void *screenPriv
_mesa_free(psp->pDevPriv); _mesa_free(psp->pDevPriv);
(void)drmClose(psp->fd); (void)drmClose(psp->fd);
if ( psp->modes != NULL ) { if ( psp->modes != NULL ) {
_gl_context_modes_destroy( psp->modes ); (*dri_interface->destroyContextModes)( psp->modes );
} }
_mesa_free(psp); _mesa_free(psp);
} }

View File

@@ -16,8 +16,7 @@ COMMON_SOURCES = \
../common/texmem.c \ ../common/texmem.c \
../common/vblank.c \ ../common/vblank.c \
../common/xmlconfig.c \ ../common/xmlconfig.c \
../common/dri_util.c \ ../common/dri_util.c
../common/glcontextmodes.c
DRIVER_SOURCES = \ DRIVER_SOURCES = \
radeon_screen.c \ radeon_screen.c \