summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-10-28 15:01:20 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-11-02 11:15:57 -0400
commit759cbb751b29b1c6608593841c56e0ad08eb33b0 (patch)
treebe008d464ec9dcf5d34f6c9185eb214d5346e0ef
parent8e898e83c6934fc9c62730ad82fbf6f9d9180577 (diff)
dri: Remove driSwapControlExtension
DRI1-only as well.
-rw-r--r--src/gallium/state_trackers/dri/drm/dri2.c2
-rw-r--r--src/mesa/drivers/dri/common/dri_util.c17
-rw-r--r--src/mesa/drivers/dri/common/dri_util.h1
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_screen.c4
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 a7f08e1e859..a7bc00da46b 100644
--- a/src/gallium/state_trackers/dri/drm/dri2.c
+++ b/src/gallium/state_trackers/dri/drm/dri2.c
@@ -620,7 +620,6 @@ static struct __DRIimageExtensionRec dri2ImageExtension = {
*/
static const __DRIextension *dri_screen_extensions[] = {
- &driSwapControlExtension.base,
&driMediaStreamCounterExtension.base,
&driTexBufferExtension.base,
&dri2FlushExtension.base,
@@ -630,7 +629,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 6e7c1eda3ca..5d9b2515015 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 292cbef9969..c1e6712feef 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 fdaf30e9c0d..595bcaf5564 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1099,10 +1099,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;