Commit 4428cc32 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard

wined3d: Fix a few small bugs in WineD3D_ChoosePixelFormat.

parent 80c1508b
...@@ -133,6 +133,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF ...@@ -133,6 +133,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF
/* Find a pixel format which EXACTLY matches our requirements (except for depth) */ /* Find a pixel format which EXACTLY matches our requirements (except for depth) */
for(i=0; i<nCfgs; i++) { for(i=0; i<nCfgs; i++) {
BOOL exactDepthMatch = TRUE; BOOL exactDepthMatch = TRUE;
cfgs = &This->adapter->cfgs[i];
/* For now only accept RGBA formats. Perhaps some day we will /* For now only accept RGBA formats. Perhaps some day we will
* allow floating point formats for pbuffers. */ * allow floating point formats for pbuffers. */
...@@ -194,7 +195,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF ...@@ -194,7 +195,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF
if(!iPixelFormat && !findCompatible) { if(!iPixelFormat && !findCompatible) {
ERR("Can't find a suitable iPixelFormat\n"); ERR("Can't find a suitable iPixelFormat\n");
return FALSE; return FALSE;
} else { } else if(!iPixelFormat) {
PIXELFORMATDESCRIPTOR pfd; PIXELFORMATDESCRIPTOR pfd;
TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n"); TRACE("Falling back to ChoosePixelFormat as we weren't able to find an exactly matching pixel format\n");
...@@ -218,7 +219,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF ...@@ -218,7 +219,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF
} }
} }
TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s\n", cfgs->iPixelFormat, debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat)); TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s\n", iPixelFormat, debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat));
return iPixelFormat; return iPixelFormat;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment