ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_released().

This commit is contained in:
Henri Verbeet 2011-01-16 23:36:46 +01:00 committed by Alexandre Julliard
parent 852ac57db6
commit 834b599e19
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/device.c
View File

@ -6602,14 +6602,14 @@ static void device_resource_remove(struct IWineD3DDeviceImpl *device, struct IWi
list_remove(&resource->resource.resource_list_entry); list_remove(&resource->resource.resource_list_entry);
} }
void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource) void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource)
{ {
WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource); WINED3DRESOURCETYPE type = IWineD3DResource_GetType((IWineD3DResource *)resource);
unsigned int i; unsigned int i;
TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type));
context_resource_released(device, resource, type); context_resource_released(device, (IWineD3DResource *)resource, type);
switch (type) switch (type)
{ {
@ -6696,7 +6696,7 @@ void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *reso
} }
/* Remove the resource from the resourceStore */ /* Remove the resource from the resourceStore */
device_resource_remove(device, (IWineD3DResourceImpl *)resource); device_resource_remove(device, resource);
TRACE("Resource released.\n"); TRACE("Resource released.\n");
} }

2
dlls/wined3d/resource.c
View File

@ -120,7 +120,7 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource)
resource->resource.heapMemory = 0; resource->resource.heapMemory = 0;
if (resource->resource.device) if (resource->resource.device)
device_resource_released(resource->resource.device, (IWineD3DResource *)resource); device_resource_released(resource->resource.device, resource);
} }
void resource_unload(IWineD3DResourceImpl *resource) void resource_unload(IWineD3DResourceImpl *resource)

2
dlls/wined3d/wined3d_private.h
View File

@ -1784,7 +1784,7 @@ void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN;
LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode,
UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
void device_resource_add(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; void device_resource_add(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;
void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;
void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, void device_stream_info_from_declaration(IWineD3DDeviceImpl *This,
BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN;
void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context, void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context,