summaryrefslogtreecommitdiffstats
path: root/src/glx/x11/glxext.c
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2007-05-17 15:47:47 -0400
committerKristian Høgsberg <[email protected]>2007-10-11 11:26:47 -0400
commit3eaec7dc5d9b859cd394288ba73ae7e692f26a50 (patch)
tree50d9f75f42ceb722961d2e9ef6e7b956178fb93e /src/glx/x11/glxext.c
parent594006d8b2960b9e49b57c02682289ae900ffc71 (diff)
Move enabling of DRI extensions into glxextensions.c
Diffstat (limited to 'src/glx/x11/glxext.c')
-rw-r--r--src/glx/x11/glxext.c69
1 files changed, 1 insertions, 68 deletions
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 580faec0d00..7b25ad717a3 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -997,73 +997,6 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
return psp;
}
-static void queryExtensions(__GLXscreenConfigs *psc)
-{
- const __DRIextension **extensions;
- int i;
-
- extensions = psc->driScreen.getExtensions(&psc->driScreen);
- for (i = 0; extensions[i]; i++) {
-#ifdef __DRI_COPY_SUB_BUFFER
- if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
- psc->copySubBuffer = (__DRIcopySubBufferExtension *) extensions[i];
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_MESA_copy_sub_buffer");
- }
-#endif
-
-#ifdef __DRI_SWAP_CONTROL
- if (strcmp(extensions[i]->name, __DRI_SWAP_CONTROL) == 0) {
- psc->swapControl = (__DRIswapControlExtension *) extensions[i];
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_SGI_swap_control");
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_MESA_swap_control");
- }
-#endif
-
-#ifdef __DRI_ALLOCATE
- if (strcmp(extensions[i]->name, __DRI_ALLOCATE) == 0) {
- psc->allocate = (__DRIallocateExtension *) extensions[i];
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_SGI_swap_control");
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_MESA_swap_control");
- }
-#endif
-
-#ifdef __DRI_FRAME_TRACKING
- if (strcmp(extensions[i]->name, __DRI_FRAME_TRACKING) == 0) {
- psc->frameTracking = (__DRIframeTrackingExtension *) extensions[i];
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_MESA_swap_frame_usage");
- }
-#endif
-
-#ifdef __DRI_MEDIA_STREAM_COUNTER
- if (strcmp(extensions[i]->name, __DRI_MEDIA_STREAM_COUNTER) == 0) {
- psc->msc = (__DRImediaStreamCounterExtension *) extensions[i];
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_SGI_video_sync");
- }
-#endif
-
-#ifdef __DRI_SWAP_BUFFER_COUNTER
- /* No driver supports this at this time and the extension is
- * not defined in dri_interface.h. Will enable
- * GLX_OML_sync_control if implemented. */
-#endif
-
-#ifdef __DRI_READ_DRAWABLE
- if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) {
- __glXScrEnableExtension(&psc->driScreen,
- "GLX_SGI_make_current_read");
- }
-#endif
- /* Ignore unknown extensions */
- }
-}
-
#endif /* GLX_DIRECT_RENDERING */
@@ -1259,7 +1192,7 @@ static Bool AllocAndFetchScreenConfigs(Display *dpy, __GLXdisplayPrivate *priv)
& priv->driDisplay,
priv->driDisplay.createNewScreen[i] );
if (psc->driScreen.private != NULL)
- queryExtensions(psc);
+ __glXScrEnableDRIExtension(psc);
}
}
#endif