Henri Verbeet : ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces.
Alexandre Julliard
julliard at winehq.org
Wed Sep 26 14:22:32 CDT 2018
Module: wine
Branch: master
Commit: 8ac639d25c8cb7beb0cd66c9c08dd6b41c9e5dcc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac639d25c8cb7beb0cd66c9c08dd6b41c9e5dcc
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Sep 26 01:02:38 2018 +0330
ddraw: Do not request 3D-usages for DDRAW_NO3D surfaces.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 c51db76..fc120e3 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))
{
More information about the wine-cvs
mailing list