From 6c5b58a44adcb52fba92058be7f09df1b77743cc Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 11 Sep 2007 13:09:14 -0700 Subject: [PATCH] winex11: Simplify ConvertPixelFormatWGLtoGLX. --- dlls/winex11.drv/opengl.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index be215ae530f..6fffb800fa7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -894,22 +894,18 @@ static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixe /* Check if the pixelformat is valid. Note that it is legal to pass an invalid * iPixelFormat in case of probing the number of pixelformats. */ - if((iPixelFormat <= 0) || (iPixelFormat > WineGLPixelFormatListSize)) { - if(AllowOffscreen) - *fmt_count = WineGLPixelFormatListSize; - else - *fmt_count = 1; /* Only show the format of our main visual */ - } - else if(iPixelFormat == 1) { - res = &WineGLPixelFormatList[0]; - *fmt_count = 1; /* Only show the format of our main visual */ - } - else if((WineGLPixelFormatList[iPixelFormat-1].offscreenOnly == TRUE) && AllowOffscreen) { + if((iPixelFormat > 0) && (iPixelFormat <= WineGLPixelFormatListSize) && + ((WineGLPixelFormatList[iPixelFormat-1].offscreenOnly == FALSE) || + AllowOffscreen)) { res = &WineGLPixelFormatList[iPixelFormat-1]; - *fmt_count = WineGLPixelFormatListSize; TRACE("Returning FBConfig=%p for iPixelFormat=%d\n", res->fbconfig, iPixelFormat); } + if(AllowOffscreen) + *fmt_count = WineGLPixelFormatListSize; + else + *fmt_count = 1; + TRACE("Number of returned pixelformats=%d\n", *fmt_count); return res;