ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Simplify pixel format selection. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-02-10 12:26:58 +01:00 committed by Alexandre Julliard
parent 2f6dd58099
commit e30a5ce8f0
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/wined3d/context.c
View File

@ -1432,16 +1432,17 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state)
/* This function takes care of wined3d pixel format selection. */ /* This function takes care of wined3d pixel format selection. */
static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc, static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc,
const struct wined3d_format *color_format, const struct wined3d_format *ds_format, const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
BOOL auxBuffers, BOOL findCompatible) BOOL auxBuffers)
{ {
int iPixelFormat=0;
unsigned int current_value;
unsigned int cfg_count = device->adapter->cfg_count; unsigned int cfg_count = device->adapter->cfg_count;
unsigned int current_value;
PIXELFORMATDESCRIPTOR pfd;
int iPixelFormat = 0;
unsigned int i; unsigned int i;
TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n", TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n",
device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id),
auxBuffers, findCompatible); auxBuffers);
current_value = 0; current_value = 0;
for (i = 0; i < cfg_count; ++i) for (i = 0; i < cfg_count; ++i)
@ -1496,16 +1497,11 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
} }
} }
/* When findCompatible is set and no suitable format was found, let ChoosePixelFormat choose a pixel format in order not to crash. */ if (!iPixelFormat)
if(!iPixelFormat && !findCompatible) { {
ERR("Can't find a suitable iPixelFormat\n"); ERR("Trying to locate a compatible pixel format because an exact match failed.\n");
return FALSE;
} else if(!iPixelFormat) {
PIXELFORMATDESCRIPTOR pfd;
TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n"); memset(&pfd, 0, sizeof(pfd));
/* PixelFormat selection */
ZeroMemory(&pfd, sizeof(pfd));
pfd.nSize = sizeof(pfd); pfd.nSize = sizeof(pfd);
pfd.nVersion = 1; pfd.nVersion = 1;
pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/
@ -1517,15 +1513,15 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
pfd.cStencilBits = ds_format->stencil_size; pfd.cStencilBits = ds_format->stencil_size;
pfd.iLayerType = PFD_MAIN_PLANE; pfd.iLayerType = PFD_MAIN_PLANE;
iPixelFormat = ChoosePixelFormat(hdc, &pfd); if (!(iPixelFormat = ChoosePixelFormat(hdc, &pfd)))
if(!iPixelFormat) { {
/* If this happens something is very wrong as ChoosePixelFormat barely fails */ /* Something is very wrong as ChoosePixelFormat() barely fails. */
ERR("Can't find a suitable iPixelFormat\n"); ERR("Can't find a suitable pixel format.\n");
return FALSE; return 0;
} }
} }
TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s\n", TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s.\n",
iPixelFormat, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id)); iPixelFormat, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id));
return iPixelFormat; return iPixelFormat;
} }
@ -1780,21 +1776,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
} }
/* Try to find a pixel format which matches our requirements. */ /* Try to find a pixel format which matches our requirements. */
pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, FALSE); if (!(pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers)))
/* Try to locate a compatible format if we weren't able to find anything. */
if (!pixel_format)
{
TRACE("Trying to locate a compatible pixel format because an exact match failed.\n");
pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, TRUE);
}
/* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */
if (!pixel_format)
{
ERR("Can't find a suitable pixel format.\n");
goto out; goto out;
}
ret->gl_info = gl_info; ret->gl_info = gl_info;