From 5d151c0ffc60627b1d54ae397a83ef1770491d1b Mon Sep 17 00:00:00 2001 From: Roderick Colenbrander Date: Fri, 21 Mar 2008 21:11:12 +0000 Subject: [PATCH] wined3d: Don't continue with CheckDeviceFormat when the texture format isn't around. It is legal to pass Usage=0 to CheckDeviceFormat and in both this case and in the case a format isn't available UsageCaps would be 0 and a format would be reported available. --- dlls/wined3d/directx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 103e8f14a99..1c7d9e397b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2311,6 +2311,9 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + } else { + TRACE_(d3d_caps)("[FAILED] - Cube texture format not supported\n"); + return WINED3DERR_NOTAVAILABLE; } } else { TRACE_(d3d_caps)("[FAILED] - No cube texture support\n"); @@ -2423,6 +2426,9 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + } else { + TRACE_(d3d_caps)("[FAILED] - Texture format not supported\n"); + return WINED3DERR_NOTAVAILABLE; } } else if((RType == WINED3DRTYPE_VOLUME) || (RType == WINED3DRTYPE_VOLUMETEXTURE)) { /* Volume is to VolumeTexture what Surface is to Texture but its usage caps are not documented. -- 2.11.4.GIT