=?UTF-8?Q?Filip=20Fr=C4=85ckiewicz=20?=: wined3d: Add NVIDIA GTX 690 ( GK104) to the GPU list.
Alexandre Julliard
julliard at winehq.org
Mon Dec 19 13:10:37 CST 2016
Module: wine
Branch: stable
Commit: 85f4168013b92f064a873ac58c37926d355fcbb5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f4168013b92f064a873ac58c37926d355fcbb5
Author: Filip Frąckiewicz <fjfrackiewicz at gmail.com>
Date: Thu Sep 22 05:56:42 2016 +0200
wined3d: Add NVIDIA GTX 690 (GK104) to the GPU list.
Signed-off-by: Filip Frąckiewicz <fjfrackiewicz 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 7c261059d4f676fd16f98275b3432e38089ed932)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/wined3d/directx.c | 4 +++-
dlls/wined3d/wined3d_private.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 3b0f32b..095e3cb 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1272,6 +1272,7 @@ static const struct 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_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_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048},
{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},
@@ -1787,6 +1788,7 @@ cards_nvidia_binary[] =
{"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */
{"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */
{"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */
+ {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */
{"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */
{"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */
{"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */
@@ -2149,7 +2151,7 @@ cards_nvidia_mesa[] =
{"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI},
{"NVF0", CARD_NVIDIA_GEFORCE_GTX780},
{"NVE6", CARD_NVIDIA_GEFORCE_GTX770M},
- {"NVE4", CARD_NVIDIA_GEFORCE_GTX680},
+ {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */
/* Fermi */
{"NVD9", CARD_NVIDIA_GEFORCE_GT520},
{"NVD7", CARD_NVIDIA_GEFORCE_820M},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 23d681b..5203e4a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1616,6 +1616,7 @@ enum wined3d_pci_device
CARD_NVIDIA_GEFORCE_GTX670 = 0x1189,
CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1,
CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,
+ CARD_NVIDIA_GEFORCE_GTX690 = 0x1188,
CARD_NVIDIA_GEFORCE_GT730 = 0x1287,
CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1,
CARD_NVIDIA_GEFORCE_GT740M = 0x1292,
More information about the wine-cvs
mailing list