[PATCH] wined3d: detect nouveau as NVIDIA

Marcus Meissner marcus at jet.franken.de
Mon Nov 29 03:28:21 CST 2010


Hi,

Fix:
fixme:d3d_caps:wined3d_guess_card_vendor Received unrecognized GL_VENDOR "nouveau". Returning HW_VENDOR_NVIDIA.

Ciao, Marcus
---
 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 8a832bf..742627d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1373,7 +1373,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")
-- 
1.7.1



More information about the wine-patches mailing list