ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Add Nvidia GeForce 840M. 

Signed-off-by: Caron Wills <caron@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Caron Wills 2016-04-15 18:10:42 +00:00 committed by Alexandre Julliard
parent f0429adbff
commit f8d6eee32a
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/directx.c
View File

@ -1287,6 +1287,7 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096},
@ -1751,6 +1752,7 @@ cards_nvidia_binary[] =
{"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */
{"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */
{"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */
{"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */
{"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */
{"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */
{"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */
@ -2111,6 +2113,7 @@ cards_nvidia_mesa[] =
{
/* Maxwell */
{"NV124", CARD_NVIDIA_GEFORCE_GTX970},
{"NV118", CARD_NVIDIA_GEFORCE_840M},
{"NV117", CARD_NVIDIA_GEFORCE_GTX750},
/* Kepler */
{"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI},

1
dlls/wined3d/wined3d_private.h
View File

@ -1796,6 +1796,7 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c,
CARD_NVIDIA_GEFORCE_820M = 0x0fed,
CARD_NVIDIA_GEFORCE_830M = 0x1340,
CARD_NVIDIA_GEFORCE_840M = 0x1341,
CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */
CARD_NVIDIA_GEFORCE_GTX950 = 0x1402,
CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,