Mikko Rasa : wined3d: Recognize GeForce GTX 460.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b46183a2b458c37ea24848ebd156f9832eef9100
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b46183a2b458c37ea24848ebd156f9832eef9100

Author: Mikko Rasa <tdb at tdb.fi>
Date:   Tue Sep  7 18:42:51 2010 +0300

wined3d: Recognize GeForce GTX 460.

---

 dlls/wined3d/directx.c         |    8 ++++++++
 dlls/wined3d/wined3d_private.h |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 2f4fd55..4269052 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1071,6 +1071,7 @@ static const struct gpu_description gpu_description_table[] =
     {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX280,     "NVIDIA GeForce GTX 280",           DRIVER_NVIDIA_GEFORCE6   },
     {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GT325M,     "NVIDIA GeForce GT 325M",           DRIVER_NVIDIA_GEFORCE6   },
     {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTS350M,    "NVIDIA GeForce GTS 350M",          DRIVER_NVIDIA_GEFORCE6   },
+    {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX460,     "NVIDIA GeForce GTX 460",           DRIVER_NVIDIA_GEFORCE6   },
     {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX470,     "NVIDIA GeForce GTX 470",           DRIVER_NVIDIA_GEFORCE6   },
     {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX480,     "NVIDIA GeForce GTX 480",           DRIVER_NVIDIA_GEFORCE6   },
     /* ATI cards */
@@ -1390,6 +1391,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl
             return CARD_NVIDIA_GEFORCE_GTX470;
         }
 
+        /* Geforce 400 - midend */
+        if (strstr(gl_renderer, "GTX 460"))
+        {
+            *vidmem = 768;  /* 1024MB model also available */
+            return CARD_NVIDIA_GEFORCE_GTX460;
+        }
+
         /* Geforce 300 highend mobile */
         if (strstr(gl_renderer, "GTS 350M")
                 || strstr(gl_renderer, "GTS 360M"))
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9edc83a..61a97f5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1354,6 +1354,7 @@ enum wined3d_pci_device
     CARD_NVIDIA_GEFORCE_GTX280      = 0x05e1,
     CARD_NVIDIA_GEFORCE_GT325M      = 0x0a35,
     CARD_NVIDIA_GEFORCE_GTS350M     = 0x0cb0,
+    CARD_NVIDIA_GEFORCE_GTX460      = 0x0e22,
     CARD_NVIDIA_GEFORCE_GTX470      = 0x06cd,
     CARD_NVIDIA_GEFORCE_GTX480      = 0x06c0,