[2/6] wined3d: Rearange code in CheckDeviceType.
Jan Zerebecki
jan.wine at zerebecki.de
Tue Nov 21 05:00:48 CST 2006
If this patch is rejected from inclusion, please tell me why, as
I would have to ask anyway.
From: Jan Zerebecki <jan.wine at zerebecki.de>
Changelog:
wined3d: Rearange code in CheckDeviceType.
---
dlls/wined3d/directx.c | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 6370602..bda867b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1566,6 +1566,11 @@ static HRESULT WINAPI IWineD3DImpl_Check
WINED3DFORMAT DisplayFormat, WINED3DFORMAT BackBufferFormat, BOOL Windowed) {
IWineD3DImpl *This = (IWineD3DImpl *)iface;
+ GLXFBConfig* cfgs = NULL;
+ int nCfgs = 0;
+ int it;
+ HRESULT hr = WINED3DERR_NOTAVAILABLE;
+
TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, CheckType:(%x,%s), DispFmt:(%x,%s), BackBuf:(%x,%s), Win?%d): stub\n",
This,
Adapter,
@@ -1579,29 +1584,24 @@ static HRESULT WINAPI IWineD3DImpl_Check
return WINED3DERR_INVALIDCALL;
}
- {
- GLXFBConfig* cfgs = NULL;
- int nCfgs = 0;
- int it;
- HRESULT hr = WINED3DERR_NOTAVAILABLE;
-
- WineD3D_Context* ctx = WineD3D_CreateFakeGLContext();
- if (NULL != ctx) {
- cfgs = glXGetFBConfigs(ctx->display, DefaultScreen(ctx->display), &nCfgs);
- for (it = 0; it < nCfgs; ++it) {
- if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx->display, cfgs[it], DisplayFormat)) {
- hr = WINED3D_OK;
- break ;
- }
- }
- XFree(cfgs);
-
- WineD3D_ReleaseFakeGLContext(ctx);
- return hr;
+ WineD3D_Context* ctx = WineD3D_CreateFakeGLContext();
+ if (NULL != ctx) {
+ cfgs = glXGetFBConfigs(ctx->display, DefaultScreen(ctx->display), &nCfgs);
+ for (it = 0; it < nCfgs; ++it) {
+ if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx->display, cfgs[it], DisplayFormat)) {
+ hr = WINED3D_OK;
+ TRACE_(d3d_caps)("OK\n");
+ break ;
+ }
}
+ XFree(cfgs);
+ WineD3D_ReleaseFakeGLContext(ctx);
}
- return WINED3DERR_NOTAVAILABLE;
+ if(hr != WINED3D_OK)
+ TRACE_(d3d_caps)("returning something different from WINED3D_OK\n");
+
+ return hr;
}
static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,
More information about the wine-patches
mailing list