diff options
| author | Anuj Phogat <anuj.phogat@gmail.com> | 2015-11-10 15:33:53 -0800 |
|---|---|---|
| committer | Anuj Phogat <anuj.phogat@gmail.com> | 2016-01-05 13:43:32 -0800 |
| commit | 0bf037c0fed0df655a3bb259348bb03389c00ddb (patch) | |
| tree | 723dc9d5245e453022da94f4f92847865a2558e7 /src/mesa/drivers/dri/i965/intel_blit.c | |
| parent | 5cbe01c83fb78009371535e558eb21e213312416 (diff) | |
| download | external_mesa3d-0bf037c0fed0df655a3bb259348bb03389c00ddb.zip external_mesa3d-0bf037c0fed0df655a3bb259348bb03389c00ddb.tar.gz external_mesa3d-0bf037c0fed0df655a3bb259348bb03389c00ddb.tar.bz2 | |
i965/gen9: Return false in place of assert in intelEmitCopyBlit()
This allows the fallback paths to handle it correctly.
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_blit.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_blit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c index d4e25d8..6d29fbd 100644 --- a/src/mesa/drivers/dri/i965/intel_blit.c +++ b/src/mesa/drivers/dri/i965/intel_blit.c @@ -564,9 +564,10 @@ intelEmitCopyBlit(struct brw_context *brw, dst_offset, dst_pitch, dst_tiling, dst_tr_mode, w, h, cpp); - assert(use_fast_copy_blit || - (src_tr_mode == INTEL_MIPTREE_TRMODE_NONE && - dst_tr_mode == INTEL_MIPTREE_TRMODE_NONE)); + if (!use_fast_copy_blit && + (src_tr_mode != INTEL_MIPTREE_TRMODE_NONE || + dst_tr_mode != INTEL_MIPTREE_TRMODE_NONE)) + return false; if (use_fast_copy_blit) { /* When two sequential fast copy blits have different source surfaces, |