Józef Kucia : wined3d: Set 3D device caps in adapter_gl_get_wined3d_caps().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 362134b69ef7bc16863d4f630d50ab6ea7ff299d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=362134b69ef7bc16863d4f630...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Sun Mar 17 18:51:06 2019 +0100

wined3d: Set 3D device caps in adapter_gl_get_wined3d_caps().

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/adapter_gl.c |  7 +++++++
 dlls/wined3d/directx.c    | 10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 4b54455..b02241b 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -4251,6 +4251,13 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s
     const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info;
     const struct wined3d_gl_info *gl_info = &adapter->gl_info;
 
+    caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE
+            | WINEDDSCAPS_MIPMAP
+            | WINEDDSCAPS_TEXTURE
+            | WINEDDSCAPS_VIDEOMEMORY
+            | WINEDDSCAPS_ZBUFFER;
+    caps->ddraw_caps.caps |= WINEDDCAPS_3D;
+
     if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT])
         caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP;
 
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index d2e44f4..debc4e5 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2291,16 +2291,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in
             | WINEDDSCAPS_SYSTEMMEMORY
             | WINEDDSCAPS_VISIBLE;
 
-    if (!(wined3d->flags & WINED3D_NO3D))
-    {
-        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;
     caps->viewport_array_index_any_shader = d3d_info->viewport_array_index_any_shader;