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

wined3d: Pass a wined3d_box to wined3d_surface_map.. 

Introduced a new surface_check_block_align function that accepts a
wined3d_box, eventually the old _rect version will be completely
replaced.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
This commit is contained in:
Riccardo Bortolato 2015-10-06 10:36:47 +02:00 committed by Alexandre Julliard
parent 26db80b685
commit 1d1487105d
5 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/d3d8/surface.c
View File

@ -201,6 +201,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface,
D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags)
{ {
struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface);
struct wined3d_box box;
struct wined3d_map_desc map_desc; struct wined3d_map_desc map_desc;
HRESULT hr; HRESULT hr;
@ -225,9 +226,15 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface,
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
box.left = rect->left;
box.top = rect->top;
box.right = rect->right;
box.bottom = rect->bottom;
box.front = 0;
box.back = 1;
} }
hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect ? &box : NULL, flags);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))

13
dlls/d3d9/surface.c
View File

@ -233,14 +233,25 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags)
{ {
struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
struct wined3d_box box;
struct wined3d_map_desc map_desc; struct wined3d_map_desc map_desc;
HRESULT hr; HRESULT hr;
TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n", TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n",
iface, locked_rect, wine_dbgstr_rect(rect), flags); iface, locked_rect, wine_dbgstr_rect(rect), flags);
if (rect)
{
box.left = rect->left;
box.top = rect->top;
box.right = rect->right;
box.bottom = rect->bottom;
box.front = 0;
box.back = 1;
}
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect ? &box : NULL, flags);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))

9
dlls/ddraw/surface.c
View File

