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 ef267f115f76a3041e0da4a0f0dbd7ffb4a022e1.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-25 01:19:21 +02:00
parent 8b1d3d07ab
commit 91f6a8ad80
7 changed files with 48 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 6b03eab427e44e8cc3dde2b2cb5f84a515039e59 Mon Sep 17 00:00:00 2001
From e91d235aa2fe4b1145a66f93ab18e840645301a9 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: wined3d: Use real values for memory accounting on NVIDIA cards.
@@ -13,10 +13,10 @@ FIXME: Reimplement wined3d_device_get_available_texture_mem
4 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 4da1653e9b..c50ada88e4 100644
index 89ea7721bf1..2e1648171bb 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -9063,10 +9063,13 @@ static void test_vidmem_accounting(void)
@@ -9081,10 +9081,13 @@ static void test_vidmem_accounting(void)
}
vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device);
@@ -32,13 +32,13 @@ index 4da1653e9b..c50ada88e4 100644
+ 2 * i, diff / 1024 / 1024);
+ }
for (i = 0; i < sizeof(textures) / sizeof(*textures); i++)
for (i = 0; i < ARRAY_SIZE(textures); i++)
{
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 7e90be55c4..eb66f06307 100644
index e07d07c41e3..61ebafff0c9 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1271,8 +1271,33 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
@@ -1281,8 +1281,33 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device)
{
@@ -73,10 +73,10 @@ index 7e90be55c4..eb66f06307 100644
wine_dbgstr_longlong(device->adapter->vram_bytes),
wine_dbgstr_longlong(device->adapter->vram_bytes_used),
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index b5a8e47a6a..0de69aaa84 100644
index 411545395a2..f0a2c56e322 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -258,6 +258,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -261,6 +261,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
{"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2 },
{"GL_NV_vertex_program2_option", NV_VERTEX_PROGRAM2_OPTION },
{"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3 },
@@ -84,7 +84,7 @@ index b5a8e47a6a..0de69aaa84 100644
/* SGI */
{"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP },
@@ -1568,6 +1569,15 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_
@@ -1571,6 +1572,15 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_
TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n",
vendor, device, wine_dbgstr_longlong(*vram_bytes));
}
@@ -101,10 +101,10 @@ index b5a8e47a6a..0de69aaa84 100644
if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
{
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 6e92552edd..ea38628c3c 100644
index 52fb5fd92c8..f60f8021c26 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -188,6 +188,7 @@ enum wined3d_gl_extension
@@ -191,6 +191,7 @@ enum wined3d_gl_extension
NV_VERTEX_PROGRAM2,
NV_VERTEX_PROGRAM2_OPTION,
NV_VERTEX_PROGRAM3,