Module: wine Branch: master Commit: 379f592cca297649e653d399d636e3422f0c08c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/379f592cca297649e653d399d636e34...
Author: Zebediah Figura zfigura@codeweavers.com Date: Thu Oct 5 17:09:46 2023 -0500
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.
---
dlls/ddraw/surface.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 33f38949c15..d242d460a1d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -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)) {