Commit 7fd87f10 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard

wined3d: There is no need for the !Usage checks at the start of the resource type checks.

The return-path of the code will handle this properly and this also ensures that the R8G8B8 dxVersion test is reached.
parent 6677e153
......@@ -2235,10 +2235,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) {
/* Check if the texture format is around */
if(CheckTextureCapability(Adapter, CheckFormat)) {
/* No usage checks were requested, so return because we know that the format is supported */
if(!Usage)
return WINED3D_OK;
if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) {
/* Check for automatic mipmap generation support */
if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
......@@ -2327,10 +2323,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
/* Check if the texture format is around */
if(CheckTextureCapability(Adapter, CheckFormat)) {
/* No usage checks were requested, so return because we know that the format is supported */
if(!Usage)
return WINED3D_OK;
if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) {
/* Check for automatic mipmap generation support */
if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
......
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