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

wined3d: Pass a sub-resource index instead of a miplevel to 2D texture methods.

This commit is contained in:
Henri Verbeet 2010-10-25 12:33:38 +02:00 committed by Alexandre Julliard
parent ae0a484945
commit f0a0714ecd
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/wined3d/texture.c
View File

@ -333,17 +333,28 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) {
return This->cond_np2; return This->cond_np2;
} }
/* ******************************************* static IWineD3DResourceImpl *texture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx)
IWineD3DTexture IWineD3DTexture parts follow {
******************************************* */ UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count;
static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, UINT level, WINED3DSURFACE_DESC *desc)
if (sub_resource_idx >= sub_count)
{
WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count);
return NULL;
}
return texture->baseTexture.sub_resources[sub_resource_idx];
}
static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface,
UINT sub_resource_idx, WINED3DSURFACE_DESC *desc)
{ {
IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface;
IWineD3DSurface *surface; IWineD3DSurface *surface;
TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); TRACE("iface %p, sub_resource_idx %u, desc %p.\n", iface, sub_resource_idx, desc);
if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) if (!(surface = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx)))
{ {
WARN("Failed to get sub-resource.\n"); WARN("Failed to get sub-resource.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -355,14 +366,14 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, U
} }
static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface, static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface,
UINT level, IWineD3DSurface **surface) UINT sub_resource_idx, IWineD3DSurface **surface)
{ {
IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface;
IWineD3DSurface *s; IWineD3DSurface *s;
TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); TRACE("iface %p, sub_resource_idx %u, surface %p.\n", iface, sub_resource_idx, surface);
if (!(s = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) if (!(s = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx)))
{ {
WARN("Failed to get sub-resource.\n"); WARN("Failed to get sub-resource.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -377,15 +388,15 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface
} }
static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface, static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface,
UINT level, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) UINT sub_resource_idx, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags)
{ {
IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface;
IWineD3DSurface *surface; IWineD3DSurface *surface;
TRACE("iface %p, level %u, locked_rect %p, rect %s, flags %#x.\n", TRACE("iface %p, sub_resource_idx %u, locked_rect %p, rect %s, flags %#x.\n",
iface, level, locked_rect, wine_dbgstr_rect(rect), flags); iface, sub_resource_idx, locked_rect, wine_dbgstr_rect(rect), flags);
if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) if (!(surface = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx)))
{ {
WARN("Failed to get sub-resource.\n"); WARN("Failed to get sub-resource.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -394,14 +405,14 @@ static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface,
return IWineD3DSurface_Map(surface, locked_rect, rect, flags); return IWineD3DSurface_Map(surface, locked_rect, rect, flags);
} }
static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT level) static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT sub_resource_idx)
{ {
IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface;
IWineD3DSurface *surface; IWineD3DSurface *surface;
TRACE("iface %p, level %u.\n", iface, level); TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx);
if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) if (!(surface = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx)))
{ {
WARN("Failed to get sub-resource.\n"); WARN("Failed to get sub-resource.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -417,7 +428,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, c
TRACE("iface %p, dirty_rect %s.\n", iface, wine_dbgstr_rect(dirty_rect)); TRACE("iface %p, dirty_rect %s.\n", iface, wine_dbgstr_rect(dirty_rect));
if (!(surface = (IWineD3DSurfaceImpl *)basetexture_get_sub_resource(texture, 0, 0))) if (!(surface = (IWineD3DSurfaceImpl *)texture_get_sub_resource(texture, 0)))
{ {
WARN("Failed to get sub-resource.\n"); WARN("Failed to get sub-resource.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;

8
include/wine/wined3d.idl
View File

@ -2544,21 +2544,21 @@ interface IWineD3DBaseTexture : IWineD3DResource
interface IWineD3DTexture : IWineD3DBaseTexture interface IWineD3DTexture : IWineD3DBaseTexture
{ {
HRESULT GetLevelDesc( HRESULT GetLevelDesc(
[in] UINT level, [in] UINT sub_resource_idx,
[out] WINED3DSURFACE_DESC *desc [out] WINED3DSURFACE_DESC *desc
); );
HRESULT GetSurfaceLevel( HRESULT GetSurfaceLevel(
[in] UINT level, [in] UINT sub_resource_idx,
[out] IWineD3DSurface **surface [out] IWineD3DSurface **surface
); );
HRESULT Map( HRESULT Map(
[in] UINT level, [in] UINT sub_resource_idx,
[out] WINED3DLOCKED_RECT *locked_rect, [out] WINED3DLOCKED_RECT *locked_rect,
[in] const RECT *rect, [in] const RECT *rect,
[in] DWORD flags [in] DWORD flags
); );
HRESULT Unmap( HRESULT Unmap(
[in] UINT level [in] UINT sub_resource_idx
); );
HRESULT AddDirtyRect( HRESULT AddDirtyRect(
[in] const RECT *dirty_rect [in] const RECT *dirty_rect