From: Axel Davy Date: Thu, 7 May 2015 23:29:35 +0000 (+0200) Subject: st/nine: Fix StretchRect checks X-Git-Tag: android-x86-6.0-r1~7914 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef8ade6f09410b734fb84861a8bce23dc9e49afc;p=android-x86%2Fexternal-mesa.git st/nine: Fix StretchRect checks Fixes Wine tests Signed-off-by: Axel Davy --- diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 2ac49a13a88..28daebaf14f 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -1582,8 +1582,12 @@ NineDevice9_StretchRect( struct NineDevice9 *This, user_assert(!scaled || dst != src, D3DERR_INVALIDCALL); user_assert(!scaled || - !NineSurface9_IsOffscreenPlain(dst) || + !NineSurface9_IsOffscreenPlain(dst), D3DERR_INVALIDCALL); + user_assert(!NineSurface9_IsOffscreenPlain(dst) || NineSurface9_IsOffscreenPlain(src), D3DERR_INVALIDCALL); + user_assert(NineSurface9_IsOffscreenPlain(dst) || + dst->desc.Usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL), + D3DERR_INVALIDCALL); user_assert(!scaled || (!util_format_is_compressed(dst->base.info.format) && !util_format_is_compressed(src->base.info.format)),