Changeset 40647 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 26, 2012 2:06:24 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77077

Message:

wddm/wine: revert r76989 for future investigation

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• directx.c (modified) (4 diffs)
• wined3d_private.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

@@ -887 +887 @@
 
 #ifdef VBOX_WITH_WDDM
-static BOOL match_mesa_intel_hd(const struct wined3d_gl_info *gl_info, const char *gl_renderer,
-        enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device)
-{
-    if (card_vendor != HW_VENDOR_INTEL) return FALSE;
-    if (gl_vendor != GL_VENDOR_MESA) return FALSE;
-    if (device != CARD_INTEL_SBHD) return FALSE;
-    return TRUE;
-}
-
 static BOOL match_mesa_nvidia(const struct wined3d_gl_info *gl_info, const char *gl_renderer,
         enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device)
@@ -1006 +997 @@
 #ifdef VBOX_WITH_WDDM
     {
-        match_mesa_nvidia,
-        quirk_no_shader_3,
-        "disable shader 3 support"
-    },
-    {
-        match_mesa_intel_hd,
-        quirk_no_np2,
-        "disable np2 for mesa intel hd"
+            match_mesa_nvidia,
+            quirk_no_shader_3,
+            "disable shader 3 support"
     },
 #endif
@@ -1276 +1262 @@
             || strstr(gl_renderer, "Intel(R)")
             || strstr(gl_vendor_string, "Intel Inc."))
-    {
-#ifdef VBOX_WITH_WDDM
-        if (strstr(gl_renderer, "Mesa"))
-            return GL_VENDOR_MESA;
-#endif
         return GL_VENDOR_INTEL;
-    }
 
     if (strstr(gl_vendor_string, "Mesa")
@@ -2006 +1986 @@
         const char *gl_renderer, unsigned int *vidmem)
 {
-#ifdef VBOX_WITH_WDDM
-    if (strstr(gl_renderer, "Sandybridge"))
-        return CARD_INTEL_SBHD;
-#endif
     FIXME_(d3d_caps)("Card selection not handled for Mesa Intel driver\n");
     return CARD_INTEL_I915G;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

@@ -1441 +1441 @@
     CARD_INTEL_I945GM               = 0x27a2, /* Same as GMA 950? */
     CARD_INTEL_X3100                = 0x2a02, /* Found in Macs. Same as GMA 965? */
-    CARD_INTEL_SBHD                 = 0x0126, /* SundyBridge HD Desktop */
 };