Changeset 41109 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c

Timestamp:

May 2, 2012 8:37:46 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL,wined3d,wddm: second part of fixing resource leakage, basics for cr commands submission from r0 miniport driver (for r0 visible region reporting, WPF 3D rendering fixes w/o Aero, etc.)

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c (modified) (1 diff)

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

@@ -6279 +6279 @@
     if (surface->texture_name)
     {
-#ifdef VBOX_WITH_WDDM
-# ifdef DEBUG_misha
-        /* shared case needs testing! */
-        Assert(!VBOXSHRC_IS_SHARED(surface));
-# endif
-        if (VBOXSHRC_CAN_DELETE(device, surface))
-#endif
-        {
-            struct wined3d_context *context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
-            ENTER_GL();
-            glDeleteTextures(1, &surface->texture_name);
-            LEAVE_GL();
-            context_release(context);
-        }
+        IWineD3DDeviceImpl *This = device; /* <- to make the below texture_gl_delete macro work and avoid other modifications */
+        struct wined3d_context *context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD);
+        ENTER_GL();
+        texture_gl_delete(surface, surface->texture_name);
+        LEAVE_GL();
+        context_release(context);
         surface->texture_name = 0;
         surface->Flags &= ~SFLAG_CLIENT;