x11drv: Fix one case of "glXChooseFBConfig returns NULL" problem.

Vitaliy Margolen wine-patch at kievinfo.com
Sat Mar 4 23:27:11 CST 2006


ChangeLog:
x11drv: Fix one case of "glXChooseFBConfig returns NULL" problem.
Using alpha bits > 8 makes this function fail, while it should not.

 dlls/x11drv/opengl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
-------------- next part --------------
11a954786c36808609df66cac5dfe8154cfa98d5
diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c
index a2a591e..799795a 100644
--- a/dlls/x11drv/opengl.c
+++ b/dlls/x11drv/opengl.c
@@ -226,7 +226,8 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV
       ADD2(GLX_ALPHA_SIZE, 8);
     } else {
       ADD2(GLX_BUFFER_SIZE, ppfd->cColorBits);
-      TEST_AND_ADD2(ppfd->cAlphaBits, GLX_ALPHA_SIZE, ppfd->cAlphaBits);
+      /* Some broken apps try to ask for more then 8 bits of alpha */
+      TEST_AND_ADD2(ppfd->cAlphaBits, GLX_ALPHA_SIZE, ppfd->cAlphaBits > 8 ? 8 : ppfd->cAlphaBits);
     }
   }
   TEST_AND_ADD2(ppfd->cStencilBits, GLX_STENCIL_SIZE, ppfd->cStencilBits);


More information about the wine-patches mailing list