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

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

wined3d: Set 3D device caps in adapter_gl_get_wined3d_caps().
362134b6 · Józef Kucia · Alexandre Julliard · f9fe7253 · 362134b6 · 362134b6
Commit 362134b6 authored Mar 17, 2019 by Józef Kucia Committed by Alexandre Julliard Mar 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

adapter_gl.c dlls/wined3d/adapter_gl.c +7 -0

directx.c dlls/wined3d/directx.c +0 -10

No files found.
--- 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;


--- 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;