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

Timestamp:

Jun 17, 2013 10:11:35 AM (12 years ago)

Author:

vboxsync

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

86454

Message:

wine: fix texture cleanup

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• Makefile.kmk (modified) (1 diff)
• wined3d/texture.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

@@ -171 +171 @@
         VBOX_WITH_WINE_FIX_PBOPSM \
         VBOX_WITH_WINE_FIX_INITCLEAR \
+        VBOX_WITH_WINE_FIX_TEXCLEAR \
         VBOX_WITH_WINE_DBG
 #wined3d_DEFS        += VBOX_WITH_WINE_FIXES

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/texture.c

@@ -139 +139 @@
     TRACE("texture %p.\n", texture);
 
+#ifdef VBOX_WITH_WINE_FIX_TEXCLEAR
+    /* make texture unload first, because otherwise we may fail on context_acquire done for texture cleanup
+     * because the swapchain's surfaces might be destroyed and we may fail to select any render target in context_acquire */
+    wined3d_texture_unload(texture);
+#endif
+
     for (i = 0; i < sub_count; ++i)
     {
@@ -147 +153 @@
     }
 
+#ifndef VBOX_WITH_WINE_FIX_TEXCLEAR
     wined3d_texture_unload(texture);
+#endif
     HeapFree(GetProcessHeap(), 0, texture->sub_resources);
     resource_cleanup(&texture->resource);