diff options
| author | Dodji Seketeli <dodji@openedhand.com> | 2007-09-18 18:22:44 +0200 |
|---|---|---|
| committer | Dodji Seketeli <dodji@openedhand.com> | 2007-10-02 16:55:17 +0200 |
| commit | 6307ee77091041af2d34e93bc164352d4438a808 (patch) | |
| tree | 8555c6f88fb39c3842dabd81c8c1fc71eeb5b31a /GL | |
| parent | ffe9ce6a843443606ad9367eca1645bf5e0635e5 (diff) | |
GLX: allow skipping of visual init wrapping
* GL/glx/glxvisuals.c: added boolean to disable
calling init_visuals(). This gives a chance to Xephyr
to take over visuals manipulation and avoid a crash at
server shutdown in __glXMesaScreenDestroy(), due to the fact
that mesa might sees more visual than what it has actually created in
init_visuals(). It might see more visuals because Xephyr can augment
the number of visuals, dynamically.
* os/utils.c: the boolean is actually defined here.
Diffstat (limited to 'GL')
| -rw-r--r-- | GL/glx/glxvisuals.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/GL/glx/glxvisuals.c b/GL/glx/glxvisuals.c index 0e9bdedec..46b380b3d 100644 --- a/GL/glx/glxvisuals.c +++ b/GL/glx/glxvisuals.c @@ -55,6 +55,7 @@ void GlxWrapInitVisuals(miInitVisualsProcPtr *); +extern Bool noGlxVisualInit; #include "glcontextmodes.h" struct ScreenVisualsRec { @@ -452,14 +453,15 @@ Bool GlxInitVisuals(VisualPtr *visualp, DepthPtr *depthp, /* * Setup the visuals supported by this particular screen. */ - init_visuals(nvisualp, visualp, defaultVisp, - *ndepthp, *depthp, *rootDepthp); + if (!noGlxVisualInit) { + init_visuals(nvisualp, visualp, defaultVisp, + *ndepthp, *depthp, *rootDepthp); + } return True; } - /************************************************************************/ |