Commit 97a25007 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in…

wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt(). Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2b2a6ebd
...@@ -3829,7 +3829,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned ...@@ -3829,7 +3829,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned
{ {
struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1};
struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1};
unsigned int dst_format_flags, src_format_flags = 0;
HRESULT hr; HRESULT hr;
TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, "
...@@ -3849,12 +3848,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned ...@@ -3849,12 +3848,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned
&& filter != WINED3D_TEXF_LINEAR) && filter != WINED3D_TEXF_LINEAR)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
dst_format_flags = dst_texture->resource.format_flags;
if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture,
dst_sub_resource_idx % dst_texture->level_count, &dst_box))) dst_sub_resource_idx % dst_texture->level_count, &dst_box)))
return hr; return hr;
src_format_flags = src_texture->resource.format_flags;
if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture,
src_sub_resource_idx % src_texture->level_count, &src_box))) src_sub_resource_idx % src_texture->level_count, &src_box)))
return hr; return hr;
...@@ -3866,8 +3863,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned ...@@ -3866,8 +3863,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned
return WINEDDERR_SURFACEBUSY; return WINEDDERR_SURFACEBUSY;
} }
if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) if (!src_texture->resource.format->depth_size != !dst_texture->resource.format->depth_size
!= (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) || !src_texture->resource.format->stencil_size != !dst_texture->resource.format->stencil_size)
{ {
WARN("Rejecting depth/stencil blit between incompatible formats.\n"); WARN("Rejecting depth/stencil blit between incompatible formats.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment