From 9877df9aebef9d987956aa6c0360fe90137e9097 Mon Sep 17 00:00:00 2001
From: Caron Jensen <caron@codeweavers.com>
Date: Wed, 18 Jul 2012 13:33:32 -0500
Subject: [PATCH] wined3d: Recognize AMD Tahiti cards.

---
 dlls/wined3d/directx.c         | 5 +++++
 dlls/wined3d/wined3d_private.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 28cb7076881..f80e80c7737 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1154,6 +1154,7 @@ static const struct gpu_description gpu_description_table[] =
     {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD6700,         "AMD Radeon HD 6700 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},
+    {HW_VENDOR_AMD,        CARD_AMD_RADEON_HD7900,         "AMD Radeon HD 7900 Series",        DRIVER_AMD_R600,         2048},
     /* Intel cards */
     {HW_VENDOR_INTEL,      CARD_INTEL_830M,                "Intel(R) 82830M Graphics Controller",                       DRIVER_INTEL_GMA800,  32 },
     {HW_VENDOR_INTEL,      CARD_INTEL_855GM,               "Intel(R) 82852/82855 GM/GME Graphics Controller",           DRIVER_INTEL_GMA800,  32 },
@@ -1709,6 +1710,8 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in
         }
         cards[] =
         {
+            /* Southern Islands */
+            {"HD 7900", CARD_AMD_RADEON_HD7900},
             /* Northern Islands */
             {"HD 6900", CARD_AMD_RADEON_HD6900},
             {"HD 6800", CARD_AMD_RADEON_HD6800},
@@ -1916,6 +1919,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info
         }
         cards[] =
         {
+            /* Southern Islands */
+            {"TAHITI",     CARD_AMD_RADEON_HD7900},
             /* Northern Islands */
             {"CAYMAN",  CARD_AMD_RADEON_HD6900},
             {"BARTS",   CARD_AMD_RADEON_HD6800},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 17d371f0aa6..08e937067ea 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1344,6 +1344,7 @@ enum wined3d_pci_device
     CARD_AMD_RADEON_HD6700          = 0x68BA,
     CARD_AMD_RADEON_HD6800          = 0x6739,
     CARD_AMD_RADEON_HD6900          = 0x6719,
+    CARD_AMD_RADEON_HD7900          = 0x679A,
 
     CARD_NVIDIA_RIVA_128            = 0x0018,
     CARD_NVIDIA_RIVA_TNT            = 0x0020,