Grazvydas Ignotas : wined3d: Add Polaris GPUs and their driver.
Alexandre Julliard
julliard at winehq.org
Mon Dec 19 13:10:38 CST 2016
Module: wine
Branch: stable
Commit: e1b2c40be623a931154af5d65da05049e1b61db2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b2c40be623a931154af5d65da05049e1b61db2
Author: Grazvydas Ignotas <notasas at gmail.com>
Date: Mon Nov 14 00:10:00 2016 +0200
wined3d: Add Polaris GPUs and their driver.
Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit c63e3261f37e8116e59c70b9bed20aa90c39e8a1)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/wined3d/directx.c | 9 ++++++++-
dlls/wined3d/wined3d_private.h | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e02adb3..e090694 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -45,6 +45,7 @@ enum wined3d_display_driver
DRIVER_AMD_R100,
DRIVER_AMD_R300,
DRIVER_AMD_R600,
+ DRIVER_AMD_RX,
DRIVER_INTEL_GMA800,
DRIVER_INTEL_GMA900,
DRIVER_INTEL_GMA950,
@@ -1146,6 +1147,7 @@ static const struct driver_version_information driver_version_table[] =
{DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280},
{DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 },
{DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280},
+ {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 17, 10, 1474},
/* Intel
* The drivers are unified but not all versions support all GPUs. At some point the 2k/xp
@@ -1350,7 +1352,9 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048},
{HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048},
{HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048},
- {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_R600, 4096},
+ {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096},
+ {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096},
+ {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096},
/* VMware */
{HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024},
@@ -2071,6 +2075,9 @@ cards_intel[] =
* These are returned but not handled: RC410, RV380. */
cards_amd_mesa[] =
{
+ /* Polaris 10/11 */
+ {"POLARIS10", CARD_AMD_RADEON_RX_480},
+ {"POLARIS11", CARD_AMD_RADEON_RX_460},
/* Sea Islands */
{"HAWAII", CARD_AMD_RADEON_R9 },
{"KAVERI", CARD_AMD_RADEON_R7 },
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4e83cc6..4725726 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1536,6 +1536,8 @@ enum wined3d_pci_device
CARD_AMD_RADEON_R3 = 0x9830,
CARD_AMD_RADEON_R7 = 0x130f,
CARD_AMD_RADEON_R9 = 0x67b1,
+ CARD_AMD_RADEON_RX_460 = 0x67ef,
+ CARD_AMD_RADEON_RX_480 = 0x67df,
CARD_NVIDIA_RIVA_128 = 0x0018,
CARD_NVIDIA_RIVA_TNT = 0x0020,
More information about the wine-cvs
mailing list