Marcus Meissner : wined3d: Detect nouveau as NVIDIA.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: acf0b329f84a21ed19eeff772ca1c9787ad4929e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=acf0b329f84a21ed19eeff772c...

Author: Marcus Meissner <marcus(a)jet.franken.de>
Date:   Mon Nov 29 10:28:21 2010 +0100

wined3d: Detect nouveau as NVIDIA.
(cherry picked from commit 5d657bfdba3262d0b4af147fd4f660a104bbe52e)

---

 dlls/wined3d/directx.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 81e7561..81f09c9 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1233,7 +1233,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl
 
 static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer)
 {
-    if (strstr(gl_vendor_string, "NVIDIA"))
+    if (strstr(gl_vendor_string, "NVIDIA")
+            || strstr(gl_vendor_string, "nouveau"))
         return HW_VENDOR_NVIDIA;
 
     if (strstr(gl_vendor_string, "ATI")