wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 292b728908563952f56b0585d072f3d7a08e93b2.

Browse Source
This commit is contained in:
Zebediah Figura
2019-11-12 19:56:51 -06:00
parent 8148194353
commit ef0e88407e
10 changed files with 181 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch
View File

@@ -1,4 +1,4 @@
From 1eb53d1e30aeadbf77bf6d9285a3c9cdd6dcc612 Mon Sep 17 00:00:00 2001
From 55f1d67826fdb5619da6fd8d081836076fdaee28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 6 Jun 2015 06:53:34 +0200
Subject: [PATCH] wined3d: Use real values for memory accounting on NVIDIA
@@ -7,36 +7,13 @@ Subject: [PATCH] wined3d: Use real values for memory accounting on NVIDIA
FIXME: Reimplement wined3d_device_get_available_texture_mem
without using the context on the main thread.
---
dlls/d3d9/tests/device.c | 11 +++++++----
dlls/wined3d/adapter_gl.c | 12 ++++++++++++
dlls/wined3d/device.c | 23 +++++++++++++++++++++++
dlls/wined3d/wined3d_gl.h | 1 +
4 files changed, 43 insertions(+), 4 deletions(-)
3 files changed, 36 insertions(+)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 3d42dcbcc56..617fc94970b 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -9548,10 +9548,13 @@ static void test_vidmem_accounting(void)
}
vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device);
- ok(vidmem_start > vidmem_end, "Expected available texture memory to decrease during texture creation.\n");
- diff = vidmem_start - vidmem_end;
- ok(diff > 1024 * 1024 * 2 * i, "Expected a video memory difference of at least %u MB, got %u MB.\n",
- 2 * i, diff / 1024 / 1024);
+ todo_wine_if(vidmem_start == vidmem_end)
+ {
+ ok(vidmem_start > vidmem_end, "Expected available texture memory to decrease during texture creation.\n");
+ diff = vidmem_start - vidmem_end;
+ ok(diff > 1024 * 1024 * 2 * i, "Expected a video memory difference of at least %u MB, got %u MB.\n",
+ 2 * i, diff / 1024 / 1024);
+ }
for (i = 0; i < ARRAY_SIZE(textures); i++)
{
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index e83aebfa56f..6499fcf3aef 100644
index 7018c6da1..cf43628af 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -230,6 +230,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -66,7 +43,7 @@ index e83aebfa56f..6499fcf3aef 100644
if ((gpu_description_override = wined3d_get_user_override_gpu_description(vendor, device)))
gpu_description = gpu_description_override;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b2aa33af41f..e67391737d9 100644
index 2a4d37784..7bfbde51f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1200,6 +1200,29 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device
@@ -100,7 +77,7 @@ index b2aa33af41f..e67391737d9 100644
wine_dbgstr_longlong(driver_info->vram_bytes),
wine_dbgstr_longlong(device->adapter->vram_bytes_used),
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 3372b4b6be3..7995404901b 100644
index 3372b4b6b..799540490 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -206,6 +206,7 @@ enum wined3d_gl_extension
@@ -112,5 +89,5 @@ index 3372b4b6be3..7995404901b 100644
WGL_ARB_PIXEL_FORMAT,
WGL_EXT_SWAP_CONTROL,
--
2.17.1
2.23.0