[Mesa-dev] [PATCH] i965: add missing return in if statement

Anuj Phogat anuj.phogat at gmail.com
Tue May 31 18:41:18 UTC 2016


On Sat, May 28, 2016 at 4:16 AM, Thomas Hindoe Paaboel Andersen
<phomes at gmail.com> wrote:
> Re-add the "return false" that was removed in 0c02d7002d6c005b4c1fe997b5ef5916978dd183
>
> It seems that something went wrong when merging the patch. The patch
> sent to the mailing list does not directly match what was committed.
> https://lists.freedesktop.org/archives/mesa-dev/2016-May/118198.html
Something went bad while rebasing my original patch. Thanks for noticing it.

-Anuj
> ---
>  src/mesa/drivers/dri/i965/intel_blit.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
> index 5a48c20..23e1ab6 100644
> --- a/src/mesa/drivers/dri/i965/intel_blit.c
> +++ b/src/mesa/drivers/dri/i965/intel_blit.c
> @@ -355,6 +355,7 @@ can_fast_copy_blit(struct brw_context *brw,
>      */
>     if (src_tr_mode == INTEL_MIPTREE_TRMODE_NONE &&
>         dst_tr_mode == INTEL_MIPTREE_TRMODE_NONE)
> +      return false;
>
>     if (logic_op != GL_COPY)
>        return false;
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list