Commit 1e9277bf authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

wined3d: Always check if format has depth/stencil flags in wined3d_check_depth_stencil_format().

parent f30f8c81
...@@ -1434,6 +1434,8 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada ...@@ -1434,6 +1434,8 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada
{ {
if (!ds_format->depth_size && !ds_format->stencil_size) if (!ds_format->depth_size && !ds_format->stencil_size)
return FALSE; return FALSE;
if (!(ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)))
return FALSE;
/* Blacklist formats not supported on Windows */ /* Blacklist formats not supported on Windows */
if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */
...@@ -1443,13 +1445,7 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada ...@@ -1443,13 +1445,7 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada
return FALSE; return FALSE;
} }
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER)
{
/* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */
if (ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))
return TRUE;
}
else
{ {
unsigned int i; unsigned int i;
...@@ -1460,9 +1456,11 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada ...@@ -1460,9 +1456,11 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada
&& wined3d_check_pixel_format_depth(cfg, ds_format)) && wined3d_check_pixel_format_depth(cfg, ds_format))
return TRUE; return TRUE;
} }
return FALSE;
} }
return FALSE; return TRUE;
} }
/* Check the render target capabilities of a format */ /* Check the render target capabilities of a format */
......
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