Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority().
Module: wine Branch: master Commit: 2d9748b1e32a773b06a9ae97874784ccb604cf3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9748b1e32a773b06a9ae9787...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jan 7 10:16:39 2011 +0100
wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority().
---
dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 7 +++---- dlls/wined3d/surface_base.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cdcecf3..b80eac6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -785,7 +785,7 @@ static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD p
static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) { - return resource_get_priority((IWineD3DResource *)iface); + return resource_get_priority((IWineD3DResourceImpl *)iface); }
/* The caller provides a context and binds the buffer */ diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index c80e5ab..ef142a2 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -233,8 +233,9 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *ifa return resource_set_priority((IWineD3DResource *)iface, PriorityNew); }
-static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); }
/* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c211572..3d62de9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -259,11 +259,10 @@ DWORD resource_set_priority(IWineD3DResource *iface, DWORD PriorityNew) return PriorityOld; }
-DWORD resource_get_priority(IWineD3DResource *iface) +DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - TRACE("(%p) : returning %d\n", This, This->resource.priority ); - return This->resource.priority; + TRACE("resource %p, returning %u.\n", resource, resource->resource.priority); + return resource->resource.priority; }
WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 7ca5ba9..8035076 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -132,8 +132,9 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD return resource_set_priority((IWineD3DResource *)iface, PriorityNew); }
-DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) { - return resource_get_priority((IWineD3DResource *)iface); +DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); }
WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0697680..821db95 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -258,8 +258,9 @@ static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWOR return resource_set_priority((IWineD3DResource *)iface, PriorityNew); }
-static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); }
/* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9b37c07..f74a577 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -171,8 +171,9 @@ static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD return resource_set_priority((IWineD3DResource *)iface, PriorityNew); }
-static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); }
/* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 5cb67e8..5807d3f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -178,8 +178,9 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture return resource_set_priority((IWineD3DResource *)iface, PriorityNew); }
-static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); }
static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be7feb8..2e50f7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1830,7 +1830,7 @@ typedef struct IWineD3DResourceImpl
void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; -DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; +DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type,
-
Alexandre Julliard