[PATCH 3/5] wined3d: Add a bunch of Broadwell and Skylake PCI ids and descriptions.
Matteo Bruni
mbruni at codeweavers.com
Thu Oct 13 17:03:35 CDT 2016
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
I'm not adding new entries to cards_intel[] because they shouldn't be
necessary for either Mesa or macOS (also I don't know the macOS
strings). I could add the Mesa strings "just because", though.
dlls/wined3d/directx.c | 32 ++++++++++++++++++++++++--------
dlls/wined3d/wined3d_private.h | 24 ++++++++++++++++++++----
2 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a495d01..24fb9e5 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1450,14 +1450,30 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536},
{HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536},
{HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536},
- {HW_VENDOR_INTEL, CARD_INTEL_IG6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD6000, "Intel(R) HD Graphics 6000", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_I6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048},
{HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048},
{HW_VENDOR_INTEL, CARD_INTEL_IPP6300, "Intel(R) Iris(TM) Pro Graphics P6300", DRIVER_INTEL_HD4000, 2048},
- {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD510_1, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD510_2, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD510_3, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD515, "Intel(R) HD Graphics 515", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD520_1, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HD520_2, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048},
{HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048},
{HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048},
- {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048},
- {HW_VENDOR_INTEL, CARD_INTEL_IPP580, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_HDP530, "Intel(R) HD Graphics P530", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_I540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_I550, "Intel(R) Iris(TM) Graphics 550", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_I555, "Intel(R) Iris(TM) Graphics 555", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_IP555, "Intel(R) Iris(TM) Graphics P555", DRIVER_INTEL_HD4000, 2048},
+ {HW_VENDOR_INTEL, CARD_INTEL_IP580_1, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048},
+ {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},
};
static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,
@@ -2071,13 +2087,13 @@ cards_amd_binary[] =
cards_intel[] =
{
/* Skylake */
- {"Iris Pro Graphics P580", CARD_INTEL_IPP580},
- {"Skylake", CARD_INTEL_HD520},
+ {"Iris Pro Graphics P580", CARD_INTEL_IPP580_1},
+ {"Skylake", CARD_INTEL_HD520_1},
/* Broadwell */
{"Iris Pro P6300", CARD_INTEL_IPP6300},
{"Iris Pro 6200", CARD_INTEL_IP6200},
- {"Iris 6100", CARD_INTEL_IG6100},
- {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */
+ {"Iris 6100", CARD_INTEL_I6100},
+ {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */
/* Haswell */
{"Haswell Mobile", CARD_INTEL_HWM},
{"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a9800b3..4326bee 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2001,14 +2001,30 @@ enum wined3d_pci_device
CARD_INTEL_IVBS = 0x015a,
CARD_INTEL_HWD = 0x0412,
CARD_INTEL_HWM = 0x0416,
- CARD_INTEL_IG6100 = 0x162b,
+ CARD_INTEL_HD5300 = 0x161e,
+ CARD_INTEL_HD5500 = 0x1616,
+ CARD_INTEL_HD5600 = 0x1612,
+ CARD_INTEL_HD6000 = 0x1626,
+ CARD_INTEL_I6100 = 0x162b,
CARD_INTEL_IP6200 = 0x1622,
CARD_INTEL_IPP6300 = 0x162a,
- CARD_INTEL_HD520 = 0x1916,
+ CARD_INTEL_HD510_1 = 0x1902,
+ CARD_INTEL_HD510_2 = 0x1906,
+ CARD_INTEL_HD510_3 = 0x190b,
+ CARD_INTEL_HD515 = 0x191e,
+ CARD_INTEL_HD520_1 = 0x1916,
+ CARD_INTEL_HD520_2 = 0x1921,
CARD_INTEL_HD530_1 = 0x1912,
CARD_INTEL_HD530_2 = 0x191b,
- CARD_INTEL_HD540 = 0x1926,
- CARD_INTEL_IPP580 = 0x193d,
+ CARD_INTEL_HDP530 = 0x191d,
+ CARD_INTEL_I540 = 0x1926,
+ CARD_INTEL_I550 = 0x1927,
+ CARD_INTEL_I555 = 0x192b,
+ CARD_INTEL_IP555 = 0x192d,
+ CARD_INTEL_IP580_1 = 0x1932,
+ CARD_INTEL_IP580_2 = 0x193b,
+ CARD_INTEL_IPP580_1 = 0x193a,
+ CARD_INTEL_IPP580_2 = 0x193d,
};
struct wined3d_fbo_ops
--
2.7.3
More information about the wine-patches
mailing list