Caron Wills : wined3d: Add Nvidia GeForce GTX 850M.
Alexandre Julliard
julliard at winehq.org
Thu Jun 16 03:45:40 CDT 2016
Module: wine
Branch: stable
Commit: b4ee32929c077567ef10f322d06bd9d1762e9168
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ee32929c077567ef10f322d06bd9d1762e9168
Author: Caron Wills <caron at codeweavers.com>
Date: Tue Apr 19 19:33:49 2016 +0000
wined3d: Add Nvidia GeForce GTX 850M.
Signed-off-by: Caron Wills <caron at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit e44e6b2244154c9e00f48179737c2b5d1e328201)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/wined3d/directx.c | 2 ++
dlls/wined3d/wined3d_private.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 2edfb7c..55a5b68 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1283,6 +1283,7 @@ static const struct gpu_description gpu_description_table[] =
{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_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048},
+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", 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},
@@ -1738,6 +1739,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 */
+ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */
{"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */
{"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */
{"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 381de33..de7256a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1628,6 +1628,7 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_830M = 0x1340,
CARD_NVIDIA_GEFORCE_840M = 0x1341,
CARD_NVIDIA_GEFORCE_845M = 0x1344,
+ CARD_NVIDIA_GEFORCE_GTX850M = 0x1391,
CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */
CARD_NVIDIA_GEFORCE_GTX950 = 0x1402,
CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,
More information about the wine-cvs
mailing list