wined3d: Add Nvidia GT 9700M

[Kim Malmo]

I posted this one to wine-patches, I realize I may have sent it to the 
wrong mailing list. I would probably want some feedback on this one, as 
it's basically a dirty hack I put together. Critisism welcome.

Posted here: 
https://www.winehq.org/pipermail/wine-patches/2016-April/149298.html

wined3d: Add Nvidia GT 9700M

Bug: https://bugs.winehq.org/show_bug.cgi?id=36031

---
  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 8358930..6b115d3 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1230,6 +1230,7 @@ static const struct gpu_description 
gpu_description_table[] =
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9400GT,     "NVIDIA 
GeForce 9400 GT",           DRIVER_NVIDIA_GEFORCE8,  256 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9500GT,     "NVIDIA 
GeForce 9500 GT",           DRIVER_NVIDIA_GEFORCE8,  256 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9600GT,     "NVIDIA 
GeForce 9600 GT",           DRIVER_NVIDIA_GEFORCE8,  384 },
+    {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9700M,      "NVIDIA 
GeForce 9700M",             DRIVER_NVIDIA_GEFORCE8,  512 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9800GT,     "NVIDIA 
GeForce 9800 GT",           DRIVER_NVIDIA_GEFORCE8,  512 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_210,        "NVIDIA 
GeForce 210",               DRIVER_NVIDIA_GEFORCE8,  512 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GT220,      "NVIDIA 
GeForce GT 220",            DRIVER_NVIDIA_GEFORCE8,  512 },
@@ -1819,6 +1820,7 @@ cards_nvidia_binary[] =
      {"GTS 150",                     CARD_NVIDIA_GEFORCE_9800GT}, /* 
Geforce 9 - highend / Geforce 200 - midend */
      {"9800",                        CARD_NVIDIA_GEFORCE_9800GT}, /* 
Geforce 9 - highend / Geforce 200 - midend */
      {"GT 140",                      CARD_NVIDIA_GEFORCE_9600GT}, /* 
Geforce 9 - midend */
+    {"9700M",                       CARD_NVIDIA_GEFORCE_9700M}, /* 
Geforce 9 - midend */
      {"9600",                        CARD_NVIDIA_GEFORCE_9600GT}, /* 
Geforce 9 - midend */
      {"GT 130",                      CARD_NVIDIA_GEFORCE_9500GT}, /* 
Geforce 9 - midend low / Geforce 200 - low */
      {"GT 120",                      CARD_NVIDIA_GEFORCE_9500GT}, /* 
Geforce 9 - midend low / Geforce 200 - low */
diff --git a/dlls/wined3d/wined3d_private.h 
b/dlls/wined3d/wined3d_private.h
index 24515da..95dd88b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1739,6 +1739,7 @@ enum wined3d_pci_device
      CARD_NVIDIA_GEFORCE_9400GT      = 0x042c,
      CARD_NVIDIA_GEFORCE_9500GT      = 0x0640,
      CARD_NVIDIA_GEFORCE_9600GT      = 0x0622,
+    CARD_NVIDIA_GEFORCE_9700M       = 0x064a,
      CARD_NVIDIA_GEFORCE_9800GT      = 0x0614,
      CARD_NVIDIA_GEFORCE_210         = 0x0a23,
      CARD_NVIDIA_GEFORCE_GT220       = 0x0a20,

[Caron Wills]

Actually, you sent it to the right place. There are some things you should have a look at that my eyes are drawn to.

First, when reviewed here, the patch has odd line breaks and spacing:

https://source.winehq.org/patches/data/121371

It's also missing your signed-off-by line. You can read about how to add that here:

https://wiki.winehq.org/Submitting_Patches

Your patch should come through clean and match the surrounding style. I had a patch accepted adding the same number of lines in the same general places, pay close attention to how the two differ in appearance:

https://source.winehq.org/patches/data/121336

I'm looking at those patches simply by going to this page to make sure everything "looks" okay:

https://source.winehq.org/patches/

Note the red "X" indicating the missing sign-off next to your patch.

You would do yourself many favors by using git send-email to send patches or in the very least, take a moment to create a patch and check it over once, twice, three times, before sending. I commit to my local tree and then I do:

git format-patch origin

and compare what's going on and then I make sure Wine still builds after my changes. I catch a lot of mistakes that way (like missing a comma...).

Thank you for sending a patch and following up on it. Others might have more feedback for you.

-Caron

-----Original Message-----
From: wine-devel [mailto:[e-mail]] On Behalf Of Kim Malmo
Sent: Monday, April 18, 2016 9:57 AM
To: [e-mail]
Subject: wined3d: Add Nvidia GT 9700M

I posted this one to wine-patches, I realize I may have sent it to the wrong mailing list. I would probably want some feedback on this one, as it's basically a dirty hack I put together. Critisism welcome.

Posted here: 
https://www.winehq.org/pipermail/wine-patches/2016-April/149298.html

wined3d: Add Nvidia GT 9700M

Bug: https://bugs.winehq.org/show_bug.cgi?id=36031

---
  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 8358930..6b115d3 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1230,6 +1230,7 @@ static const struct gpu_description gpu_description_table[] =
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9400GT,     "NVIDIA 
GeForce 9400 GT",           DRIVER_NVIDIA_GEFORCE8,  256 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9500GT,     "NVIDIA 
GeForce 9500 GT",           DRIVER_NVIDIA_GEFORCE8,  256 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9600GT,     "NVIDIA 
GeForce 9600 GT",           DRIVER_NVIDIA_GEFORCE8,  384 },
+    {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9700M,      "NVIDIA 
GeForce 9700M",             DRIVER_NVIDIA_GEFORCE8,  512 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9800GT,     "NVIDIA 
GeForce 9800 GT",           DRIVER_NVIDIA_GEFORCE8,  512 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_210,        "NVIDIA 
GeForce 210",               DRIVER_NVIDIA_GEFORCE8,  512 },
      {HW_VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GT220,      "NVIDIA 
GeForce GT 220",            DRIVER_NVIDIA_GEFORCE8,  512 },
@@ -1819,6 +1820,7 @@ cards_nvidia_binary[] =
      {"GTS 150",                     CARD_NVIDIA_GEFORCE_9800GT}, /* 
Geforce 9 - highend / Geforce 200 - midend */
      {"9800",                        CARD_NVIDIA_GEFORCE_9800GT}, /* 
Geforce 9 - highend / Geforce 200 - midend */
      {"GT 140",                      CARD_NVIDIA_GEFORCE_9600GT}, /* 
Geforce 9 - midend */
+    {"9700M",                       CARD_NVIDIA_GEFORCE_9700M}, /* 
Geforce 9 - midend */
      {"9600",                        CARD_NVIDIA_GEFORCE_9600GT}, /* 
Geforce 9 - midend */
      {"GT 130",                      CARD_NVIDIA_GEFORCE_9500GT}, /* 
Geforce 9 - midend low / Geforce 200 - low */
      {"GT 120",                      CARD_NVIDIA_GEFORCE_9500GT}, /* 
Geforce 9 - midend low / Geforce 200 - low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24515da..95dd88b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1739,6 +1739,7 @@ enum wined3d_pci_device
      CARD_NVIDIA_GEFORCE_9400GT      = 0x042c,
      CARD_NVIDIA_GEFORCE_9500GT      = 0x0640,
      CARD_NVIDIA_GEFORCE_9600GT      = 0x0622,
+    CARD_NVIDIA_GEFORCE_9700M       = 0x064a,
      CARD_NVIDIA_GEFORCE_9800GT      = 0x0614,
      CARD_NVIDIA_GEFORCE_210         = 0x0a23,
      CARD_NVIDIA_GEFORCE_GT220       = 0x0a20,
--
1.9.1