opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat().

Patch by Matteo Bruni. Signed-off-by: Paul Gofman <pgofman@codeweavers.com>

opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat().
cc8d8b5e · Paul Gofman · Alexandre Julliard · 28ba7e41 · cc8d8b5e
Commit cc8d8b5e authored May 25, 2022 by Paul Gofman Committed by Alexandre Julliard Jun 22, 2022
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

wgl.c dlls/opengl32/wgl.c +10 -10

No files found.
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -564,27 +564,27 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd)
                continue;
            }
        }
-        if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE))
+        if (ppfd->cStencilBits)
        {
-            if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) ||
-                ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits)))
+            if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) ||
+                ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits)))
                goto found;

-            if (best.cDepthBits != format.cDepthBits)
+            if (best.cStencilBits != format.cStencilBits)
            {
-                TRACE( "depth mismatch for iPixelFormat=%d\n", i );
+                TRACE( "stencil mismatch for iPixelFormat=%d\n", i );
                continue;
            }
        }
-        if (ppfd->cStencilBits)
+        if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE))
        {
-            if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) ||
-                ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits)))
+            if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) ||
+                ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits)))
                goto found;

-            if (best.cStencilBits != format.cStencilBits)
+            if (best.cDepthBits != format.cDepthBits)
            {
-                TRACE( "stencil mismatch for iPixelFormat=%d\n", i );
+                TRACE( "depth mismatch for iPixelFormat=%d\n", i );
                continue;
            }
        }