d3d: avoid implicit conversion warnings from identical enumeration types D3DPOOL and WINED3DPOOL (Clang)
Frédéric Delanoy
frederic.delanoy at gmail.com
Fri May 13 08:03:35 CDT 2011
Adding d3dpool_from_wined3dpool and wined3dpool_from_d3dpool conversion
functions instead of direct casts seems overkill for such straightforward conversions.
---
dlls/d3d8/buffer.c | 4 ++--
dlls/d3d8/cubetexture.c | 7 ++++---
dlls/d3d8/device.c | 2 +-
dlls/d3d8/surface.c | 2 +-
dlls/d3d8/texture.c | 7 ++++---
dlls/d3d8/volume.c | 2 +-
dlls/d3d8/volumetexture.c | 7 ++++---
dlls/d3d9/buffer.c | 4 ++--
dlls/d3d9/cubetexture.c | 6 +++---
dlls/d3d9/device.c | 4 ++--
dlls/d3d9/surface.c | 2 +-
dlls/d3d9/texture.c | 4 ++--
dlls/d3d9/volume.c | 2 +-
dlls/d3d9/volumetexture.c | 6 +++---
14 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c
index 978bdb7..618c224 100644
--- a/dlls/d3d8/buffer.c
+++ b/dlls/d3d8/buffer.c
@@ -221,7 +221,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D
desc->Type = D3DRTYPE_VERTEXBUFFER;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->FVF = buffer->fvf;
desc->Format = D3DFMT_VERTEXDATA;
@@ -486,7 +486,7 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3D
desc->Format = d3dformat_from_wined3dformat(buffer->format);
desc->Type = D3DRTYPE_INDEXBUFFER;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
return D3D_OK;
diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c
index 92ea2a2..c1250c9 100644
--- a/dlls/d3d8/cubetexture.c
+++ b/dlls/d3d8/cubetexture.c
@@ -270,7 +270,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->MultiSampleType = wined3d_desc.multisample_type;
desc->Width = wined3d_desc.width;
@@ -426,8 +426,9 @@ HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Imp
wined3d_mutex_lock();
hr = wined3d_texture_create_cube(device->WineD3DDevice, edge_length, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool, texture,
- &d3d8_cubetexture_wined3d_parent_ops, &texture->wined3d_texture);
+ usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format),
+ (WINED3DPOOL) pool, texture, &d3d8_cubetexture_wined3d_parent_ops,
+ &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
{
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 2e749e3..5e82d98 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2910,7 +2910,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen
hr = IDirect3DDevice8Impl_CreateSurface(This, width, height,
d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,
- (IDirect3DSurface8 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
+ (IDirect3DSurface8 **)&d3d_surface, usage, (D3DPOOL) pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
if (FAILED(hr))
{
ERR("(%p) CreateSurface failed, returning %#x\n", iface, hr);
diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c
index 96811bc..021f602 100644
--- a/dlls/d3d8/surface.c
+++ b/dlls/d3d8/surface.c
@@ -203,7 +203,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->MultiSampleType = wined3d_desc.multisample_type;
desc->Width = wined3d_desc.width;
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index f9dee5c..46c3668 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -267,7 +267,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->MultiSampleType = wined3d_desc.multisample_type;
desc->Width = wined3d_desc.width;
@@ -414,8 +414,9 @@ HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *devic
wined3d_mutex_lock();
hr = wined3d_texture_create_2d(device->WineD3DDevice, width, height, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool,
- texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture);
+ usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format),
+ (WINED3DPOOL) pool, texture, &d3d8_texture_wined3d_parent_ops,
+ &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
{
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index 3c0d8cc..bb394e8 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -202,7 +202,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->Width = wined3d_desc.width;
desc->Height = wined3d_desc.height;
diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c
index 91fd58c..f451822 100644
--- a/dlls/d3d8/volumetexture.c
+++ b/dlls/d3d8/volumetexture.c
@@ -267,7 +267,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->Width = wined3d_desc.width;
desc->Height = wined3d_desc.height;
@@ -402,8 +402,9 @@ HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice
wined3d_mutex_lock();
hr = wined3d_texture_create_3d(device->WineD3DDevice, width, height, depth, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool, texture,
- &d3d8_volumetexture_wined3d_parent_ops, &texture->wined3d_texture);
+ usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format),
+ (WINED3DPOOL) pool, texture, &d3d8_volumetexture_wined3d_parent_ops,
+ &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
{
diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 1cb84b4..30e196e 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -223,7 +223,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D
desc->Format = D3DFMT_VERTEXDATA;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->Type = D3DRTYPE_VERTEXBUFFER;
desc->FVF = buffer->fvf;
@@ -487,7 +487,7 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D
desc->Format = d3dformat_from_wined3dformat(buffer->format);
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Size = wined3d_desc.size;
desc->Type = D3DRTYPE_INDEXBUFFER;
diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
index 9a712c0..8f451eb 100644
--- a/dlls/d3d9/cubetexture.c
+++ b/dlls/d3d9/cubetexture.c
@@ -313,7 +313,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(IDirect3DCubeTextur
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->MultiSampleType = wined3d_desc.multisample_type;
desc->MultiSampleQuality = wined3d_desc.multisample_quality;
desc->Width = wined3d_desc.width;
@@ -471,8 +471,8 @@ HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Imp
wined3d_mutex_lock();
hr = wined3d_texture_create_cube(device->WineD3DDevice, edge_length,
- levels, usage, wined3dformat_from_d3dformat(format), pool, texture,
- &d3d9_cubetexture_wined3d_parent_ops, &texture->wined3d_texture);
+ levels, usage, wined3dformat_from_d3dformat(format), (WINED3DPOOL) pool,
+ texture, &d3d9_cubetexture_wined3d_parent_ops, &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
{
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index c7ebfc9..84bbb08 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1133,7 +1133,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(IDirect
*/
hr = IDirect3DDevice9Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */,
FALSE /* Discard */, 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */,
- (WINED3DPOOL)Pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
+ Pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
return hr;
}
@@ -3165,7 +3165,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen
hr = IDirect3DDevice9Impl_CreateSurface(This, width, height,
d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,
- (IDirect3DSurface9 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
+ (IDirect3DSurface9 **)&d3d_surface, usage, (D3DPOOL) pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
if (FAILED(hr))
{
ERR("(%p) CreateSurface failed, returning %#x\n", iface, hr);
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 6e2bf8f..8c18c86 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -249,7 +249,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(IDirect3DSurface9 *iface, D3
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->MultiSampleType = wined3d_desc.multisample_type;
desc->MultiSampleQuality = wined3d_desc.multisample_quality;
desc->Width = wined3d_desc.width;
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 2fc5233..4fb7453 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -307,7 +307,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(IDirect3DTexture9 *ifac
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->MultiSampleType = wined3d_desc.multisample_type;
desc->MultiSampleQuality = wined3d_desc.multisample_quality;
desc->Width = wined3d_desc.width;
@@ -458,7 +458,7 @@ HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *devic
wined3d_mutex_lock();
hr = wined3d_texture_create_2d(device->WineD3DDevice, width, height, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool,
+ usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), (WINED3DPOOL) pool,
texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index bc6d03c..bccca5d 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -201,7 +201,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DV
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Width = wined3d_desc.width;
desc->Height = wined3d_desc.height;
desc->Depth = wined3d_desc.depth;
diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c
index d1b5c37..f024d21 100644
--- a/dlls/d3d9/volumetexture.c
+++ b/dlls/d3d9/volumetexture.c
@@ -306,7 +306,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(IDirect3DVolumeTe
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
desc->Type = wined3d_desc.resource_type;
desc->Usage = wined3d_desc.usage;
- desc->Pool = wined3d_desc.pool;
+ desc->Pool = (D3DPOOL) wined3d_desc.pool;
desc->Width = wined3d_desc.width;
desc->Height = wined3d_desc.height;
desc->Depth = wined3d_desc.depth;
@@ -444,8 +444,8 @@ HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice
wined3d_mutex_lock();
hr = wined3d_texture_create_3d(device->WineD3DDevice, width, height, depth, levels,
- usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool, texture,
- &d3d9_volumetexture_wined3d_parent_ops, &texture->wined3d_texture);
+ usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), (WINED3DPOOL) pool,
+ texture, &d3d9_volumetexture_wined3d_parent_ops, &texture->wined3d_texture);
wined3d_mutex_unlock();
if (FAILED(hr))
{
--
1.7.5.1
More information about the wine-patches
mailing list