fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 10:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix support for ARGB visuals

Browse source
This commit is contained in:
David Reveman 2006-02-02 03:47:15 +00:00
parent 36fd24741d
commit b0466438a9
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2006-02-01 David Reveman <davidr@novell.com>
* GL/mesa/X/xf86glx.c (init_screen_visuals): Pass the correct visual
to XMesaCreateVisual.
Allow ARGB visuals when building with COMPOSITE.
* fb/fbcompose.c (fbCompositeRect): Add a chunk of code that somehow
got lost when moving code from the xserver tree.
(fbCompositeRect):

24
GL/mesa/X/xf86glx.c
View file

@ -498,6 +498,12 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
? (modes->redBits + modes->greenBits +
modes->blueBits + modes->alphaBits)
: rootDepth;
#ifdef COMPOSITE
if (pVisual[i].nplanes == 32)
modes->visualRating = GLX_NON_CONFORMANT_CONFIG;
#endif
}
/* Save the device-dependent private for this visual */
@ -596,7 +602,13 @@ static void fixup_visuals(int screen)
/* Find a visual that matches the GLX visual's class and size */
for (j = 0; j < pScreen->numVisuals; j++) {
if (pVis[j].class == vis_class &&
pVis[j].nplanes == nplanes) {
(pVis[j].nplanes == nplanes
#ifdef COMPOSITE
|| (pVis[j].nplanes == 32 && pVis[j].nplanes == modes->rgbBits)
#endif
)) {
/* Fixup the masks */
modes->redMask = pVis[j].redMask;
@ -645,7 +657,13 @@ static void init_screen_visuals(int screen)
for (j = 0; j < pScreen->numVisuals; j++) {
if (pVis[j].class == vis_class &&
pVis[j].nplanes == nplanes &&
(pVis[j].nplanes == nplanes
#ifdef COMPOSITE
|| (pVis[j].nplanes == 32 && pVis[j].nplanes == modes->rgbBits)
#endif
) &&
pVis[j].redMask == modes->redMask &&
pVis[j].greenMask == modes->greenMask &&
pVis[j].blueMask == modes->blueMask &&
@ -654,7 +672,7 @@ static void init_screen_visuals(int screen)
/* Create the XMesa visual */
pXMesaVisual[i] =
XMesaCreateVisual(pScreen,
pVis,
&pVis[j],
modes->rgbMode,
(modes->alphaBits > 0),
modes->doubleBufferMode,