Józef Kucia : wined3d: Report system shared memory for adapters.

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Wed Nov 21 10:13:22 2018 +0100

wined3d: Report system shared memory for adapters.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/directx.c         | 15 ++++++++++++---
 dlls/wined3d/wined3d_private.h |  1 +
 include/wine/wined3d.h         |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e41da8d..b9aa9fa 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -492,11 +492,12 @@ const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_p
 void wined3d_driver_info_init(struct wined3d_driver_info *driver_info,
         const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes)
 {
+    const struct driver_version_information *version_info;
+    enum wined3d_driver_model driver_model;
+    enum wined3d_display_driver driver;
+    MEMORYSTATUSEX memory_status;
     OSVERSIONINFOW os_version;
     WORD driver_os_version;
-    enum wined3d_display_driver driver;
-    enum wined3d_driver_model driver_model;
-    const struct driver_version_information *version_info;

memset(&os_version, 0, sizeof(os_version));
     os_version.dwOSVersionInfoSize = sizeof(os_version);
@@ -585,6 +586,13 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info,
         driver_info->vram_bytes = LONG_MAX;
     }

+    driver_info->sysmem_bytes = 64 * 1024 * 1024;
+    memory_status.dwLength = sizeof(memory_status);
+    if (GlobalMemoryStatusEx(&memory_status))
+        driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes);
+    else
+        ERR("Failed to get global memory status.\n");
+
     /* Try to obtain driver version information for the current Windows version. This fails in
      * some cases:
      * - the gpu is not available on the currently selected OS version:
@@ -1200,6 +1208,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d,
     identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1;
     memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid));
     identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes);
+    identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes);

return WINED3D_OK;
 }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 668bbc7..f908ff7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2648,6 +2648,7 @@ struct wined3d_driver_info
     const char *name;
     const char *description;
     UINT64 vram_bytes;
+    UINT64 sysmem_bytes;
     DWORD version_high;
     DWORD version_low;
 };
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f8e201c..40553f7 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1736,6 +1736,7 @@ struct wined3d_adapter_identifier
     DWORD whql_level;
     LUID adapter_luid;
     SIZE_T video_memory;
+    SIZE_T shared_system_memory;
 };

struct wined3d_swapchain_desc