diff options
| author | Axel Davy <[email protected]> | 2015-05-08 01:29:35 +0200 |
|---|---|---|
| committer | Axel Davy <[email protected]> | 2015-08-21 22:21:46 +0200 |
| commit | ef8ade6f09410b734fb84861a8bce23dc9e49afc (patch) | |
| tree | c37e8daab51546182e67e4299a2cb9a3634ff8c3 | |
| parent | c57f777b095fbbb6273fccfe7ea2d1ced5fbc0a4 (diff) | |
st/nine: Fix StretchRect checks
Fixes Wine tests
Signed-off-by: Axel Davy <[email protected]>
| -rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 6 |
1 files changed, 5 insertions, 1 deletions
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)), |