wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 797c037bff2f7621f5b3d632bd899349529d6b2b.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-07-28 20:47:45 +02:00
parent 2393fd2c7e
commit 74f4d7b45e
13 changed files with 149 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From cac0838d345702dec114c18ff6d38222b8bf5747 Mon Sep 17 00:00:00 2001
From 53a49004741dbe3d7cf1b9e79ed0a5b021bef51a 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.
@@ -10,7 +10,7 @@ Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 56cf325..8f62570 100644
index c746d18..f33b313 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1181,8 +1181,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
@@ -46,7 +46,7 @@ index 56cf325..8f62570 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 61c3059..97c7f36 100644
index ce23c47..af7a63b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -220,6 +220,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -57,7 +57,7 @@ index 61c3059..97c7f36 100644
/* SGI */
{"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP },
@@ -1392,7 +1393,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
@@ -1395,7 +1396,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
return NULL;
}
@@ -67,7 +67,7 @@ index 61c3059..97c7f36 100644
enum wined3d_pci_vendor vendor, enum wined3d_pci_device device)
{
OSVERSIONINFOW os_version;
@@ -1501,6 +1503,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
@@ -1504,6 +1506,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
driver = DRIVER_UNKNOWN;
}
@@ -84,15 +84,15 @@ index 61c3059..97c7f36 100644
if (wined3d_settings.emulated_textureram)
{
TRACE("Overriding amount of video memory with 0x%s bytes.\n",
@@ -3801,7 +3813,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
@@ -3804,7 +3816,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
}
fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device);
- init_driver_info(driver_info, card_vendor, device);
+ init_driver_info(gl_info, driver_info, card_vendor, device);
add_gl_compat_wrappers(gl_info);
return TRUE;
gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info)
| adapter->fragment_pipe->get_emul_mask(gl_info);
if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 8c07ed1..3007516 100644
--- a/dlls/wined3d/wined3d_gl.h