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.

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 8182ae2..0880e73 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -10,8 +10,7 @@ COMMON_SOURCES = \
         ../common/vblank.c \
         ../common/dri_util.c \
         ../common/xmlconfig.c \
-        ../common/drirenderbuffer.c \
-        ../common/glcontextmodes.c
+        ../common/drirenderbuffer.c
 
 ifeq ($(WINDOW_SYSTEM),dri)
 WINOBJ=../dri_client/dri.a

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index c201d44..4bb64c5 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -31,7 +31,6 @@
 
 #include "dri_util.h"
 #include "drm_sarea.h"
-#include "glcontextmodes.h"
 
 #ifndef GLX_OML_sync_control
 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);
        (void)drmClose(psp->fd);
        if ( psp->modes != NULL ) {
-           _gl_context_modes_destroy( psp->modes );
+           (*dri_interface->destroyContextModes)( psp->modes );
        }
        _mesa_free(psp);
     }

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 4219732..57c7fc7 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -16,8 +16,7 @@ COMMON_SOURCES = \
        ../common/texmem.c \
        ../common/vblank.c \
        ../common/xmlconfig.c \
-       ../common/dri_util.c \
-       ../common/glcontextmodes.c
+       ../common/dri_util.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \