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

wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-03-06 10:45:26 +01:00 committed by Alexandre Julliard
parent d118788917
commit c51537ba9f
3 changed files with 52 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
dlls/wined3d/surface.c
View File

@ -1027,11 +1027,11 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
} }
} }
static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, const RECT *rect) static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surface, const RECT *rect)
{ {
struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1};
return wined3d_texture_check_block_align(surface->container, surface->texture_level, &box); return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &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,
@ -1044,12 +1044,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
unsigned int src_row_pitch, src_slice_pitch; unsigned int src_row_pitch, src_slice_pitch;
const struct wined3d_format *src_format; const struct wined3d_format *src_format;
const struct wined3d_format *dst_format; const struct wined3d_format *dst_format;
unsigned int src_fmt_flags, dst_fmt_flags;
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context;
struct wined3d_bo_address data; struct wined3d_bo_address data;
UINT update_w, update_h; UINT update_w, update_h;
UINT dst_w, dst_h;
RECT r, dst_rect; RECT r, dst_rect;
POINT p; POINT p;
@ -1059,8 +1057,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
src_format = src_texture->resource.format; src_format = src_texture->resource.format;
dst_format = dst_texture->resource.format; dst_format = dst_texture->resource.format;
src_fmt_flags = src_texture->resource.format_flags;
dst_fmt_flags = dst_texture->resource.format_flags;
if (src_format->id != dst_format->id) if (src_format->id != dst_format->id)
{ {
@ -1086,33 +1082,17 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); wined3d_texture_get_level_height(src_texture, src_surface->texture_level));
src_rect = &r; src_rect = &r;
} }
else if (src_rect->left < 0 || src_rect->top < 0 || IsRectEmpty(src_rect))
{
WARN("Invalid source rectangle.\n");
return WINED3DERR_INVALIDCALL;
}
dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); if (!wined3d_surface_check_rect_dimensions(src_surface, src_rect))
dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level);
update_w = src_rect->right - src_rect->left;
update_h = src_rect->bottom - src_rect->top;
if (update_w > dst_w || dst_point->x > dst_w - update_w
|| update_h > dst_h || dst_point->y > dst_h - update_h)
{
WARN("Destination out of bounds.\n");
return WINED3DERR_INVALIDCALL;
}
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;
} }
update_w = src_rect->right - src_rect->left;
update_h = src_rect->bottom - src_rect->top;
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_rect(dst_surface, &dst_rect)) if (!wined3d_surface_check_rect_dimensions(dst_surface, &dst_rect))
{ {
WARN("Destination rectangle not block-aligned.\n"); WARN("Destination rectangle not block-aligned.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
@ -1128,7 +1108,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
/* Only load the surface for partial updates. For newly allocated texture /* Only load the surface for partial updates. For newly allocated texture
* the texture wouldn't be the current location, and we'd upload zeroes * the texture wouldn't be the current location, and we'd upload zeroes
* just to overwrite them again. */ * just to overwrite them again. */
if (update_w == dst_w && update_h == dst_h) if (update_w == wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level)
&& update_h == wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level))
wined3d_texture_prepare_texture(dst_texture, context, FALSE); wined3d_texture_prepare_texture(dst_texture, context, FALSE);
else else
wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
@ -3613,10 +3594,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
struct wined3d_device *device = dst_texture->resource.device; struct wined3d_device *device = dst_texture->resource.device;
struct wined3d_swapchain *src_swapchain, *dst_swapchain; struct wined3d_swapchain *src_swapchain, *dst_swapchain;
struct wined3d_texture *src_texture = NULL; struct wined3d_texture *src_texture = NULL;
unsigned int dst_w, dst_h, src_w, src_h;
unsigned int src_sub_resource_idx = 0; unsigned int src_sub_resource_idx = 0;
DWORD src_ds_flags, dst_ds_flags; DWORD src_ds_flags, dst_ds_flags;
BOOL scale, convert; BOOL scale, convert;
HRESULT hr;
static const DWORD simple_blit = WINED3D_BLT_ASYNC static const DWORD simple_blit = WINED3D_BLT_ASYNC
| WINED3D_BLT_COLOR_FILL | WINED3D_BLT_COLOR_FILL
@ -3657,46 +3638,12 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
return WINEDDERR_SURFACEBUSY; return WINEDDERR_SURFACEBUSY;
} }
dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_surface->texture_level, &dst_box)))
dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level); return hr;
if (IsRectEmpty(dst_rect) || dst_rect->left > dst_w || dst_rect->left < 0
|| dst_rect->top > dst_h || dst_rect->top < 0
|| dst_rect->right > dst_w || dst_rect->right < 0
|| dst_rect->bottom > dst_h || dst_rect->bottom < 0)
{
WARN("The application gave us a bad destination rectangle.\n");
return WINEDDERR_INVALIDRECT;
}
if ((dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) if (src_texture && FAILED(hr = wined3d_texture_check_box_dimensions(src_texture,
&& !wined3d_texture_check_block_align(dst_texture, src_surface->texture_level, &src_box)))
dst_sub_resource_idx % dst_texture->level_count, &dst_box)) return hr;
{
WARN("Destination rectangle not block-aligned.\n");
return WINED3DERR_INVALIDCALL;
}
if (src_texture)
{
src_w = wined3d_texture_get_level_width(src_texture, src_surface->texture_level);
src_h = wined3d_texture_get_level_height(src_texture, src_surface->texture_level);
if (IsRectEmpty(src_rect) || src_rect->left > src_w || src_rect->left < 0
|| src_rect->top > src_h || src_rect->top < 0
|| src_rect->right > src_w || src_rect->right < 0
|| src_rect->bottom > src_h || src_rect->bottom < 0)
{
WARN("The application gave us a bad source rectangle.\n");
return WINEDDERR_INVALIDRECT;
}
if ((src_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
&& !wined3d_texture_check_block_align(src_texture,
src_sub_resource_idx % src_texture->level_count, &src_box))
{
WARN("Source rectangle not block-aligned.\n");
return WINED3DERR_INVALIDCALL;
}
}
if (!fx || !(fx->fx)) if (!fx || !(fx->fx))
flags &= ~WINED3D_BLT_FX; flags &= ~WINED3D_BLT_FX;

87
dlls/wined3d/texture.c
View File

@ -1063,20 +1063,44 @@ void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture)
return texture->resource.parent; return texture->resource.parent;
} }
static BOOL wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture,
unsigned int level, const struct wined3d_box *box) unsigned int level, const struct wined3d_box *box)
{ {
if (box->left >= box->right const struct wined3d_format *format = texture->resource.format;
|| box->top >= box->bottom unsigned int width_mask, height_mask, width, height, depth;
|| box->front >= box->back)
return FALSE;
if (box->right > wined3d_texture_get_level_width(texture, level) width = wined3d_texture_get_level_width(texture, level);
|| box->bottom > wined3d_texture_get_level_height(texture, level) height = wined3d_texture_get_level_height(texture, level);
|| box->back > wined3d_texture_get_level_depth(texture, level)) depth = wined3d_texture_get_level_depth(texture, level);
return FALSE;
return TRUE; if (box->left >= box->right || box->right > width
|| box->top >= box->bottom || box->bottom > height
|| box->front >= box->back || box->back > depth)
{
WARN("Box %s is invalid.\n", debug_box(box));
return WINEDDERR_INVALIDRECT;
}
if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
{
/* This assumes power of two block sizes, but NPOT block sizes would
* be silly anyway.
*
* This also assumes that the format's block depth is 1. */
width_mask = format->block_width - 1;
height_mask = format->block_height - 1;
if ((box->left & width_mask) || (box->top & height_mask)
|| (box->right & width_mask && box->right != width)
|| (box->bottom & height_mask && box->bottom != height))
{
WARN("Box %s is misaligned for %ux%u blocks.\n",
debug_box(box), format->block_width, format->block_height);
return WINED3DERR_INVALIDCALL;
}
}
return WINED3D_OK;
} }
void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture,
@ -1788,19 +1812,11 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
return E_INVALIDARG; return E_INVALIDARG;
texture_level = sub_resource_idx % texture->level_count; texture_level = sub_resource_idx % texture->level_count;
if (box && !wined3d_texture_check_box_dimensions(texture, texture_level, box)) if (box && FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box)))
{ {
WARN("Map box is invalid.\n"); WARN("Map box is invalid.\n");
if (resource->type != WINED3D_RTYPE_TEXTURE_2D) if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && resource->pool == WINED3D_POOL_DEFAULT)
return WINED3DERR_INVALIDCALL; || resource->type != WINED3D_RTYPE_TEXTURE_2D)
}
if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box
&& !wined3d_texture_check_block_align(texture, texture_level, box))
{
WARN("Map box %s is misaligned for %ux%u blocks.\n",
debug_box(box), format->block_width, format->block_height);
if (resource->type != WINED3D_RTYPE_TEXTURE_2D || resource->pool == WINED3D_POOL_DEFAULT)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
@ -2483,35 +2499,6 @@ static const struct wined3d_texture_ops texture3d_ops =
texture3d_cleanup_sub_resources, texture3d_cleanup_sub_resources,
}; };
BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture,
unsigned int level, const struct wined3d_box *box)
{
const struct wined3d_format *format = texture->resource.format;
unsigned int height = wined3d_texture_get_level_height(texture, level);
unsigned int width = wined3d_texture_get_level_width(texture, level);
unsigned int width_mask, height_mask;
if ((box->left >= box->right)
|| (box->top >= box->bottom)
|| (box->right > width)
|| (box->bottom > height))
return FALSE;
/* This assumes power of two block sizes, but NPOT block sizes would be
* silly anyway.
*
* This also assumes that the format's block depth is 1. */
width_mask = format->block_width - 1;
height_mask = format->block_height - 1;
if ((box->left & width_mask) || (box->top & height_mask)
|| (box->right & width_mask && box->right != width)
|| (box->bottom & height_mask && box->bottom != height))
return FALSE;
return TRUE;
}
static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc,
UINT layer_count, UINT level_count, struct wined3d_device *device, void *parent, UINT layer_count, UINT level_count, struct wined3d_device *device, void *parent,
const struct wined3d_parent_ops *parent_ops) const struct wined3d_parent_ops *parent_ops)

2
dlls/wined3d/wined3d_private.h
View File

@ -2938,7 +2938,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture,
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture,
unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN;
GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN;
void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx,