Changeset 40481 in vbox for trunk

Timestamp:

Mar 15, 2012 2:18:38 PM (13 years ago)

Author:

vboxsync

Message:

wined3d: shared resource cleanup fixes

Location:

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

Files:

• cubetexture.c (modified) (2 diffs)
• surface.c (modified) (2 diffs)
• texture.c (modified) (2 diffs)

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

@@ -248 +248 @@
 static HRESULT WINAPI IWineD3DCubeTextureImpl_SetShRcState(IWineD3DCubeTexture *iface, VBOXWINEEX_SHRC_STATE enmState) {
     IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl*)iface;
+    struct wined3d_context *context = NULL;
     HRESULT hr = IWineD3DResourceImpl_SetShRcState((IWineD3DResource*)iface, enmState);
     unsigned int i, j;
@@ -266 +267 @@
     }
 
+    if (!This->resource.device->isInDraw)
+    {
+        context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD);
+        if (!context)
+        {
+            ERR("zero context!");
+            return E_FAIL;
+        }
+
+        if (!context->valid)
+        {
+            ERR("context invalid!");
+            context_release(context);
+            return E_FAIL;
+        }
+    }
+
     device_cleanup_durtify_texture_target(This->resource.device, ((IWineD3DSurfaceImpl*)This->surfaces[j][i])->texture_target);
+
+    if (context)
+        context_release(context);
 
     return WINED3D_OK;

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

@@ -5353 +5353 @@
     IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl*)iface;
     IWineD3DBaseTextureImpl *texture = NULL;
+    struct wined3d_context *context = NULL;
     HRESULT hr;
     unsigned int i;
@@ -5392 +5393 @@
 
     if (!texture)
+    {
+        if (!This->resource.device->isInDraw)
+        {
+            context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD);
+            if (!context)
+            {
+                ERR("zero context!");
+                return E_FAIL;
+            }
+
+            if (!context->valid)
+            {
+                ERR("context invalid!");
+                context_release(context);
+                return E_FAIL;
+            }
+        }
+
         device_cleanup_durtify_texture_target(This->resource.device, This->texture_target);
+
+        if (context)
+            context_release(context);
+    }
 
     return WINED3D_OK;

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

@@ -234 +234 @@
 static HRESULT WINAPI IWineD3DTextureImpl_SetShRcState(IWineD3DTexture *iface, VBOXWINEEX_SHRC_STATE enmState) {
     IWineD3DTextureImpl *This = (IWineD3DTextureImpl*)iface;
+    struct wined3d_context *context = NULL;
     HRESULT hr = IWineD3DResourceImpl_SetShRcState((IWineD3DResource*)iface, enmState);
     unsigned int i;
@@ -252 +253 @@
     }
 
+    if (!This->resource.device->isInDraw)
+    {
+        context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD);
+        if (!context)
+        {
+            ERR("zero context!");
+            return E_FAIL;
+        }
+
+        if (!context->valid)
+        {
+            ERR("context invalid!");
+            context_release(context);
+            return E_FAIL;
+        }
+    }
+
     device_cleanup_durtify_texture_target(This->resource.device, This->target);
+
+    if (context)
+        context_release(context);
 
     return WINED3D_OK;