Henri Verbeet : wined3d: Recognize some Northern Islands cards in select_card_ati_mesa().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Feb 28 08:05:37 2011 +0100

wined3d: Recognize some Northern Islands cards in select_card_ati_mesa().

---

dlls/wined3d/directx.c         |    7 +++++++
 dlls/wined3d/wined3d_private.h |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index d80df10..3288989 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1090,6 +1090,9 @@ static const struct gpu_description gpu_description_table[] =
     {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD5700,         "ATI Radeon HD 5700 Series",        DRIVER_ATI_R600,         512 },
     {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD5800,         "ATI Radeon HD 5800 Series",        DRIVER_ATI_R600,         1024},
     {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD5900,         "ATI Radeon HD 5900 Series",        DRIVER_ATI_R600,         1024},
+    {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD6310,         "AMD Radeon HD 6310 Graphics",      DRIVER_ATI_R600,         1024},
+    {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD6800,         "AMD Radeon HD 6800 Series",        DRIVER_ATI_R600,         1024},
+    {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD6900,         "AMD Radeon HD 6900 Series",        DRIVER_ATI_R600,         2048},
     /* Intel cards */
     {HW_VENDOR_INTEL,      CARD_INTEL_I830G,               "Intel(R) 82830M Graphics Controller",                       DRIVER_INTEL_GMA800,  32 },
     {HW_VENDOR_INTEL,      CARD_INTEL_I855G,               "Intel(R) 82852/82855 GM/GME Graphics Controller",           DRIVER_INTEL_GMA800,  32 },
@@ -1727,6 +1730,10 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info
         }
         cards[] =
         {
+            /* Northern Islands */
+            {"CAYMAN",  CARD_ATI_RADEON_HD6900},
+            {"BARTS",   CARD_ATI_RADEON_HD6800},
+            {"PALM",    CARD_ATI_RADEON_HD6310},
             /* Evergreen */
             {"HEMLOCK", CARD_ATI_RADEON_HD5900},
             {"CYPRESS", CARD_ATI_RADEON_HD5800},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a262cca..455fb1c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1359,6 +1359,9 @@ enum wined3d_pci_device
     CARD_ATI_RADEON_HD5850          = 0x6898,
     CARD_ATI_RADEON_HD5870          = 0x6899,
     CARD_ATI_RADEON_HD5900          = 0x689c,
+    CARD_ATI_RADEON_HD6310          = 0x9803,
+    CARD_ATI_RADEON_HD6800          = 0x6739,
+    CARD_ATI_RADEON_HD6900          = 0x6719,

CARD_NVIDIA_RIVA_128            = 0x0018,
     CARD_NVIDIA_RIVA_TNT            = 0x0020,