mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 01:07:17 +00:00
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.
This commit is contained in:
parent
e04e10b37b
commit
379f592cca
|
@ -6189,15 +6189,12 @@ static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!(ddraw->flags & DDRAW_NO3D))
|
if (caps & DDSCAPS_TEXTURE)
|
||||||
{
|
wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
|
||||||
if (caps & DDSCAPS_TEXTURE)
|
if (caps & DDSCAPS_ZBUFFER)
|
||||||
wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
|
wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
|
||||||
if (caps & DDSCAPS_ZBUFFER)
|
else if (caps & DDSCAPS_3DDEVICE)
|
||||||
wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
|
wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET;
|
||||||
else if (caps & DDSCAPS_3DDEVICE)
|
|
||||||
wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
|
if (caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue