Henri Verbeet : wined3d: Rename HW_VENDOR_WINE to HW_VENDOR_SOFTWARE.

Alexandre Julliard julliard at winehq.org
Mon Apr 5 11:22:58 CDT 2010


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Apr  4 19:51:40 2010 +0200

wined3d: Rename HW_VENDOR_WINE to HW_VENDOR_SOFTWARE.

Software adapters like the refrast also return a 0 PCI ID on Windows.

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 1513425..b67ede8 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1238,7 +1238,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s
     if (strstr(gl_vendor_string, "Mesa")
             || strstr(gl_vendor_string, "Tungsten Graphics, Inc")
             || strstr(gl_vendor_string, "VMware, Inc."))
-        return HW_VENDOR_WINE;
+        return HW_VENDOR_SOFTWARE;
 
     FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_NVIDIA.\n", debugstr_a(gl_vendor_string));
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index de2a6af..6f894d2 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1270,7 +1270,7 @@ enum wined3d_gl_vendor
 
 enum wined3d_pci_vendor
 {
-    HW_VENDOR_WINE                     = 0x0000,
+    HW_VENDOR_SOFTWARE                 = 0x0000,
     HW_VENDOR_ATI                      = 0x1002,
     HW_VENDOR_NVIDIA                   = 0x10de,
     HW_VENDOR_INTEL                    = 0x8086,




More information about the wine-cvs mailing list