summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri/common
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-05-25 18:43:52 +0100
committerJakob Bornecrantz <[email protected]>2010-05-25 19:03:19 +0100
commitf501230db3a94c9328b8e769d9c17b2c3792e19c (patch)
treef60dfb6d788821b9a024974f6d1015b1ca4575cd /src/gallium/state_trackers/dri/common
parent378796fe119ea61742df914b4de9ca4ed6bcc223 (diff)
st/dri: Remove DRI1 support
Nobody used it and the current code had been trough so many changes yet never once being tested.
Diffstat (limited to 'src/gallium/state_trackers/dri/common')
-rw-r--r--src/gallium/state_trackers/dri/common/dri_screen.c29
1 files changed, 6 insertions, 23 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_screen.c b/src/gallium/state_trackers/dri/common/dri_screen.c
index fa1a35deb32..25cad8d46c4 100644
--- a/src/gallium/state_trackers/dri/common/dri_screen.c
+++ b/src/gallium/state_trackers/dri/common/dri_screen.c
@@ -40,7 +40,6 @@
#include "dri_drawable.h"
#include "dri1_helper.h"
#ifndef __NOT_HAVE_DRM_H
-#include "dri1.h"
#include "dri2.h"
#else
#include "drisw.h"
@@ -296,22 +295,6 @@ dri_fill_st_visual(struct st_visual *stvis, struct dri_screen *screen,
/* let the state tracker allocate the accum buffer */
}
-#ifndef __NOT_HAVE_DRM_H
-
-/**
- * Get information about previous buffer swaps.
- */
-static int
-dri_get_swap_info(__DRIdrawable * dPriv, __DRIswapInfo * sInfo)
-{
- if (dPriv == NULL || dPriv->driverPrivate == NULL || sInfo == NULL)
- return -1;
- else
- return 0;
-}
-
-#endif
-
static boolean
dri_get_egl_image(struct st_manager *smapi,
struct st_context_iface *stctxi,
@@ -435,14 +418,14 @@ const struct __DriverAPIRec driDriverAPI = {
#ifndef __NOT_HAVE_DRM_H
- .GetSwapInfo = dri_get_swap_info,
- .GetDrawableMSC = driDrawableGetMSC32,
- .WaitForMSC = driWaitForMSC32,
+ .GetSwapInfo = NULL,
+ .GetDrawableMSC = NULL,
+ .WaitForMSC = NULL,
.InitScreen2 = dri2_init_screen,
- .InitScreen = dri1_init_screen,
- .SwapBuffers = dri1_swap_buffers,
- .CopySubBuffer = dri1_copy_sub_buffer,
+ .InitScreen = NULL,
+ .SwapBuffers = NULL,
+ .CopySubBuffer = NULL,
#else