DRI1-only as well.
---
src/gallium/state_trackers/dri/drm/dri2.c | 2 --
src/mesa/drivers/dri/common/dri_util.c | 17 -----------------
src/mesa/drivers/dri/common/dri_util.h | 1 -
src/mesa/drivers/dri/radeon/radeon_screen.c | 4 +---
4 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/src/gallium/state_trackers/dri/drm/dri2.c
b/src/gallium/state_trackers/dri/drm/dri2.c
index 2194856..637d000 100644
--- a/src/gallium/state_trackers/dri/drm/dri2.c
+++ b/src/gallium/state_trackers/dri/drm/dri2.c
@@ -612,7 +612,6 @@ static struct __DRIimageExtensionRec dri2ImageExtension = {
*/
static const __DRIextension *dri_screen_extensions[] = {
- &driSwapControlExtension.base,
&driMediaStreamCounterExtension.base,
&driTexBufferExtension.base,
&dri2FlushExtension.base,
@@ -622,7 +621,6 @@ static const __DRIextension *dri_screen_extensions[] = {
};
static const __DRIextension *dri_screen_extensions_throttle[] = {
- &driSwapControlExtension.base,
&driMediaStreamCounterExtension.base,
&driTexBufferExtension.base,
&dri2FlushExtension.base,
diff --git a/src/mesa/drivers/dri/common/dri_util.c
b/src/mesa/drivers/dri/common/dri_util.c
index 6e7c1ed..5d9b251 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -360,23 +360,6 @@ const __DRImediaStreamCounterExtension
driMediaStreamCounterExtension = {
};
-static void driSetSwapInterval(__DRIdrawable *dPriv, unsigned int interval)
-{
- dPriv->swap_interval = interval;
-}
-
-static unsigned int driGetSwapInterval(__DRIdrawable *dPriv)
-{
- return dPriv->swap_interval;
-}
-
-const __DRIswapControlExtension driSwapControlExtension = {
- { __DRI_SWAP_CONTROL, __DRI_SWAP_CONTROL_VERSION },
- driSetSwapInterval,
- driGetSwapInterval
-};
-
-
/**
* This is called via __DRIscreenRec's createNewDrawable pointer.
*/
diff --git a/src/mesa/drivers/dri/common/dri_util.h
b/src/mesa/drivers/dri/common/dri_util.h
index 292cbef..c1e6712 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -65,7 +65,6 @@ typedef struct __DRIswapInfoRec __DRIswapInfo;
*/
extern const __DRIcoreExtension driCoreExtension;
extern const __DRIdri2Extension driDRI2Extension;
-extern const __DRIswapControlExtension driSwapControlExtension;
extern const __DRImediaStreamCounterExtension driMediaStreamCounterExtension;
extern const __DRI2configQueryExtension dri2ConfigQueryExtension;
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c
b/src/mesa/drivers/dri/radeon/radeon_screen.c
index fd0aea7..23ec8ec 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1271,10 +1271,8 @@ radeonCreateScreen2(__DRIscreen *sPriv)
i = 0;
screen->extensions[i++] = &dri2ConfigQueryExtension.base;
- if ( screen->irq != 0 ) {
- screen->extensions[i++] = &driSwapControlExtension.base;
+ if ( screen->irq != 0 )
screen->extensions[i++] = &driMediaStreamCounterExtension.base;
- }
#if defined(RADEON_R100)
screen->extensions[i++] = &radeonTexBufferExtension.base;
--
1.7.7
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
