From 909b4e25d6c03b7eb7d336fcd75bfa692024f324 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 17 Feb 2018 19:23:00 -0600 Subject: [PATCH] wined3d-Accounting: Rebase. --- ...-values-for-memory-accounting-on-NVI.patch | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch b/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch index 430cbf8b..6fd565be 100644 --- a/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch +++ b/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch @@ -1,7 +1,8 @@ -From e91d235aa2fe4b1145a66f93ab18e840645301a9 Mon Sep 17 00:00:00 2001 +From b078695fc13099df9edf2eaba974f6535808f4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 6 Jun 2015 06:53:34 +0200 -Subject: wined3d: Use real values for memory accounting on NVIDIA cards. +Subject: [PATCH] wined3d: Use real values for memory accounting on NVIDIA + cards. FIXME: Reimplement wined3d_device_get_available_texture_mem without using the context on the main thread. @@ -13,10 +14,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 89ea7721bf1..2e1648171bb 100644 +index 0ffc1ae..0c3937e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c -@@ -9081,10 +9081,13 @@ static void test_vidmem_accounting(void) +@@ -9470,10 +9470,13 @@ static void test_vidmem_accounting(void) } vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device); @@ -35,10 +36,10 @@ index 89ea7721bf1..2e1648171bb 100644 for (i = 0; i < ARRAY_SIZE(textures); i++) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index e07d07c41e3..61ebafff0c9 100644 +index 17103cc..bce8936 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -1281,8 +1281,33 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) +@@ -1284,8 +1284,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,18 +74,18 @@ index e07d07c41e3..61ebafff0c9 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 411545395a2..f0a2c56e322 100644 +index f7f6452..ec5d8d8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -261,6 +261,7 @@ static const struct wined3d_extension_map gl_extension_map[] = +@@ -270,6 +270,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 }, + {"GL_NVX_gpu_memory_info", NVX_GPU_MEMORY_INFO }, + }; - /* SGI */ - {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP }, -@@ -1571,6 +1572,15 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_ + static const struct wined3d_extension_map wgl_extension_map[] = +@@ -1578,6 +1579,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,17 +102,17 @@ index 411545395a2..f0a2c56e322 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 52fb5fd92c8..f60f8021c26 100644 +index cc6f888..daed891 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h -@@ -191,6 +191,7 @@ enum wined3d_gl_extension +@@ -199,6 +199,7 @@ enum wined3d_gl_extension NV_VERTEX_PROGRAM2, NV_VERTEX_PROGRAM2_OPTION, NV_VERTEX_PROGRAM3, + NVX_GPU_MEMORY_INFO, - /* SGI */ - SGIS_GENERATE_MIPMAP, /* WGL extensions */ + WGL_ARB_PIXEL_FORMAT, + WGL_EXT_SWAP_CONTROL, -- -2.12.2 +2.7.4