[PATCH 5/5] ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces.
Henri Verbeet
hverbeet at codeweavers.com
Tue Sep 25 16:14:38 CDT 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/surface.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index c51db7661ab..fc120e390eb 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6152,12 +6152,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
}
else
{
- if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
- wined3d_desc.usage |= WINED3DUSAGE_TEXTURE;
- if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
- wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL;
- else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
- wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET;
+ if (!(ddraw->flags & DDRAW_NO3D))
+ {
+ if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
+ wined3d_desc.usage |= WINED3DUSAGE_TEXTURE;
+ if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
+ wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL;
+ else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
+ wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET;
+ }
if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
{
--
2.11.0
More information about the wine-devel
mailing list