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 55bcfea8f011c7f31df81a0f05f11a1d5c0d11b1

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-11-22 09:46:20 +11:00
parent bd5aed0c57
commit 2fdb980d1a
7 changed files with 71 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From f244bd251e05597fa57e8088c3196e0b17726d5f Mon Sep 17 00:00:00 2001
From 4cc906486ee06960c3031bb7eaeda7ebf046be66 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
@@ -9,15 +9,15 @@ FIXME: Reimplement wined3d_device_get_available_texture_mem
---
dlls/d3d9/tests/device.c | 11 +++++++----
dlls/wined3d/adapter_gl.c | 10 ++++++++++
dlls/wined3d/device.c | 25 +++++++++++++++++++++++++
dlls/wined3d/device.c | 23 +++++++++++++++++++++++
dlls/wined3d/wined3d_gl.h | 1 +
4 files changed, 43 insertions(+), 4 deletions(-)
4 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 66bf5b0..b9ff69c 100644
index cabd15a..84746a9 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -9496,10 +9496,13 @@ static void test_vidmem_accounting(void)
@@ -9505,10 +9505,13 @@ static void test_vidmem_accounting(void)
}
vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device);
@@ -36,10 +36,10 @@ index 66bf5b0..b9ff69c 100644
for (i = 0; i < ARRAY_SIZE(textures); i++)
{
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 686c79a..15593ce 100644
index 2a3514a..637bb6f 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -220,6 +220,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -225,6 +225,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 },
@@ -47,7 +47,7 @@ index 686c79a..15593ce 100644
};
static const struct wined3d_extension_map wgl_extension_map[] =
@@ -1002,6 +1003,15 @@ static const struct wined3d_gpu_description *query_gpu_description(const struct
@@ -1007,6 +1008,15 @@ static const struct wined3d_gpu_description *query_gpu_description(const struct
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));
}
@@ -64,16 +64,12 @@ index 686c79a..15593ce 100644
if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
{
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5079113..2788320 100644
index a89a33d..4ce7031 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1301,8 +1301,33 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
@@ -1308,6 +1308,29 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device
UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device)
{
+ /* const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; */
+
TRACE("device %p.\n", device);
driver_info = &device->adapter->driver_info;
+ /* We can not acquire the context unless there is a swapchain. */
+ /*
@@ -99,13 +95,13 @@ index 5079113..2788320 100644
+ */
+
TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n",
wine_dbgstr_longlong(device->adapter->vram_bytes),
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 525c298..2fc3348 100644
index a02073c..6e9e58c 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -202,6 +202,7 @@ enum wined3d_gl_extension
@@ -206,6 +206,7 @@ enum wined3d_gl_extension
NV_VERTEX_PROGRAM2,
NV_VERTEX_PROGRAM2_OPTION,
NV_VERTEX_PROGRAM3,
@@ -114,5 +110,5 @@ index 525c298..2fc3348 100644
WGL_ARB_PIXEL_FORMAT,
WGL_EXT_SWAP_CONTROL,
--
2.7.4
1.9.1