[PATCH] wined3d: correctly guess_card_vendor() for gallium r600 drivers

[Brian Paterni]

On Sun, Nov 07, 2010 at 06:48:22PM -0800, Austin English wrote:
> Howdy Brian,
> 
> You're mixing tabs and spaces. Please use consistent spacing, as the
> rest of the file does.

Indeed, I was wondering about that... Also, I realized after submitting my
previous email that checking for "X.Org" in gl_vendor_string is probably
unnecessary as well, so I removed that portion from the following:

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 32d2431..fa5b5cb 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1373,11 +1373,10 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s
     if (strstr(gl_vendor_string, "ATI")
             || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.")
             || strstr(gl_vendor_string, "X.Org R300 Project")
+            || strstr(gl_renderer, "AMD")
             || strstr(gl_renderer, "R100")
             || strstr(gl_renderer, "R200")
-            || strstr(gl_renderer, "R300")
-            || strstr(gl_renderer, "R600")
-            || strstr(gl_renderer, "R700"))
+            || strstr(gl_renderer, "R300"))
         return HW_VENDOR_ATI;
 
     if (strstr(gl_vendor_string, "Intel(R)")
-- 
1.7.2.3