summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-02-29 15:10:36 -0500
committerKristian Høgsberg <krh@redhat.com>2008-02-29 15:11:13 -0500
commit13bfa5937d43392f686b76a99ea6331e3dce5987 (patch)
tree5951dca53152300cda0a33cbd8becf5c0a9f5751 /hw/xfree86
parentd04ea267a4a51c16088d9ef429681a1edde536b1 (diff)
GLX: Adjust to changes in DRI driver interface.
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/dri2/dri2.c10
-rw-r--r--hw/xfree86/dri2/dri2.h4
2 files changed, 0 insertions, 14 deletions
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 3bc533ede..9b4c18c61 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -58,9 +58,6 @@ typedef struct _DRI2Screen {
void *sarea;
unsigned int sareaSize;
const char *driverName;
- int ddxVersionMajor;
- int ddxVersionMinor;
- int ddxVersionPatch;
__DRIEventBuffer *buffer;
int locked;
@@ -330,7 +327,6 @@ DRI2DestroyDrawable(ScreenPtr pScreen, DrawablePtr pDraw)
Bool
DRI2Connect(ScreenPtr pScreen, int *fd, const char **driverName,
- int *ddxMajor, int *ddxMinor, int *ddxPatch,
unsigned int *sareaHandle)
{
DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
@@ -340,9 +336,6 @@ DRI2Connect(ScreenPtr pScreen, int *fd, const char **driverName,
*fd = ds->fd;
*driverName = ds->driverName;
- *ddxMajor = ds->ddxVersionMajor;
- *ddxMinor = ds->ddxVersionMinor;
- *ddxPatch = ds->ddxVersionPatch;
*sareaHandle = ds->sareaBO.handle;
return TRUE;
@@ -406,9 +399,6 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
ds->fd = info->fd;
ds->driverName = info->driverName;
- ds->ddxVersionMajor = info->ddxVersionMajor;
- ds->ddxVersionMinor = info->ddxVersionMinor;
- ds->ddxVersionPatch = info->ddxVersionPatch;
ds->getPixmapHandle = info->getPixmapHandle;
ds->beginClipNotify = info->beginClipNotify;
diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
index c687a93f6..c8482477e 100644
--- a/hw/xfree86/dri2/dri2.h
+++ b/hw/xfree86/dri2/dri2.h
@@ -43,7 +43,6 @@ typedef struct {
int fd;
size_t driverSareaSize;
const char *driverName;
- int ddxVersionMajor, ddxVersionMinor, ddxVersionPatch;
DRI2GetPixmapHandleProcPtr getPixmapHandle;
DRI2BeginClipNotifyProcPtr beginClipNotify;
DRI2EndClipNotifyProcPtr endClipNotify;
@@ -57,9 +56,6 @@ void DRI2CloseScreen(ScreenPtr pScreen);
Bool DRI2Connect(ScreenPtr pScreen,
int *fd,
const char **driverName,
- int *ddxMajor,
- int *ddxMinor,
- int *ddxPatch,
unsigned int *sareaHandle);
unsigned int DRI2GetPixmapHandle(PixmapPtr pPixmap,