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

---

dlls/wined3d/adapter_gl.c | 2 +-

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

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

3 files changed, 29 insertions(+), 3 deletions(-)

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

index c8ebe34643..080ad5a4b4 100644

--- a/dlls/wined3d/adapter_gl.c

+++ b/dlls/wined3d/adapter_gl.c

@@ -1629,7 +1629,7 @@ cards_intel[] =

/* Haswell */

{"Iris Pro 5200", CARD_INTEL_IP5200_1},

{"Iris 5100", CARD_INTEL_I5100_1},

- {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */

+ {"HD Graphics 5000", CARD_INTEL_HD5000_1}, /* MacOS */

{"Haswell Mobile", CARD_INTEL_HWM},

{"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */

/* Ivybridge */

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

index 72c3de98a9..5975766f16 100644

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

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

@@ -278,6 +278,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT610, "NVIDIA GeForce GT 610", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630, "NVIDIA GeForce GT 630", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE8, 1024},

+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640, "NVIDIA GeForce GT 640", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650, "NVIDIA GeForce GTX 650", DRIVER_NVIDIA_GEFORCE8, 1024},

@@ -288,6 +289,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096},

+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX_MAC, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT720, "NVIDIA GeForce GT 720", DRIVER_NVIDIA_GEFORCE8, 2048},

@@ -295,6 +297,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024},

+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT755M, "NVIDIA GeForce GT 755M", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA GeForce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048},

@@ -302,7 +305,9 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE8, 2048},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE8, 3072},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048},

+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX775M, "NVIDIA GeForce GTX 775M", DRIVER_NVIDIA_GEFORCE8, 3072},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072},

+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780M, "NVIDIA GeForce GTX 780M", DRIVER_NVIDIA_GEFORCE8, 4096},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN", DRIVER_NVIDIA_GEFORCE8, 6144},

{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANB, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144},

@@ -365,6 +370,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD6480G, "AMD Radeon HD 6480G", DRIVER_AMD_R600, 512 },

+ {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6490M, "AMD Radeon HD 6490M", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 },

@@ -374,6 +380,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD7660D, "AMD Radeon HD 7660D", DRIVER_AMD_R600, 2048},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048},

+ {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7870, "AMD Radeon HD 7870 Series", DRIVER_AMD_R600, 2048},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD8600M, "AMD Radeon HD 8600M Series", DRIVER_AMD_R600, 1024},

{HW_VENDOR_AMD, CARD_AMD_RADEON_HD8670, "AMD Radeon HD 8670", DRIVER_AMD_R600, 2048},

@@ -382,7 +389,11 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048},

{HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048},

{HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096},

+ {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290X, "AMD Radeon R9 290X", DRIVER_AMD_RX, 4096},

{HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096},

+ {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_M370X, "AMD Radeon R9 M370X", DRIVER_AMD_RX, 2048},

+ {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_M380, "AMD Radeon R9 M380", DRIVER_AMD_RX, 2048},

+ {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},

@@ -430,7 +441,8 @@ static const struct wined3d_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_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536},

+ {HW_VENDOR_INTEL, CARD_INTEL_HD5000_1, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536},

+ {HW_VENDOR_INTEL, CARD_INTEL_HD5000_2, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536},

{HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536},

{HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536},

{HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536},

@@ -440,6 +452,7 @@ static const struct wined3d_gpu_description gpu_description_table[] =

{HW_VENDOR_INTEL, CARD_INTEL_IP5200_3, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536},

{HW_VENDOR_INTEL, CARD_INTEL_IP5200_4, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536},

{HW_VENDOR_INTEL, CARD_INTEL_IP5200_5, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536},

+ {HW_VENDOR_INTEL, CARD_INTEL_IP5200_6, "Intel(R) Iris(TM) Pro Graphics 5200", 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},

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

index b959a28060..a2c81617b6 100644

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

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

@@ -2350,6 +2350,7 @@ enum wined3d_pci_device

CARD_AMD_RADEON_HD5900 = 0x689c,

CARD_AMD_RADEON_HD6300 = 0x9803,

CARD_AMD_RADEON_HD6400 = 0x6770,

+ CARD_AMD_RADEON_HD6490M = 0x6760,

CARD_AMD_RADEON_HD6410D = 0x9644,

CARD_AMD_RADEON_HD6480G = 0x9648,

CARD_AMD_RADEON_HD6550D = 0x9640,

