summaryrefslogtreecommitdiff
path: root/GL/glx/glxscreens.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-10-14 15:39:21 -0400
committerKristian Høgsberg <krh@redhat.com>2007-10-18 21:03:43 -0400
commit7d74690536b64f7b8e8036507ab7790807349c50 (patch)
tree97c299732f4e7f3bad10142f241b2f085437787d /GL/glx/glxscreens.c
parentab4bce02a9457dd9c86b774fc74caf3dd6b287ca (diff)
Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the DDX generated GLX visuals and the DRI driver generated fbconfigs, we now just take the fbconfigs returned by the DRI driver to be our supported set.
Diffstat (limited to 'GL/glx/glxscreens.c')
-rw-r--r--GL/glx/glxscreens.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index c6f060b3d..3d69645f8 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -281,6 +281,13 @@ glxGetScreen(ScreenPtr pScreen)
return (__GLXscreen *) pScreen->devPrivates[glxScreenPrivateIndex].ptr;
}
+void GlxSetVisualConfigs(int nconfigs,
+ __GLXvisualConfig *configs, void **privates)
+{
+ /* We keep this stub around for the DDX drivers that still
+ * call it. */
+}
+
void __glXScreenInit(__GLXscreen *glxScreen, ScreenPtr pScreen)
{
static int glxGeneration;
@@ -306,8 +313,6 @@ void __glXScreenInit(__GLXscreen *glxScreen, ScreenPtr pScreen)
glxScreen->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = glxCloseScreen;
- __glXScreenInitVisuals(glxScreen);
-
pScreen->devPrivates[glxScreenPrivateIndex].ptr = (pointer) glxScreen;
}