[PATCH v2 0/3] MR2350: Recognize Intel UHD 630 coffelake GT2

[Carlos Rodriguez (＠mrdeathjr28)]

Recognize Intel UHD 630 coffelake GT2

--
  v2: Recognize Intel UHD 630 coffelake GT2

https://gitlab.winehq.org/wine/wine/-/merge_requests/2350

[PATCH v2 1/3] Recognize UHD 630 Coffelake GT2

[Carlos Rodriguez]

From: Carlos Rodriguez

---
 dlls/wined3d/directx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index f8f9316d914..c6fdde4fcee 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -626,7 +626,9 @@ static const struct wined3d_gpu_description gpu_description_table[] =
     {HW_VENDOR_INTEL,      CARD_INTEL_HD620,               "Intel(R) HD Graphics 620",                                  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},
-    {HW_VENDOR_INTEL,      CARD_INTEL_UHD630,              "Intel(R) UHD Graphics 630",                                 DRIVER_INTEL_HD4000,  3072},
+    {HW_VENDOR_INTEL,      CARD_INTEL_UHD630_1,            "Intel(R) UHD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072}
+,
+    {HW_VENDOR_INTEL,      CARD_INTEL_UHD630_2,            "Intel(R) UHD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072},
 };

static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,

[PATCH v2 2/3] Recognize UHD 630 Coffelake GT2

[Carlos Rodriguez]

From: Carlos Rodriguez

---
 dlls/wined3d/wined3d_private.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c0a190cbc5c..1c41389b684 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3303,7 +3303,8 @@ enum wined3d_pci_device
     CARD_INTEL_HD620                = 0x5916,
     CARD_INTEL_HD630_1              = 0x5912,
     CARD_INTEL_HD630_2              = 0x591b,
-    CARD_INTEL_UHD630               = 0x3e9b,
+    CARD_INTEL_UHD630_1             = 0x3e9b,
+    CARD_INTEL_UHD630_2             = 0x3e91,
 };

struct wined3d_fbo_ops

[PATCH v2 3/3] Recognize Intel UHD 630 coffelake GT2

[Carlos Rodriguez]

From: Carlos Rodriguez

---
 dlls/wined3d/directx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c6fdde4fcee..9bfc7288a9d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -626,8 +626,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =
     {HW_VENDOR_INTEL,      CARD_INTEL_HD620,               "Intel(R) HD Graphics 620",                                  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},
-    {HW_VENDOR_INTEL,      CARD_INTEL_UHD630_1,            "Intel(R) UHD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072}
-,
+    {HW_VENDOR_INTEL,      CARD_INTEL_UHD630_1,            "Intel(R) UHD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072},
     {HW_VENDOR_INTEL,      CARD_INTEL_UHD630_2,            "Intel(R) UHD Graphics 630",                                  DRIVER_INTEL_HD4000,  3072},
 };

[PATCH v2 0/3] MR2350: Recognize Intel UHD 630 coffelake GT2 - closed

[Zebediah Figura (＠zfigura)]

This merge request was closed by Zebediah Figura.

[Zebediah Figura (＠zfigura)]

This was fixed upstream by https://source.winehq.org/git/wine.git/commitdiff/318b0bbed60a769fe74ffc0bc7c206543f3a612c.