@@ -2361,6 +2362,7 @@ enum wined3d_pci_device

CARD_AMD_RADEON_HD7660D = 0x9901,

CARD_AMD_RADEON_HD7700 = 0x683d,

CARD_AMD_RADEON_HD7800 = 0x6819,

+ CARD_AMD_RADEON_HD7870 = 0x6818,

CARD_AMD_RADEON_HD7900 = 0x679a,

CARD_AMD_RADEON_HD8600M = 0x6660,

CARD_AMD_RADEON_HD8670 = 0x6610,

@@ -2369,7 +2371,11 @@ enum wined3d_pci_device

CARD_AMD_RADEON_R7 = 0x130f,

CARD_AMD_RADEON_R9_285 = 0x6939,

CARD_AMD_RADEON_R9_290 = 0x67b1,

+ CARD_AMD_RADEON_R9_290X = 0x67b0,

CARD_AMD_RADEON_R9_FURY = 0x7300,

+ CARD_AMD_RADEON_R9_M370X = 0x6821,

+ CARD_AMD_RADEON_R9_M380 = 0x6647,

+ CARD_AMD_RADEON_R9_M395X = 0x6920,

CARD_AMD_RADEON_RX_460 = 0x67ef,

CARD_AMD_RADEON_RX_480 = 0x67df,

CARD_AMD_RADEON_RX_VEGA = 0x687f,

@@ -2446,6 +2452,7 @@ enum wined3d_pci_device

CARD_NVIDIA_GEFORCE_GT610 = 0x104a,

CARD_NVIDIA_GEFORCE_GT630 = 0x0f00,

CARD_NVIDIA_GEFORCE_GT630M = 0x0de9,

+ CARD_NVIDIA_GEFORCE_GT640 = 0x0fc1,

CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2,

CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1,

CARD_NVIDIA_GEFORCE_GTX650 = 0x0fc6,

@@ -2456,6 +2463,7 @@ enum wined3d_pci_device

CARD_NVIDIA_GEFORCE_GTX670 = 0x1189,

CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1,

CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7,

+ CARD_NVIDIA_GEFORCE_GTX675MX_MAC = 0x11a2,

CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

CARD_NVIDIA_GEFORCE_GTX690 = 0x1188,

CARD_NVIDIA_GEFORCE_GT720 = 0x128b,

@@ -2463,6 +2471,7 @@ enum wined3d_pci_device

CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1,

CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9,

+ CARD_NVIDIA_GEFORCE_GT755M = 0x0fcd,

CARD_NVIDIA_GEFORCE_GTX750 = 0x1381,

CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380,

CARD_NVIDIA_GEFORCE_GTX760 = 0x1187,

@@ -2470,7 +2479,9 @@ enum wined3d_pci_device

CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2,

CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0,

CARD_NVIDIA_GEFORCE_GTX770 = 0x1184,

+ CARD_NVIDIA_GEFORCE_GTX775M = 0x119d,

CARD_NVIDIA_GEFORCE_GTX780 = 0x1004,

+ CARD_NVIDIA_GEFORCE_GTX780M = 0x119e,

CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a,

CARD_NVIDIA_GEFORCE_GTXTITAN = 0x1005,

CARD_NVIDIA_GEFORCE_GTXTITANB = 0x100c,

@@ -2546,7 +2557,8 @@ enum wined3d_pci_device

CARD_INTEL_IVBS = 0x015a,

CARD_INTEL_HWD = 0x0412,

CARD_INTEL_HWM = 0x0416,

- CARD_INTEL_HD5000 = 0x0a26,

+ CARD_INTEL_HD5000_1 = 0x0a26,

+ CARD_INTEL_HD5000_2 = 0x0422,

CARD_INTEL_I5100_1 = 0x0a22,

CARD_INTEL_I5100_2 = 0x0a2a,

CARD_INTEL_I5100_3 = 0x0a2b,

@@ -2556,6 +2568,7 @@ enum wined3d_pci_device

CARD_INTEL_IP5200_3 = 0x0d2a,

CARD_INTEL_IP5200_4 = 0x0d2b,

CARD_INTEL_IP5200_5 = 0x0d2e,

+ CARD_INTEL_IP5200_6 = 0x0c22,

CARD_INTEL_HD5300 = 0x161e,

CARD_INTEL_HD5500 = 0x1616,

CARD_INTEL_HD5600 = 0x1612,

2.17.0