[PATCH 4/4] wined3d: Get rid of some redundant local variables.
Henri Verbeet
hverbeet at codeweavers.com
Mon Dec 21 16:17:26 CST 2009
E.g. "This" variables that are only used in traces.
---
dlls/wined3d/basetexture.c | 6 +--
dlls/wined3d/clipper.c | 7 ++--
dlls/wined3d/cubetexture.c | 12 +++---
dlls/wined3d/device.c | 76 ++++++++++++++++++++++-------------------
dlls/wined3d/directx.c | 43 ++++++++++-------------
dlls/wined3d/drawprim.c | 6 +--
dlls/wined3d/query.c | 11 ++++--
dlls/wined3d/surface_base.c | 9 ++---
dlls/wined3d/swapchain_base.c | 3 +-
dlls/wined3d/volumetexture.c | 21 ++++++-----
10 files changed, 96 insertions(+), 98 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index f232bf3..e671ec4 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -206,10 +206,8 @@ WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture
void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface)
{
- IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
- /* TODO: implement filters using GL_SGI_generate_mipmaps http://oss.sgi.com/projects/ogl-sample/registry/SGIS/generate_mipmap.txt */
- FIXME("(%p) : stub\n", This);
- return ;
+ /* TODO: Implement filters using GL_SGI_generate_mipmaps. */
+ FIXME("iface %p stub!\n", iface);
}
BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty)
diff --git a/dlls/wined3d/clipper.c b/dlls/wined3d/clipper.c
index febd92b..8be3a95 100644
--- a/dlls/wined3d/clipper.c
+++ b/dlls/wined3d/clipper.c
@@ -144,11 +144,11 @@ static HRESULT WINAPI IWineD3DClipperImpl_GetClipList(IWineD3DClipper *iface, co
static HRESULT WINAPI IWineD3DClipperImpl_SetClipList(IWineD3DClipper *iface, const RGNDATA *rgn, DWORD Flags)
{
- IWineD3DClipperImpl *This = (IWineD3DClipperImpl *)iface;
static int warned = 0;
if (warned++ < 10 || rgn == NULL)
- FIXME("(%p,%p,%d),stub!\n",This,rgn,Flags);
+ FIXME("iface %p, region %p, flags %#x stub!\n", iface, rgn, Flags);
+
return WINED3D_OK;
}
@@ -163,8 +163,7 @@ static HRESULT WINAPI IWineD3DClipperImpl_GetHwnd(IWineD3DClipper *iface, HWND *
static HRESULT WINAPI IWineD3DClipperImpl_IsClipListChanged(IWineD3DClipper *iface, BOOL *changed)
{
- IWineD3DClipperImpl *This = (IWineD3DClipperImpl *)iface;
- FIXME("(%p)->(%p),stub!\n",This,changed);
+ FIXME("iface %p, changed %p stub!\n", iface, changed);
/* XXX What is safest? */
*changed = FALSE;
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index 9d173d6..c5fa6ba 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -297,16 +297,16 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i
return hr;
}
-static UINT WINAPI IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface){
- IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface;
- TRACE("(%p)\n", This);
+static UINT WINAPI IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface)
+{
+ TRACE("iface %p.\n", iface);
return GL_TEXTURE_CUBE_MAP_ARB;
}
-static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) {
- IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface;
- TRACE("(%p)\n", This);
+static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface)
+{
+ TRACE("iface %p.\n", iface);
return FALSE;
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1c0f43e..8c3ff4a 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4169,14 +4169,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndScene(IWineD3DDevice *iface)
}
static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface,
- CONST RECT* pSourceRect, CONST RECT* pDestRect,
- HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
+ const RECT *pSourceRect, const RECT *pDestRect,
+ HWND hDestWindowOverride, const RGNDATA *pDirtyRegion)
+{
IWineD3DSwapChain *swapChain = NULL;
int i;
int swapchains = IWineD3DDeviceImpl_GetNumberOfSwapChains(iface);
- TRACE("(%p) Presenting the frame\n", This);
+ TRACE("iface %p.\n", iface);
for(i = 0 ; i < swapchains ; i ++) {
@@ -4631,15 +4631,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided(IWineD3DDev
return WINED3D_OK;
}
-static HRESULT IWineD3DDeviceImpl_UpdateVolume(IWineD3DDevice *iface, IWineD3DVolume *pSourceVolume, IWineD3DVolume *pDestinationVolume) {
- /* This is a helper function for UpdateTexture, there is no public UpdateVolume method in d3d. Since it's
- * not callable by the app directly no parameter validation checks are needed here.
- */
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
+/* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */
+static HRESULT IWineD3DDeviceImpl_UpdateVolume(IWineD3DDevice *iface,
+ IWineD3DVolume *pSourceVolume, IWineD3DVolume *pDestinationVolume)
+{
WINED3DLOCKED_BOX src;
WINED3DLOCKED_BOX dst;
HRESULT hr;
- TRACE("(%p)->(%p, %p)\n", This, pSourceVolume, pDestinationVolume);
+
+ TRACE("iface %p, src_volume %p, dst_volume %p.\n",
+ iface, pSourceVolume, pDestinationVolume);
/* TODO: Implement direct loading into the gl volume instead of using memcpy and
* dirtification to improve loading performance.
@@ -5003,25 +5004,25 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface,
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface, float nSegments) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
+static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface, float nSegments)
+{
static BOOL warned;
if(nSegments != 0.0f) {
if (!warned)
{
- FIXME("(%p) : stub nSegments(%f)\n", This, nSegments);
+ FIXME("iface %p, nSegments %.8e stub!\n", iface, nSegments);
warned = TRUE;
}
}
return WINED3D_OK;
}
-static float WINAPI IWineD3DDeviceImpl_GetNPatchMode(IWineD3DDevice *iface) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
+static float WINAPI IWineD3DDeviceImpl_GetNPatchMode(IWineD3DDevice *iface)
+{
static BOOL warned;
if (!warned)
{
- FIXME("(%p) : stub returning(%f)\n", This, 0.0f);
+ FIXME("iface %p stub!\n", iface);
warned = TRUE;
}
return 0.0f;
@@ -5281,10 +5282,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UI
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- TRACE("(%p) Handle(%d) noSegs(%p) tripatch(%p)\n", This, Handle, pNumSegs, pTriPatchInfo);
- FIXME("(%p) : Stub\n", This);
+static HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface,
+ UINT handle, const float *segment_count, const WINED3DTRIPATCH_INFO *patch_info)
+{
+ FIXME("iface %p, handle %#x, segment_count %p, patch_info %p stub!\n",
+ iface, handle, segment_count, patch_info);
+
return WINED3D_OK;
}
@@ -5488,11 +5491,13 @@ static inline DWORD argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) {
}
}
-static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
+static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface,
+ IWineD3DSurface *pSurface, const WINED3DRECT *pRect, WINED3DCOLOR color)
+{
IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface;
WINEDDBLTFX BltFx;
- TRACE("(%p) Colour fill Surface: %p rect: %p color: 0x%08x\n", This, pSurface, pRect, color);
+
+ TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, pSurface, pRect, color);
if (surface->resource.pool != WINED3DPOOL_DEFAULT && surface->resource.pool != WINED3DPOOL_SYSTEMMEM) {
FIXME("call to colorfill with non WINED3DPOOL_DEFAULT or WINED3DPOOL_SYSTEMMEM surface\n");
@@ -5585,14 +5590,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, IWineD3DSurface *Front, IWineD3DSurface *Back) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
+static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface,
+ IWineD3DSurface *Front, IWineD3DSurface *Back)
+{
IWineD3DSurfaceImpl *FrontImpl = (IWineD3DSurfaceImpl *) Front;
IWineD3DSurfaceImpl *BackImpl = (IWineD3DSurfaceImpl *) Back;
IWineD3DSwapChainImpl *Swapchain;
HRESULT hr;
- TRACE("(%p)->(%p,%p)\n", This, FrontImpl, BackImpl);
+ TRACE("iface %p, front %p, back %p.\n", iface, Front, Back);
hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &Swapchain);
if(hr != WINED3D_OK) {
@@ -6149,9 +6155,9 @@ static HRESULT WINAPI evict_managed_resource(IWineD3DResource *resource, void *d
return S_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice* iface) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
- TRACE("(%p)\n", This);
+static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice *iface)
+{
+ TRACE("iface %p.\n", iface);
IWineD3DDevice_EnumResources(iface, evict_managed_resource, NULL);
return WINED3D_OK;
@@ -6593,12 +6599,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
return hr;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_SetDialogBoxMode(IWineD3DDevice *iface, BOOL bEnableDialogs) {
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- /** FIXME: always true at the moment **/
- if(!bEnableDialogs) {
- FIXME("(%p) Dialogs cannot be disabled yet\n", This);
- }
+static HRESULT WINAPI IWineD3DDeviceImpl_SetDialogBoxMode(IWineD3DDevice *iface, BOOL enable_dialogs)
+{
+ TRACE("iface %p, enable_dialogs %#x.\n", iface, enable_dialogs);
+
+ if (!enable_dialogs) FIXME("Dialogs cannot be disabled yet.\n");
+
return WINED3D_OK;
}
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a29b90c..d0e6d3d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2167,9 +2167,10 @@ static UINT WINAPI IWineD3DImpl_GetAdapterCount (IWineD3D *iface) {
return This->adapter_count;
}
-static HRESULT WINAPI IWineD3DImpl_RegisterSoftwareDevice(IWineD3D *iface, void* pInitializeFunction) {
- IWineD3DImpl *This = (IWineD3DImpl *)iface;
- FIXME("(%p)->(%p): stub\n", This, pInitializeFunction);
+static HRESULT WINAPI IWineD3DImpl_RegisterSoftwareDevice(IWineD3D *iface, void *init_function)
+{
+ FIXME("iface %p, init_function %p stub!\n", iface, init_function);
+
return WINED3D_OK;
}
@@ -2309,9 +2310,9 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT Adapter, WINED3DDISPLAYMODE* pMode) {
- IWineD3DImpl *This = (IWineD3DImpl *)iface;
- TRACE_(d3d_caps)("(%p}->(Adapter: %d, pMode: %p)\n", This, Adapter, pMode);
+static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT Adapter, WINED3DDISPLAYMODE *pMode)
+{
+ TRACE("iface %p, adapter_idx %u, display_mode %p.\n", iface, Adapter, pMode);
if (NULL == pMode ||
Adapter >= IWineD3D_GetAdapterCount(iface)) {
@@ -2628,19 +2629,14 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U
}
static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,
- WINED3DFORMAT DisplayFormat, WINED3DFORMAT BackBufferFormat, BOOL Windowed) {
-
- IWineD3DImpl *This = (IWineD3DImpl *)iface;
+ WINED3DFORMAT DisplayFormat, WINED3DFORMAT BackBufferFormat, BOOL Windowed)
+{
HRESULT hr = WINED3DERR_NOTAVAILABLE;
UINT nmodes;
- TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, CheckType:(%x,%s), DispFmt:(%x,%s), BackBuf:(%x,%s), Win?%d): stub\n",
- This,
- Adapter,
- DeviceType, debug_d3ddevicetype(DeviceType),
- DisplayFormat, debug_d3dformat(DisplayFormat),
- BackBufferFormat, debug_d3dformat(BackBufferFormat),
- Windowed);
+ TRACE("iface %p, adapter_idx %u, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n",
+ iface, Adapter, debug_d3ddevicetype(DeviceType), debug_d3dformat(DisplayFormat),
+ debug_d3dformat(BackBufferFormat), Windowed);
if (Adapter >= IWineD3D_GetAdapterCount(iface)) {
WARN_(d3d_caps)("Adapter >= IWineD3D_GetAdapterCount(iface), returning WINED3DERR_INVALIDCALL\n");
@@ -3742,16 +3738,13 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
}
}
-static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,
- WINED3DFORMAT SourceFormat, WINED3DFORMAT TargetFormat) {
- IWineD3DImpl *This = (IWineD3DImpl *)iface;
+static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, UINT adapter_idx,
+ WINED3DDEVTYPE device_type, WINED3DFORMAT src_format, WINED3DFORMAT dst_format)
+{
+ FIXME("iface %p, adapter_idx %u, device_type %s, src_format %s, dst_format %s stub!\n",
+ iface, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(src_format),
+ debug_d3dformat(dst_format));
- FIXME_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%u,%s), SrcFmt:(%u,%s), TgtFmt:(%u,%s))\n",
- This,
- Adapter,
- DeviceType, debug_d3ddevicetype(DeviceType),
- SourceFormat, debug_d3dformat(SourceFormat),
- TargetFormat, debug_d3dformat(TargetFormat));
return WINED3D_OK;
}
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 2d30510..dbeb799 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -37,11 +37,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw);
static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
UINT count, UINT idx_size, const void *idx_data, UINT start_idx)
{
- IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
-
if (idx_size)
{
- TRACE("(%p) : glElements(%x, %d, ...)\n", This, primitive_type, count);
+ TRACE("(%p) : glElements(%x, %d, ...)\n", iface, primitive_type, count);
glDrawElements(primitive_type, count,
idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT,
@@ -50,7 +48,7 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
}
else
{
- TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", This, primitive_type, start_idx, count);
+ TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", iface, primitive_type, start_idx, count);
glDrawArrays(primitive_type, start_idx, count);
checkGLcall("glDrawArrays");
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index a8295cc..1280a3b 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -89,12 +89,15 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) {
/* *******************************************
IWineD3DQuery IWineD3DQuery parts follow
******************************************* */
-static HRESULT WINAPI IWineD3DQueryImpl_GetParent(IWineD3DQuery *iface, IUnknown** parent){
- IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
+static HRESULT WINAPI IWineD3DQueryImpl_GetParent(IWineD3DQuery *iface, IUnknown **parent)
+{
+ TRACE("iface %p, parent %p.\n", iface, parent);
- *parent= (IUnknown*) parent;
+ *parent = (IUnknown *)parent;
IUnknown_AddRef(*parent);
- TRACE("(%p) : returning %p\n", This, *parent);
+
+ TRACE("Returning %p.\n", *parent);
+
return WINED3D_OK;
}
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index dc29ad2..538add4 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -187,9 +187,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSU
return WINED3D_OK;
}
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) {
- IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
- TRACE("(%p)->(%x)\n", This, Flags);
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags)
+{
+ TRACE("iface %p, flags %#x.\n", iface, Flags);
switch (Flags)
{
@@ -397,9 +397,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface
HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref) {
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
- IWineD3DSurfaceImpl *RefImpl = (IWineD3DSurfaceImpl *) Ref;
- FIXME("(%p)->(%08x,%p) Stub!\n", This, Flags, RefImpl);
+ FIXME("iface %p, flags %#x, ref %p stub!\n", iface, Flags, Ref);
if(!(This->resource.usage & WINED3DUSAGE_OVERLAY))
{
diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c
index 3c8055e..4c0590e 100644
--- a/dlls/wined3d/swapchain_base.c
+++ b/dlls/wined3d/swapchain_base.c
@@ -121,14 +121,13 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface,
}
HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) {
- IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
static BOOL warned;
pRasterStatus->InVBlank = TRUE;
pRasterStatus->ScanLine = 0;
/* No openGL equivalent */
if (!warned)
{
- FIXME("(%p) : stub (once)\n", This);
+ FIXME("iface %p, raster_status %p stub!\n", iface, pRasterStatus);
warned = TRUE;
}
return WINED3D_OK;
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index e666e2c..14ca72f 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -224,22 +224,25 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_GetDirty(IWineD3DVolumeTexture *ifa
}
/* Context activation is done by the caller. */
-static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb) {
- IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
+static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb)
+{
BOOL dummy;
- TRACE("(%p) : relay to BaseTexture\n", This);
+
+ TRACE("iface %p, srgb %#x.\n", iface, srgb);
+
return basetexture_bind((IWineD3DBaseTexture *)iface, srgb, &dummy);
}
-static UINT WINAPI IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture *iface) {
- IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
- TRACE("(%p)\n", This);
+static UINT WINAPI IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture *iface)
+{
+ TRACE("iface %p.\n", iface);
+
return GL_TEXTURE_3D;
}
-static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *iface) {
- IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
- TRACE("(%p)\n", This);
+static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *iface)
+{
+ TRACE("iface %p.\n", iface);
return FALSE;
}
--
1.6.4.4
More information about the wine-patches
mailing list