Henri Verbeet : wined3d: Recognize some more AMD cards.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Jul 28 22:27:52 2011 +0200

wined3d: Recognize some more AMD cards.

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 1430444..87f2606 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1175,7 +1175,9 @@ static const struct gpu_description gpu_description_table[] =
     {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD5700,         "ATI Radeon HD 5700 Series",        DRIVER_AMD_R600,         512 },
     {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD5800,         "ATI Radeon HD 5800 Series",        DRIVER_AMD_R600,         1024},
     {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD5900,         "ATI Radeon HD 5900 Series",        DRIVER_AMD_R600,         1024},
-    {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6310,         "AMD Radeon HD 6310 Graphics",      DRIVER_AMD_R600,         1024},
+    {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6300,         "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600,       1024},
+    {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6400,         "AMD Radeon HD 6400 Series",        DRIVER_AMD_R600,         1024},
+    {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6600,         "AMD Radeon HD 6600 Series",        DRIVER_AMD_R600,         1024},
     {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6800,         "AMD Radeon HD 6800 Series",        DRIVER_AMD_R600,         1024},
     {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6900,         "AMD Radeon HD 6900 Series",        DRIVER_AMD_R600,         2048},
     /* Intel cards */
@@ -1845,7 +1847,9 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info
             /* Northern Islands */
             {"CAYMAN",  CARD_AMD_RADEON_HD6900},
             {"BARTS",   CARD_AMD_RADEON_HD6800},
-            {"PALM",    CARD_AMD_RADEON_HD6310},
+            {"TURKS",   CARD_AMD_RADEON_HD6600},
+            {"CAICOS",  CARD_AMD_RADEON_HD6400},
+            {"PALM",    CARD_AMD_RADEON_HD6300},
             /* Evergreen */
             {"HEMLOCK", CARD_AMD_RADEON_HD5900},
             {"CYPRESS", CARD_AMD_RADEON_HD5800},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0bbe9d1..f4e3f3e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1338,7 +1338,9 @@ enum wined3d_pci_device
     CARD_AMD_RADEON_HD5850          = 0x6898,
     CARD_AMD_RADEON_HD5870          = 0x6899,
     CARD_AMD_RADEON_HD5900          = 0x689c,
-    CARD_AMD_RADEON_HD6310          = 0x9803,
+    CARD_AMD_RADEON_HD6300          = 0x9803,
+    CARD_AMD_RADEON_HD6400          = 0x6770,
+    CARD_AMD_RADEON_HD6600          = 0x6758,
     CARD_AMD_RADEON_HD6800          = 0x6739,
     CARD_AMD_RADEON_HD6900          = 0x6719,