Signed-off-by: Kristjan Gerhardsson <kristjang at ccpgames.com>

---

dlls/wined3d/directx.c         | 7 +++++--

dlls/wined3d/wined3d_private.h | 7 +++++--

2 files changed, 10 insertions(+), 4 deletions(-)

 

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c

index 5975766f16..461ea222ba 100644

--- a/dlls/wined3d/directx.c

+++ b/dlls/wined3d/directx.c

@@ -396,7 +396,8 @@ static const struct wined3d_gpu_description gpu_description_table[] =

     {HW_VENDOR_AMD,        CARD_AMD_RADEON_R9_M395X,       "AMD Radeon R9 M395X",              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},

-    {HW_VENDOR_AMD,        CARD_AMD_RADEON_RX_VEGA,        "Radeon RX Vega",                   DRIVER_AMD_RX,           8192},

+    {HW_VENDOR_AMD,        CARD_AMD_RADEON_RX_VEGA_10,     "Radeon RX Vega",                   DRIVER_AMD_RX,           8192},

+    {HW_VENDOR_AMD,        CARD_AMD_RADEON_RX_VEGA_20,     "Radeon RX Vega 20",                DRIVER_AMD_RX,           4096},

     /* Red Hat */

     {HW_VENDOR_REDHAT,     CARD_REDHAT_VIRGL,              "Red Hat VirtIO GPU",                                        DRIVER_REDHAT_VIRGL,  1024},

@@ -477,8 +478,10 @@ static const struct wined3d_gpu_description gpu_description_table[] =

     {HW_VENDOR_INTEL,      CARD_INTEL_IP580_2,             "Intel(R) Iris(TM) Pro Graphics 580",                        DRIVER_INTEL_HD4000,  2048},

     {HW_VENDOR_INTEL,      CARD_INTEL_IPP580_1,            "Intel(R) Iris(TM) Pro Graphics P580",                       DRIVER_INTEL_HD4000,  2048},

     {HW_VENDOR_INTEL,      CARD_INTEL_IPP580_2,            "Intel(R) Iris(TM) Pro Graphics P580",                       DRIVER_INTEL_HD4000,  2048},

+    {HW_VENDOR_INTEL,      CARD_INTEL_UHD617,              "Intel(R) UHD Graphics 617",                                 DRIVER_INTEL_HD4000,  2048},

     {HW_VENDOR_INTEL,      CARD_INTEL_HD620,               "Intel(R) HD Graphics 620",                                  DRIVER_INTEL_HD4000,  3072},

-    {HW_VENDOR_INTEL,      CARD_INTEL_HD630,               "Intel(R) HD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072},

+    {HW_VENDOR_INTEL,      CARD_INTEL_HD630_1,             "Intel(R) HD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072},

+    {HW_VENDOR_INTEL,      CARD_INTEL_HD630_2,             "Intel(R) HD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072},

};

 static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h

index a2c81617b6..037434431d 100644

--- a/dlls/wined3d/wined3d_private.h

+++ b/dlls/wined3d/wined3d_private.h

@@ -2378,7 +2378,8 @@ enum wined3d_pci_device

     CARD_AMD_RADEON_R9_M395X        = 0x6920,

     CARD_AMD_RADEON_RX_460          = 0x67ef,

     CARD_AMD_RADEON_RX_480          = 0x67df,

-    CARD_AMD_RADEON_RX_VEGA         = 0x687f,

+    CARD_AMD_RADEON_RX_VEGA_10      = 0x687f,

+    CARD_AMD_RADEON_RX_VEGA_20      = 0x66af,

     CARD_NVIDIA_RIVA_128            = 0x0018,

     CARD_NVIDIA_RIVA_TNT            = 0x0020,

@@ -2593,8 +2594,10 @@ enum wined3d_pci_device

     CARD_INTEL_IP580_2              = 0x193b,

     CARD_INTEL_IPP580_1             = 0x193a,

     CARD_INTEL_IPP580_2             = 0x193d,

+    CARD_INTEL_UHD617               = 0x87c0,

     CARD_INTEL_HD620                = 0x5916,

-    CARD_INTEL_HD630                = 0x5912,

+    CARD_INTEL_HD630_1              = 0x5912,

+    CARD_INTEL_HD630_2              = 0x591b,

};

 struct wined3d_fbo_ops

--

2.17.0