[Mesa-dev] [PATCH 3/5] i965/gen9: Return false in place of assert in intelEmitCopyBlit()

[Jordan Justen]

1-3 Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

On 2015-12-11 19:14:22, Anuj Phogat wrote:
> This allows the fallback paths to handle it correctly.
> 
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/mesa/drivers/dri/i965/intel_blit.c | 7 ++++---
>  1 file 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,
> -- 
> 2.5.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev