Bruno Jesus : wined3d: Recognize GeForce 940M.
Alexandre Julliard
julliard at winehq.org
Thu Apr 20 12:35:13 CDT 2017
Module: wine
Branch: stable
Commit: 60c228d79960478b1ed72a44e3d7374efa21f9c0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c228d79960478b1ed72a44e3d7374efa21f9c0
Author: Bruno Jesus <00cpxxx at gmail.com>
Date: Mon Mar 13 11:09:28 2017 -0300
wined3d: Recognize GeForce 940M.
Signed-off-by: Bruno Jesus <bjesus 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 992dcc4db520e83750a06e72588303b46840ab1e)
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 f0f1bfb..7954248 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1320,6 +1320,7 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096},
+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_940M, "NVIDIA GeForce 940M", DRIVER_NVIDIA_GEFORCE8, 4096},
{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},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096},
@@ -1828,6 +1829,7 @@ cards_nvidia_binary[] =
{"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */
{"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */
{"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */
+ {"GeForce 940M", CARD_NVIDIA_GEFORCE_940M}, /* GeForce 900 - midend mobile */
{"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */
{"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */
{"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 983d9f1..2fb410b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2019,6 +2019,7 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */
CARD_NVIDIA_GEFORCE_GTX870M = 0x1199,
CARD_NVIDIA_GEFORCE_GTX880M = 0x1198,
+ CARD_NVIDIA_GEFORCE_940M = 0x1347,
CARD_NVIDIA_GEFORCE_GTX950 = 0x1402,
CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,
CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,
More information about the wine-cvs
mailing list