diff options
author | Kristian Høgsberg <[email protected]> | 2011-10-28 15:02:42 -0400 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2011-11-02 11:15:57 -0400 |
commit | 73ec71cb16fbae0effcb4a92da7dc7f17cd6a62a (patch) | |
tree | f20552023adc060ec51cd0905bccd6d7b841eede /src/mesa/drivers/dri | |
parent | 759cbb751b29b1c6608593841c56e0ad08eb33b0 (diff) |
dri: Remove driMediaStreamCounterExtension
Also DRI1-only.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 39 | ||||
-rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 3 |
3 files changed, 0 insertions, 43 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 5d9b2515015..1118b191c2c 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -321,45 +321,6 @@ static void driSwapBuffers(__DRIdrawable *dPriv) free(rects); } -static int driDrawableGetMSC( __DRIscreen *sPriv, __DRIdrawable *dPriv, - int64_t *msc ) -{ - return sPriv->DriverAPI.GetDrawableMSC(sPriv, dPriv, msc); -} - - -static int driWaitForMSC(__DRIdrawable *dPriv, int64_t target_msc, - int64_t divisor, int64_t remainder, - int64_t * msc, int64_t * sbc) -{ - __DRIswapInfo sInfo; - int status; - - status = dPriv->driScreenPriv->DriverAPI.WaitForMSC( dPriv, target_msc, - divisor, remainder, - msc ); - - /* GetSwapInfo() may not be provided by the driver if GLX_SGI_video_sync - * is supported but GLX_OML_sync_control is not. Therefore, don't return - * an error value if GetSwapInfo() is not implemented. - */ - if ( status == 0 - && dPriv->driScreenPriv->DriverAPI.GetSwapInfo ) { - status = dPriv->driScreenPriv->DriverAPI.GetSwapInfo( dPriv, & sInfo ); - *sbc = sInfo.swap_count; - } - - return status; -} - - -const __DRImediaStreamCounterExtension driMediaStreamCounterExtension = { - { __DRI_MEDIA_STREAM_COUNTER, __DRI_MEDIA_STREAM_COUNTER_VERSION }, - driWaitForMSC, - driDrawableGetMSC, -}; - - /** * 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 c1e6712feef..2f33a622fc6 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 __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 595bcaf5564..e3766e81f3f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -1099,9 +1099,6 @@ radeonCreateScreen2(__DRIscreen *sPriv) i = 0; screen->extensions[i++] = &dri2ConfigQueryExtension.base; - if ( screen->irq != 0 ) - screen->extensions[i++] = &driMediaStreamCounterExtension.base; - #if defined(RADEON_R100) screen->extensions[i++] = &radeonTexBufferExtension.base; #endif |