Henri Verbeet : wined3d: Do not report WINEDDSCAPS_VIDEOMEMORY for WINED3D_NO3D adapters.
Alexandre Julliard
julliard at winehq.org
Tue Sep 25 14:56:34 CDT 2018
Module: wine
Branch: master
Commit: 9efa178ee6b098d4d6d171356f7f7c2da03c164d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9efa178ee6b098d4d6d171356f7f7c2da03c164d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Sep 25 02:13:19 2018 +0330
wined3d: Do not report WINEDDSCAPS_VIDEOMEMORY for WINED3D_NO3D adapters.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/directx.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 925a5bc..abe81de 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2389,24 +2389,24 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
caps->ddraw_caps.ssb_color_key_caps = ckey_caps;
caps->ddraw_caps.ssb_fx_caps = fx_caps;
- caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA |
- WINEDDSCAPS_BACKBUFFER |
- WINEDDSCAPS_FLIP |
- WINEDDSCAPS_FRONTBUFFER |
- WINEDDSCAPS_OFFSCREENPLAIN |
- WINEDDSCAPS_PALETTE |
- WINEDDSCAPS_PRIMARYSURFACE |
- WINEDDSCAPS_SYSTEMMEMORY |
- WINEDDSCAPS_VIDEOMEMORY |
- WINEDDSCAPS_VISIBLE;
+ caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA
+ | WINEDDSCAPS_BACKBUFFER
+ | WINEDDSCAPS_FLIP
+ | WINEDDSCAPS_FRONTBUFFER
+ | WINEDDSCAPS_OFFSCREENPLAIN
+ | WINEDDSCAPS_PALETTE
+ | WINEDDSCAPS_PRIMARYSURFACE
+ | WINEDDSCAPS_SYSTEMMEMORY
+ | WINEDDSCAPS_VISIBLE;
if (!(wined3d->flags & WINED3D_NO3D))
{
- caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE |
- WINEDDSCAPS_MIPMAP |
- WINEDDSCAPS_TEXTURE |
- WINEDDSCAPS_ZBUFFER;
- caps->ddraw_caps.caps |= WINEDDCAPS_3D;
+ caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE
+ | WINEDDSCAPS_MIPMAP
+ | WINEDDSCAPS_TEXTURE
+ | WINEDDSCAPS_VIDEOMEMORY
+ | WINEDDSCAPS_ZBUFFER;
+ caps->ddraw_caps.caps |= WINEDDCAPS_3D;
}
caps->shader_double_precision = d3d_info->shader_double_precision;
More information about the wine-cvs
mailing list