summaryrefslogtreecommitdiff
path: root/hw/xnest/Screen.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 /hw/xnest/Screen.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 'hw/xnest/Screen.c')
-rw-r--r--hw/xnest/Screen.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 86f856e35..02e82d193 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -45,10 +45,6 @@ is" without express or implied warranty.
Window xnestDefaultWindows[MAXSCREENS];
Window xnestScreenSaverWindows[MAXSCREENS];
-#ifdef GLXEXT
-extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
-#endif
-
static int xnestScreenGeneration = -1;
ScreenPtr
@@ -230,17 +226,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
defaultVisual = visuals[xnestDefaultVisualIndex].vid;
rootDepth = visuals[xnestDefaultVisualIndex].nplanes;
-#ifdef GLXEXT
- {
- miInitVisualsProcPtr proc = NULL;
-
- GlxWrapInitVisuals(&proc);
- /* GlxInitVisuals ignores the last three arguments. */
- proc(&visuals, &depths, &numVisuals, &numDepths,
- &rootDepth, &defaultVisual, 0, 0, 0);
- }
-#endif
-
if (xnestParentWindow != 0) {
XGetWindowAttributes(xnestDisplay, xnestParentWindow, &gattributes);
xnestWidth = gattributes.width;