summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2011-10-28 14:55:25 -0400
committerKristian Høgsberg <[email protected]>2011-11-02 11:15:56 -0400
commitad3221587164c10ae16d85db514484b717cabc6f (patch)
tree525ec68385115ed2981ebe200e60fbfbb4017a5c
parent32039126007a67a6bcca5973a7406c41ccc8c543 (diff)
dri: Drop driReadDrawableExtension
All DRI2 drivers support setting a separate read drawable.
-rw-r--r--src/gallium/state_trackers/dri/drm/dri2.c2
-rw-r--r--src/mesa/drivers/dri/common/dri_util.c8
-rw-r--r--src/mesa/drivers/dri/common/dri_util.h1
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c1
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_screen.c1
5 files changed, 0 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c
index f6231cf9ba0..a5b51da9e10 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[] = {
- &driReadDrawableExtension,
&driCopySubBufferExtension.base,
&driSwapControlExtension.base,
&driMediaStreamCounterExtension.base,
@@ -632,7 +631,6 @@ static const __DRIextension *dri_screen_extensions[] = {
};
static const __DRIextension *dri_screen_extensions_throttle[] = {
- &driReadDrawableExtension,
&driCopySubBufferExtension.base,
&driSwapControlExtension.base,
&driMediaStreamCounterExtension.base,
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index ffaa9f92bb6..90eba676542 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -50,14 +50,6 @@ typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRIdrawable *drawable, int32_t
static void dri_get_drawable(__DRIdrawable *pdp);
static void dri_put_drawable(__DRIdrawable *pdp);
-/**
- * This is just a token extension used to signal that the driver
- * supports setting a read drawable.
- */
-const __DRIextension driReadDrawableExtension = {
- __DRI_READ_DRAWABLE, __DRI_READ_DRAWABLE_VERSION
-};
-
GLint
driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 )
{
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index 0f6a061cb22..2db8c97102c 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 __DRIextension driReadDrawableExtension;
extern const __DRIcopySubBufferExtension driCopySubBufferExtension;
extern const __DRIswapControlExtension driSwapControlExtension;
extern const __DRImediaStreamCounterExtension driMediaStreamCounterExtension;
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 6a6b851c36e..4ee70f9b3f7 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -326,7 +326,6 @@ static struct __DRIimageExtensionRec intelImageExtension = {
};
static const __DRIextension *intelScreenExtensions[] = {
- &driReadDrawableExtension,
&intelTexBufferExtension.base,
&intelFlushExtension.base,
&intelImageExtension.base,
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index be47bab8908..0fc30041c22 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1098,7 +1098,6 @@ radeonCreateScreen2(__DRIscreen *sPriv)
i = 0;
screen->extensions[i++] = &driCopySubBufferExtension.base;
- screen->extensions[i++] = &driReadDrawableExtension;
screen->extensions[i++] = &dri2ConfigQueryExtension.base;
if ( screen->irq != 0 ) {