Changeset 37873 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 11, 2011 2:33:28 PM (14 years ago)

Author:

vboxsync

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

72771

Message:

wddm/wine: do not delete openned shared resource

Location:

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

Files:

• basetexture.c (modified) (1 diff)
• device.c (modified) (1 diff)
• surface.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/basetexture.c ¶

@@ -112 +112 @@
     IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface;
     IWineD3DDeviceImpl *device = This->resource.device;
-    struct wined3d_context *context = NULL;
-
-    if (This->baseTexture.texture_rgb.name || This->baseTexture.texture_srgb.name)
-    {
-        context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
-    }
-
-    if(This->baseTexture.texture_rgb.name) {
-        gltexture_delete(&This->baseTexture.texture_rgb);
-    }
-    if(This->baseTexture.texture_srgb.name) {
-        gltexture_delete(&This->baseTexture.texture_srgb);
-    }
-
-    if (context) context_release(context);
+
+#ifdef VBOX_WITH_WDDM
+    if (VBOXSHRC_IS_SHARED_OPENED(This))
+    {
+        This->baseTexture.texture_rgb.name = 0;
+        This->baseTexture.texture_srgb.name = 0;
+    }
+    else
+#endif
+    {
+        struct wined3d_context *context = NULL;
+        if (This->baseTexture.texture_rgb.name || This->baseTexture.texture_srgb.name)
+        {
+            context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+        }
+
+        if(This->baseTexture.texture_rgb.name) {
+            gltexture_delete(&This->baseTexture.texture_rgb);
+        }
+        if(This->baseTexture.texture_srgb.name) {
+            gltexture_delete(&This->baseTexture.texture_srgb);
+        }
+
+        if (context) context_release(context);
+    }
 
     This->baseTexture.texture_rgb.dirty = TRUE;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c ¶

@@ -6268 +6268 @@
     if (surface->texture_name)
     {
-        struct wined3d_context *context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
-        ENTER_GL();
-        glDeleteTextures(1, &surface->texture_name);
-        LEAVE_GL();
-        context_release(context);
+#ifdef VBOX_WITH_WDDM
+# ifdef DEBUG_misha
+        /* shared case needs testing! */
+        Assert(!VBOXSHRC_IS_SHARED(surface));
+# endif
+        if (!VBOXSHRC_IS_SHARED_OPENED(surface))
+#endif
+        {
+            struct wined3d_context *context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+            ENTER_GL();
+            glDeleteTextures(1, &surface->texture_name);
+            LEAVE_GL();
+            context_release(context);
+        }
         surface->texture_name = 0;
         surface->Flags &= ~SFLAG_CLIENT;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c ¶

@@ -98 +98 @@
     ENTER_GL();
 
-    if (This->texture_name)
+    if (This->texture_name
+#ifdef VBOX_WITH_WDDM
+            && !VBOXSHRC_IS_SHARED_OPENED(This)
+#endif
+            )
     {
         /* Release the OpenGL texture. */
@@ -1407 +1411 @@
     if(!texture) {
         ENTER_GL();
-        glDeleteTextures(1, &This->texture_name);
+#ifdef VBOX_WITH_WDDM
+        if (!VBOXSHRC_IS_SHARED_OPENED(This))
+#endif
+            glDeleteTextures(1, &This->texture_name);
         This->texture_name = 0;
-        glDeleteTextures(1, &This->texture_name_srgb);
+#ifdef VBOX_WITH_WDDM
+        if (!VBOXSHRC_IS_SHARED_OPENED(This))
+#endif
+            glDeleteTextures(1, &This->texture_name_srgb);
         This->texture_name_srgb = 0;
         LEAVE_GL();