diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-08 13:00:15 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-02-17 19:00:41 -0800 |
| commit | 516f8e2cad1311a09764e2633644188d1e3c31bb (patch) | |
| tree | c771bde3009eed8f56e66f50f905024cc8e64faf /hw | |
| parent | 8b967b24690cb072fc37c463eceb2b886cef80c4 (diff) | |
glx: Replace broken GLX visual setup with a fixed "all" mode.
With trying to match depths so that you didn't end up with a depth 24
fbconfig for the 32-bit composite visual, I broke the alpha bits on the depth
24 X visual, which angered other applications. But in fixing that, the
pickFBconfigs code for "minimal" also could end up breaking GLX visuals if
the same FBconfig was chosen for more than one X visual.
We have no reason to not expose as many visuals as possible, but the old
"all" mode didn't match any existing X visuals to GLX visuals, so normal
GL apps didn't work at all.
Instead, replace it with a simple combination of the two modes: Create GLX
visuals by picking unique FBconfigs with as many features as possible for
each X visual in order. Then, for all remaining FBconfigs that are
appropriate for display, add a corresponding X and GLX visual.
This gets all applications (even ones that aren't smart enough to do FBconfigs)
get all the options to get the visual configuration they want. The only
potential downside is that the composite ARGB visual is unique and gets a
nearly full-featured GLX visual (except that the root visual might have taken
the tastiest FBconfig), which means that a dumb compositing manager could
waste resources. Write compositing managers using FBconfigs instead, please.
(cherry picked from commit c40bad88475debf7a1774e22dce835577ad32154)
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/dixmods/glxmodule.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index f6fda4b07..62a047e26 100644 --- a/hw/xfree86/dixmods/glxmodule.c +++ b/hw/xfree86/dixmods/glxmodule.c @@ -101,21 +101,6 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin) GlxPushProvider(provider); } - switch (xf86Info.glxVisuals) { - case XF86_GlxVisualsMinimal: - GlxSetVisualConfig(GLX_MINIMAL_VISUALS); - xf86Msg(xf86Info.aiglxFrom, "Exporting only minimal set of GLX visuals\n"); - break; - case XF86_GlxVisualsTypical: - GlxSetVisualConfig(GLX_TYPICAL_VISUALS); - xf86Msg(xf86Info.aiglxFrom, "Exporting typical set of GLX visuals\n"); - break; - case XF86_GlxVisualsAll: - GlxSetVisualConfig(GLX_ALL_VISUALS); - xf86Msg(xf86Info.aiglxFrom, "Exporting all GLX visuals\n"); - break; - } - LoadExtension(&GLXExt, FALSE); return module; |