summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2005-07-28 23:33:18 +0000
committerIan Romanick <[email protected]>2005-07-28 23:33:18 +0000
commit82e3ecf413704440ea64b3b582d68f82f7b83704 (patch)
treeadfef0a6494b0388ccdb144c4caad10b035bb014 /src/mesa/drivers/dri
parentf7c9eafa856623d5ce72afb8b20b7ccbcc3e671d (diff)
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.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/Makefile.template3
-rw-r--r--src/mesa/drivers/dri/common/dri_util.c3
-rw-r--r--src/mesa/drivers/dri/r300/Makefile3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 8182ae2da9a..0880e73caf9 100644
--- 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 c201d44c6c6..4bb64c53f87 100644
--- 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 42197324744..57c7fc7aa95 100644
--- 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 \