From: Caron Wills Subject: [PATCH] wined3d: Add Nvidia GeForce 820M Message-Id: Date: Wed, 6 Apr 2016 14:06:54 +0000 for bug 40348 Signed-off-by: Caron Wills --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02fb587..749a328 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1285,6 +1285,7 @@ static const struct gpu_description gpu_description_table[] = {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_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_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}, @@ -1749,6 +1750,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 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ @@ -2114,6 +2116,7 @@ cards_nvidia_mesa[] = {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, + {"NVD7", CARD_NVIDIA_GEFORCE_820M}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96bcf6b..7f384a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1788,6 +1788,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, -- 1.9.1

for bug 40348

 

Signed-off-by: Caron Wills <caron@codeweavers.com>

---

dlls/wined3d/directx.c         | 3 +++

dlls/wined3d/wined3d_private.h | 1 +

2 files changed, 4 insertions(+)

 

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c

index 02fb587..749a328 100644

--- a/dlls/wined3d/directx.c

+++ b/dlls/wined3d/directx.c

@@ -1285,6 +1285,7 @@ static const struct gpu_description gpu_description_table[] =

     {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_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_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},

@@ -1749,6 +1750,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 820M",                CARD_NVIDIA_GEFORCE_820M},      /* GeForce 800 - mobile */

     {"GTX 780 Ti",                  CARD_NVIDIA_GEFORCE_GTX780TI},  /* Geforce 700 - highend */

     {"GTX TITAN Black",             CARD_NVIDIA_GEFORCE_GTXTITAN},  /* Geforce 700 - highend */

     {"GTX 780",                     CARD_NVIDIA_GEFORCE_GTX780},    /* Geforce 700 - highend */

@@ -2114,6 +2116,7 @@ cards_nvidia_mesa[] =

     {"NVE4",                        CARD_NVIDIA_GEFORCE_GTX680},

     /* Fermi */

     {"NVD9",                        CARD_NVIDIA_GEFORCE_GT520},

+    {"NVD7",                        CARD_NVIDIA_GEFORCE_820M},

     {"NVCF",                        CARD_NVIDIA_GEFORCE_GTX550},

     {"NVCE",                        CARD_NVIDIA_GEFORCE_GTX560},

     {"NVC8",                        CARD_NVIDIA_GEFORCE_GTX570},

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h

index 96bcf6b..7f384a0 100644

--- a/dlls/wined3d/wined3d_private.h

+++ b/dlls/wined3d/wined3d_private.h

@@ -1788,6 +1788,7 @@ enum wined3d_pci_device

     CARD_NVIDIA_GEFORCE_GTX780      = 0x1004,

     CARD_NVIDIA_GEFORCE_GTX780TI    = 0x100a,

     CARD_NVIDIA_GEFORCE_GTXTITAN    = 0x100c,

+    CARD_NVIDIA_GEFORCE_820M        = 0x0fed,

     CARD_NVIDIA_GEFORCE_GTX860M     = 0x1392, /* Other PCI ID 0x119a */

     CARD_NVIDIA_GEFORCE_GTX950      = 0x1402,

     CARD_NVIDIA_GEFORCE_GTX950M     = 0x139a,

--

1.9.1