Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_unloaded().

Alexandre Julliard julliard at winehq.org
Tue Jan 18 10:27:33 CST 2011


Module: wine
Branch: master
Commit: 2ceb2a8cdd2c79b40b3d3a65ad5bb0d4b9d73965
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2ceb2a8cdd2c79b40b3d3a65ad5bb0d4b9d73965

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Jan 17 18:49:28 2011 +0100

wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_unloaded().

---

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

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index c001577..40fd2e3 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -711,7 +711,8 @@ static void context_detach_fbo_entry(struct wined3d_context *context, struct fbo
     entry->attached = FALSE;
 }
 
-void context_resource_unloaded(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type)
+void context_resource_unloaded(struct IWineD3DDeviceImpl *device,
+        struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type)
 {
     switch (type)
     {
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 370861e..623706f 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -125,8 +125,8 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource)
 
 void resource_unload(IWineD3DResourceImpl *resource)
 {
-    context_resource_unloaded(resource->resource.device, (IWineD3DResource *)resource,
-            resource->resource.resourceType);
+    context_resource_unloaded(resource->resource.device,
+            resource, resource->resource.resourceType);
 }
 
 static struct private_data *resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8dcb461..fb39dad 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1230,8 +1230,8 @@ DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN;
 void context_release(struct wined3d_context *context) 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;
+void context_resource_unloaded(struct IWineD3DDeviceImpl *device,
+        struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;
 BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN;
 void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN;
 void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN;




More information about the wine-cvs mailing list