Module: wine Branch: master Commit: ef9be113e231d4a706f8ca49a1106c9329e6fe96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9be113e231d4a706f8ca49a1...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Jan 10 20:36:59 2012 +0100
d3d8: Don't expose wined3d internal flags to the application.
---
dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 6d9040d..3f0a657 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -243,7 +243,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, wined3d_mutex_unlock();
desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -539,7 +539,7 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface,
desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;
diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6b5f223..f092f35 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -268,7 +268,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 47258de..d60f820 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -226,7 +226,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->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 9e25f8f..f3f2b20 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -265,7 +265,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 505e17b..71923f5 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -207,7 +207,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->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index f223462..a713f16 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -265,7 +265,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width;