[PATCH 4/4] wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_released().

Henri Verbeet hverbeet at codeweavers.com
Sun Jan 16 16:36:47 CST 2011


---
 dlls/wined3d/context.c         |    3 ++-
 dlls/wined3d/device.c          |    2 +-
 dlls/wined3d/wined3d_private.h |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 8edcf66..c001577 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -689,7 +689,8 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context,
     list_add_head(&context->fbo_destroy_list, &entry->entry);
 }
 
-void context_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type)
+void context_resource_released(struct IWineD3DDeviceImpl *device,
+        struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type)
 {
     if (!device->d3d_initialized) return;
 
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 2008aee..a225e53 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6609,7 +6609,7 @@ void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3D
 
     TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type));
 
-    context_resource_released(device, (IWineD3DResource *)resource, type);
+    context_resource_released(device, resource, type);
 
     switch (type)
     {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index bed2aa9..8dcb461 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1228,8 +1228,8 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPE
 struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN;
 DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN;
 void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN;
-void context_resource_released(IWineD3DDeviceImpl *device,
-        IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;
+void context_resource_released(struct IWineD3DDeviceImpl *device,
+        struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;
 void context_resource_unloaded(IWineD3DDeviceImpl *device,
         IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;
 BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN;
-- 
1.7.3.4




More information about the wine-patches mailing list