Changeset 39819 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

Timestamp:

Jan 20, 2012 1:12:27 PM (13 years ago)

Author:

vboxsync

Message:

wddm/3d: fix ie rendering with mesa nvidia drivers

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c (modified) (4 diffs)

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

@@ -885 +885 @@
 }
 
+#ifdef VBOX_WITH_WDDM
+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)
+{
+    if (card_vendor != HW_VENDOR_NVIDIA) return FALSE;
+    if (gl_vendor != GL_VENDOR_MESA) return FALSE;
+    return TRUE;
+}
+
+static void quirk_no_shader_3(struct wined3d_gl_info *gl_info)
+{
+    int vs_selected_mode, ps_selected_mode;
+    select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode);
+    if (vs_selected_mode != SHADER_GLSL && ps_selected_mode != SHADER_GLSL)
+        return;
+
+    gl_info->limits.arb_ps_instructions = 512;
+}
+#endif
+
 struct driver_quirk
 {
@@ -974 +994 @@
         "Fullsize blit"
     },
+#ifdef VBOX_WITH_WDDM
+    {
+            match_mesa_nvidia,
+            quirk_no_shader_3,
+            "disable shader 3 support"
+    },
+#endif
 };
 
@@ -1943 +1970 @@
 {
     FIXME_(d3d_caps)("Card selection not handled for Mesa Nouveau driver\n");
+#ifndef VBOX_WITH_WDDM
     if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600;
+#else
+    /* tmp work around to disable quirk_no_np2 quirk for mesa drivers */
+    if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE_6200;
+#endif
     if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3;
     if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE;
@@ -2056 +2088 @@
      * them a good generic choice. */
     *card_vendor = HW_VENDOR_NVIDIA;
+#ifndef VBOX_WITH_WDDM
     if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600;
+#else
+    /* tmp work around to disable quirk_no_np2 quirk for not-recognized drivers */
+    if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE_6200;
+#endif
+
     if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3;
     if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE;