Skip to content

Win32 driver enhancements #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maraakate wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Win32 driver enhancements #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 36 additions & 3 deletions drivers/glide/wgl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ PIXELFORMATDESCRIPTOR pfd[] = {
1, /* version number */
PFD_DRAW_TO_WINDOW | /* support window */
PFD_SUPPORT_OPENGL | /* support OpenGL */
PFD_SWAP_COPY |
PFD_DOUBLEBUFFER, /* double buffered */
PFD_TYPE_RGBA, /* RGBA type */
16, /* color depth */
Expand All @@ -51,11 +52,33 @@ PIXELFORMATDESCRIPTOR pfd[] = {
0, /* reserved */
0, 0, 0 /* layer masks ignored */
},
{
{
sizeof(PIXELFORMATDESCRIPTOR), /* size of this pfd */
1, /* version number */
PFD_DRAW_TO_WINDOW | /* support window */
PFD_SUPPORT_OPENGL | /* support OpenGL */
PFD_SWAP_COPY |
PFD_DOUBLEBUFFER, /* double buffered */
PFD_TYPE_RGBA, /* RGBA type */
24, /* color depth */
8, 0, 8, 8, 8, 16, /* color bits */
8, /* alpha buffer */
24, /* shift bit */
0, /* no accumulation buffer */
0, 0, 0, 0, /* accum bits ignored */
24, /* z-buffer */
8, /* stencil buffer */
0, /* no auxiliary buffer */
PFD_MAIN_PLANE, /* main layer */
0, /* reserved */
0, 0, 0 /* layer masks ignored */
},
{
sizeof(PIXELFORMATDESCRIPTOR), /* size of this pfd */
1, /* version number */
PFD_DRAW_TO_WINDOW | /* support window */
PFD_SUPPORT_OPENGL | /* support OpenGL */
PFD_SWAP_COPY |
PFD_DOUBLEBUFFER, /* double buffered */
PFD_TYPE_RGBA, /* RGBA type */
32, /* color depth */
Expand Down Expand Up @@ -166,10 +189,15 @@ wglChoosePixelFormat (HDC hdc, CONST PIXELFORMATDESCRIPTOR *ppfd)
{
int i, numPixelFormats, bestIndex = -1;
const PIXELFORMATDESCRIPTOR *ppfdBest = NULL;
DEVMODE dm;

/* FS: Choose the best PFD based on our display BPP. */
memset(&dm, 0, sizeof(DEVMODE));
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);

WINLOG((eff, "%s:\n", __FUNCTION__));

if (ppfd->dwFlags != (ppfd->dwFlags &
if (ppfd->dwFlags != (ppfd->dwFlags &
(
PFD_DRAW_TO_WINDOW |
PFD_DRAW_TO_BITMAP |
Expand Down Expand Up @@ -263,14 +291,19 @@ wglChoosePixelFormat (HDC hdc, CONST PIXELFORMATDESCRIPTOR *ppfd)
continue;
}

if (ppfd->cStencilBits && !ppfdCandidate->cStencilBits) {
if (ppfd->cStencilBits && !ppfdCandidate->cStencilBits && (dm.dmBitsPerPel == 32)) { /* FS: Stencil buffer only available on 32bpp */
if (!YES("wgl.ignore.stencilbuffer")) continue;
}

if (ppfd->cAuxBuffers && !ppfdCandidate->cAuxBuffers) {
continue;
}

/* FS: Choose the best PFD based on our display BPP. */
if ((dm.dmBitsPerPel > 0) && (ppfdCandidate->cColorBits != dm.dmBitsPerPel)) {
continue;
}

/*
** See if candidate is better than the previous best choice
*/
Expand Down