Rob Walker : wined3d: Add Nvidia GPU SKUs 950,950M,960,960M.
Alexandre Julliard
julliard at winehq.org
Thu Jun 16 03:45:39 CDT 2016
Module: wine
Branch: stable
Commit: 509ab1c561ef832f90892e45996ac817585dfd3a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=509ab1c561ef832f90892e45996ac817585dfd3a
Author: Rob Walker <bob.mt.wya at gmail.com>
Date: Sat Mar 19 12:31:25 2016 +0000
wined3d: Add Nvidia GPU SKUs 950,950M,960,960M.
Signed-off-by: Rob Walker <bob.mt.wya at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit e4c75a88fde88a1f7d1bca38a18eb91c80dbbd77)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/wined3d/directx.c | 8 ++++++++
dlls/wined3d/wined3d_private.h | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index eb414cc..a5b36e4 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1276,6 +1276,10 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072},
+ {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},
+ {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096},
{HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072},
@@ -1719,6 +1723,10 @@ cards_nvidia_binary[] =
/* Direct 3D 11 */
{"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/
{"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */
+ {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */
+ {"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 */
{"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */
{"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */
{"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 70857c9..fdf5457 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1621,6 +1621,10 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_GTX770 = 0x1184,
CARD_NVIDIA_GEFORCE_GTX780 = 0x1004,
CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a,
+ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402,
+ CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,
+ CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,
+ CARD_NVIDIA_GEFORCE_GTX960M = 0x139B,
CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2,
CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8,
More information about the wine-cvs
mailing list