@ -954,6 +954,7 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac
static HRESULT surface_lock(struct ddraw_surface *This, static HRESULT surface_lock(struct ddraw_surface *This,
RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h) RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h)
{ {
struct wined3d_box box;
struct wined3d_map_desc map_desc; struct wined3d_map_desc map_desc;
HRESULT hr = DD_OK; HRESULT hr = DD_OK;
@ -985,12 +986,18 @@ static HRESULT surface_lock(struct ddraw_surface *This,
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
box.left = Rect->left;
box.top = Rect->top;
box.right = Rect->right;
box.bottom = Rect->bottom;
box.front = 0;
box.back = 1;
} }
if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
hr = ddraw_surface_update_frontbuffer(This, Rect, TRUE); hr = ddraw_surface_update_frontbuffer(This, Rect, TRUE);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = wined3d_surface_map(This->wined3d_surface, &map_desc, Rect, Flags); hr = wined3d_surface_map(This->wined3d_surface, &map_desc, Rect ? &box : NULL, Flags);
if (FAILED(hr)) if (FAILED(hr))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();

62
dlls/wined3d/surface.c
View File

@ -1526,13 +1526,13 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
} }
} }
static BOOL surface_check_block_align(struct wined3d_surface *surface, const RECT *rect) static BOOL surface_check_block_align(struct wined3d_surface *surface, const struct wined3d_box *box)
{ {
UINT width_mask, height_mask; UINT width_mask, height_mask;
if (!rect->left && !rect->top if (!box->left && !box->top
&& rect->right == surface->resource.width && box->right == surface->resource.width
&& rect->bottom == surface->resource.height) && box->bottom == surface->resource.height)
return TRUE; return TRUE;
/* This assumes power of two block sizes, but NPOT block sizes would be /* This assumes power of two block sizes, but NPOT block sizes would be
@ -1540,13 +1540,20 @@ static BOOL surface_check_block_align(struct wined3d_surface *surface, const REC
width_mask = surface->resource.format->block_width - 1; width_mask = surface->resource.format->block_width - 1;
height_mask = surface->resource.format->block_height - 1; height_mask = surface->resource.format->block_height - 1;
if (!(rect->left & width_mask) && !(rect->top & height_mask) if (!(box->left & width_mask) && !(box->top & height_mask)
&& !(rect->right & width_mask) && !(rect->bottom & height_mask)) && !(box->right & width_mask) && !(box->bottom & height_mask))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, const RECT *rect)
{
struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1};
return surface_check_block_align(surface, &box);
}
HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point,
struct wined3d_surface *src_surface, const RECT *src_rect) struct wined3d_surface *src_surface, const RECT *src_rect)
{ {
@ -1617,14 +1624,14 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if ((src_fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !surface_check_block_align(src_surface, src_rect)) if ((src_fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !surface_check_block_align_rect(src_surface, src_rect))
{ {
WARN("Source rectangle not block-aligned.\n"); WARN("Source rectangle not block-aligned.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
SetRect(&dst_rect, dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h); SetRect(&dst_rect, dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h);
if ((dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !surface_check_block_align(dst_surface, &dst_rect)) if ((dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !surface_check_block_align_rect(dst_surface, &dst_rect))
{ {
WARN("Destination rectangle not block-aligned.\n"); WARN("Destination rectangle not block-aligned.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -2457,7 +2464,7 @@ HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface)
} }
HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags)
{ {
const struct wined3d_format *format = surface->resource.format; const struct wined3d_format *format = surface->resource.format;
unsigned int fmt_flags = surface->container->resource.format_flags; unsigned int fmt_flags = surface->container->resource.format_flags;
@ -2466,8 +2473,8 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
BYTE *base_memory; BYTE *base_memory;
TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", TRACE("surface %p, map_desc %p, box %p, flags %#x.\n",
surface, map_desc, wine_dbgstr_rect(rect), flags); surface, map_desc, box, flags);
if (surface->resource.map_count) if (surface->resource.map_count)
{ {
@ -2475,11 +2482,11 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && rect if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box
&& !surface_check_block_align(surface, rect)) && !surface_check_block_align(surface, box))
{ {
WARN("Map rect %s is misaligned for %ux%u blocks.\n", WARN("Map rect %p is misaligned for %ux%u blocks.\n",
wine_dbgstr_rect(rect), format->block_width, format->block_height); box, format->block_width, format->block_height);
if (surface->resource.pool == WINED3D_POOL_DEFAULT) if (surface->resource.pool == WINED3D_POOL_DEFAULT)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -2560,7 +2567,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
map_desc->row_pitch = wined3d_surface_get_pitch(surface); map_desc->row_pitch = wined3d_surface_get_pitch(surface);
map_desc->slice_pitch = 0; map_desc->slice_pitch = 0;
if (!rect) if (!box)
{ {
map_desc->data = base_memory; map_desc->data = base_memory;
surface->lockedRect.left = 0; surface->lockedRect.left = 0;
@ -2575,19 +2582,19 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
/* Compressed textures are block based, so calculate the offset of /* Compressed textures are block based, so calculate the offset of
* the block that contains the top-left pixel of the locked rectangle. */ * the block that contains the top-left pixel of the locked rectangle. */
map_desc->data = base_memory map_desc->data = base_memory
+ ((rect->top / format->block_height) * map_desc->row_pitch) + ((box->top / format->block_height) * map_desc->row_pitch)
+ ((rect->left / format->block_width) * format->block_byte_count); + ((box->left / format->block_width) * format->block_byte_count);
} }
else else
{ {
map_desc->data = base_memory map_desc->data = base_memory
+ (map_desc->row_pitch * rect->top) + (map_desc->row_pitch * box->top)
+ (rect->left * format->byte_count); + (box->left * format->byte_count);
} }
surface->lockedRect.left = rect->left; surface->lockedRect.left = box->left;
surface->lockedRect.top = rect->top; surface->lockedRect.top = box->top;
surface->lockedRect.right = rect->right; surface->lockedRect.right = box->right;
surface->lockedRect.bottom = rect->bottom; surface->lockedRect.bottom = box->bottom;
} }
TRACE("Locked rect %s.\n", wine_dbgstr_rect(&surface->lockedRect)); TRACE("Locked rect %s.\n", wine_dbgstr_rect(&surface->lockedRect));
@ -4443,6 +4450,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags,
const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter)
{ {
const struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1};
int bpp, srcheight, srcwidth, dstheight, dstwidth, width; int bpp, srcheight, srcwidth, dstheight, dstwidth, width;
const struct wined3d_format *src_format, *dst_format; const struct wined3d_format *src_format, *dst_format;
unsigned int src_fmt_flags, dst_fmt_flags; unsigned int src_fmt_flags, dst_fmt_flags;
@ -4493,7 +4501,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
src_fmt_flags = dst_fmt_flags; src_fmt_flags = dst_fmt_flags;
} }
wined3d_surface_map(dst_surface, &dst_map, dst_rect, 0); wined3d_surface_map(dst_surface, &dst_map, &dst_box, 0);
} }
bpp = dst_surface->resource.format->byte_count; bpp = dst_surface->resource.format->byte_count;
@ -4532,14 +4540,14 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
goto release; goto release;
} }
if (!surface_check_block_align(src_surface, src_rect)) if (!surface_check_block_align_rect(src_surface, src_rect))
{ {
WARN("Source rectangle not block-aligned.\n"); WARN("Source rectangle not block-aligned.\n");
hr = WINED3DERR_INVALIDCALL; hr = WINED3DERR_INVALIDCALL;
goto release; goto release;
} }
if (!surface_check_block_align(dst_surface, dst_rect)) if (!surface_check_block_align_rect(dst_surface, dst_rect))
{ {
WARN("Destination rectangle not block-aligned.\n"); WARN("Destination rectangle not block-aligned.\n");
hr = WINED3DERR_INVALIDCALL; hr = WINED3DERR_INVALIDCALL;

2
include/wine/wined3d.h
View File

@ -2488,7 +2488,7 @@ HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc);
ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface); ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);
HRESULT __cdecl wined3d_surface_is_lost(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_is_lost(const struct wined3d_surface *surface);
HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface,
struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags); struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
void __cdecl wined3d_surface_preload(struct wined3d_surface *surface); void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);
HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc);
HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface);