Skip to content

W
wine-cw
Commit 379f592c authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

ddraw: Do not check for DDRAW_NO3D in wined3d_resource_desc_from_ddraw().

NO3D implies SYSTEMMEMORY, and is incompatible with TEXTUREMANAGE, so this case is unreachable.
parent e04e10b3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
dlls/ddraw/surface.c
View file @ 379f592c
......@@ -6189,15 +6189,12 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw,
}
else
{
if (!(ddraw->flags & DDRAW_NO3D))
{
if (caps & DDSCAPS_TEXTURE)
wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
if (caps & DDSCAPS_ZBUFFER)
wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
else if (caps & DDSCAPS_3DDEVICE)
wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET;
}
if (caps & DDSCAPS_TEXTURE)
wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
if (caps & DDSCAPS_ZBUFFER)
wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
else if (caps & DDSCAPS_3DDEVICE)
wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET;
if (caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
{
......
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