andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin/glx: Fallback to ChoosePixelFormat() if wglChoosePixelFormatARB() fails

Browse Source 
In glxWinSetPixelFormat() handle the case where wglChoosePixelFormatARB()
fails and fallback to ChoosePixelFormat()

It seems for some drivers, wglChoosePixelFormatARB() can fail when the
provided DC doesn't belong to the driver (e.g. it's a compatible DC for a
bitmap, so allow a fallback to ChoosePixelFormat() if it fails.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon Turney 2014-07-24 12:26:22 +01:00
parent 8c0adf404a
commit ad6b4113cd
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/xwin/glx/indirect.c
View File

@ -1133,7 +1133,30 @@ glxWinSetPixelFormat(HDC hdc, int bppOverride, int drawableTypeOverride,
(config->redBits + config->greenBits + config->blueBits), bppOverride,
config->drawableType, drawableTypeOverride);
if (!winScreen->has_WGL_ARB_pixel_format) {
if (winScreen->has_WGL_ARB_pixel_format) {
int pixelFormat =
fbConfigToPixelFormatIndex(hdc, config,
drawableTypeOverride, winScreen);
if (pixelFormat != 0) {
GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d",
pixelFormat);
ErrorF
("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n",
pixelFormat, winConfig->pixelFormatIndex);
if (!SetPixelFormat(hdc, pixelFormat, NULL)) {
ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
return FALSE;
}
}
}
/*
For some drivers, wglChoosePixelFormatARB() can fail when the provided
DC doesn't belong to the driver (e.g. it's a compatible DC for a bitmap,
so allow fallback to ChoosePixelFormat()
*/
{
PIXELFORMATDESCRIPTOR pfd;
int pixelFormat;
@ -1169,25 +1192,6 @@ glxWinSetPixelFormat(HDC hdc, int bppOverride, int drawableTypeOverride,
return FALSE;
}
}
else {
int pixelFormat = fbConfigToPixelFormatIndex(hdc, config,
drawableTypeOverride,
winScreen);
if (pixelFormat == 0) {
return FALSE;
}
GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d",
pixelFormat);
ErrorF
("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n",
pixelFormat, winConfig->pixelFormatIndex);
if (!SetPixelFormat(hdc, pixelFormat, NULL)) {
ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
return FALSE;
}
}
return TRUE;
}