Seth Shelnutt : wined3d: Nvidia Geforce 8400 and 8500 are now reported as 8400GS instead of 8300GS.
Alexandre Julliard
julliard at winehq.org
Mon Jul 19 11:05:32 CDT 2010
Module: wine
Branch: master
Commit: b5a5db910f3db869a1d2587dd957a4215a3e057c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a5db910f3db869a1d2587dd957a4215a3e057c
Author: Seth Shelnutt <Shelnutt2 at gmail.com>
Date: Mon Jul 12 22:56:37 2010 +0000
wined3d: Nvidia Geforce 8400 and 8500 are now reported as 8400GS instead of 8300GS.
---
dlls/wined3d/directx.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 268fee1..0c4e994 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1009,6 +1009,7 @@ static const struct driver_version_information driver_version_table[] =
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 15, 11, 9745 },
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 15, 11, 9745 },
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 15, 11, 9745 },
+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8400GS, "NVIDIA GeForce 8400 GS", 15, 11, 9745 },
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 15, 11, 9745 },
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 15, 11, 9745 },
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 15, 11, 9745 },
@@ -1405,14 +1406,20 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl
return CARD_NVIDIA_GEFORCE_8600GT;
}
+ /* Geforce8 - mid-lowend */
+ if (strstr(gl_renderer, "8400")
+ || strstr(gl_renderer, "8500"))
+ {
+ *vidmem = 128; /* 128-256MB for a 8400, 256-512MB for a 8500 */
+ return CARD_NVIDIA_GEFORCE_8400GS;
+ }
+
/* Geforce8 - lowend */
if (strstr(gl_renderer, "8100")
|| strstr(gl_renderer, "8200")
- || strstr(gl_renderer, "8300")
- || strstr(gl_renderer, "8400")
- || strstr(gl_renderer, "8500"))
+ || strstr(gl_renderer, "8300"))
{
- *vidmem = 128; /* 128-256MB for a 8300, 256-512MB for a 8400 */
+ *vidmem = 128; /* 128-256MB for a 8300 */
return CARD_NVIDIA_GEFORCE_8300GS;
}
More information about the wine-cvs
mailing list