Henri Verbeet : wined3d: Recognize any "X.Org" GL vendor as Mesa.

Alexandre Julliard julliard at winehq.org
Thu Jan 3 13:31:14 CST 2013


Module: wine
Branch: master
Commit: 85d12b320c24720c3af172e3d784222ca58f26d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=85d12b320c24720c3af172e3d784222ca58f26d6

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jan  3 11:56:25 2013 +0100

wined3d: Recognize any "X.Org" GL vendor as Mesa.

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ecebfa4..d541f4d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1411,9 +1411,9 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in
         return GL_VENDOR_INTEL;
 
     if (strstr(gl_vendor_string, "Mesa")
+            || strstr(gl_vendor_string, "X.Org")
             || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.")
             || strstr(gl_vendor_string, "DRI R300 Project")
-            || strstr(gl_vendor_string, "X.Org R300 Project")
             || strstr(gl_vendor_string, "Tungsten Graphics, Inc")
             || strstr(gl_vendor_string, "VMware, Inc.")
             || strstr(gl_renderer, "Mesa")




More information about the wine-cvs mailing list