Kristján Gerhardsson : wined3d: Add GPU information for a few more Intel KBL GPUs.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 4e87fbc1e0ad0b52b4adbe8ff0f9b2c9569244ab
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4e87fbc1e0ad0b52b4adbe8ff0f9b2c9569244ab

Author: Kristján Gerhardsson <kristjang at ccpgames.com>
Date:   Mon Aug  5 18:43:37 2019 +0430

wined3d: Add GPU information for a few more Intel KBL GPUs.

Signed-off-by: Kristján Gerhardsson <kristjang at ccpgames.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 8003f1fd64aa22bec5cd29aaac6a26c30c27b1a2)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7bdc4fecc3..505b9918b2 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -476,8 +476,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 c7b3cde2e8..bbffba084c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2528,8 +2528,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