<div dir="ltr">Oops it should be just "return;" here.<div class="gmail_extra"><br><div class="gmail_quote">On 28 March 2017 at 17:52, Julien Isorce <span dir="ltr"><<a href="mailto:julien.isorce@gmail.com" target="_blank">julien.isorce@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span class=""><div>-       if (program->input_size || program->ir_type == PIPE_SHADER_IR_NATIVE)</div><div>-               si_upload_compute_input(sctx, code_object, info);</div><div>+       if ((program->input_size ||</div></span><div>+            program->ir_type == PIPE_SHADER_IR_NATIVE) &&</div><div>+            unlikely(!si_upload_compute_<wbr>input(sctx, code_object, info))) {</div><div>+               return false;</div><div>+       }</div><div><br></div><div>is the indentation ok ?</div><div><br></div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On 27 March 2017 at 16:39, Marek Olšák <span dir="ltr"><<a href="mailto:maraeo@gmail.com" target="_blank">maraeo@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">"&&" at the end of the previous line please.<br>
<br>
Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com" target="_blank">marek.olsak@amd.com</a>><br>
<br>
Marek<br>
<div><div class="m_-864233738112584337h5"><br>
On Mon, Mar 27, 2017 at 3:46 PM, Julien Isorce <<a href="mailto:julien.isorce@gmail.com" target="_blank">julien.isorce@gmail.com</a>> wrote:<br>
> Signed-off-by: Julien Isorce <<a href="mailto:jisorce@oblong.com" target="_blank">jisorce@oblong.com</a>><br>
> ---<br>
>  src/gallium/drivers/radeonsi/s<wbr>i_compute.c | 13 ++++++++++---<br>
>  1 file changed, 10 insertions(+), 3 deletions(-)<br>
><br>
> diff --git a/src/gallium/drivers/radeonsi<wbr>/si_compute.c b/src/gallium/drivers/radeonsi<wbr>/si_compute.c<br>
> index 46476b6..a38138f 100644<br>
> --- a/src/gallium/drivers/radeonsi<wbr>/si_compute.c<br>
> +++ b/src/gallium/drivers/radeonsi<wbr>/si_compute.c<br>
> @@ -579,7 +579,7 @@ static void si_setup_user_sgprs_co_v2(stru<wbr>ct si_context *sctx,<br>
>         }<br>
>  }<br>
><br>
> -static void si_upload_compute_input(struct si_context *sctx,<br>
> +static bool si_upload_compute_input(struct si_context *sctx,<br>
>                                     const amd_kernel_code_t *code_object,<br>
>                                     const struct pipe_grid_info *info)<br>
>  {<br>
> @@ -602,6 +602,9 @@ static void si_upload_compute_input(struct si_context *sctx,<br>
>                        &kernel_args_offset,<br>
>                        (struct pipe_resource**)&input_buffer, &kernel_args_ptr);<br>
><br>
> +       if (unlikely(!kernel_args_ptr))<br>
> +               return false;<br>
> +<br>
>         kernel_args = (uint32_t*)kernel_args_ptr;<br>
>         kernel_args_va = input_buffer->gpu_address + kernel_args_offset;<br>
><br>
> @@ -636,6 +639,8 @@ static void si_upload_compute_input(struct si_context *sctx,<br>
>         }<br>
><br>
>         r600_resource_reference(&inpu<wbr>t_buffer, NULL);<br>
> +<br>
> +       return true;<br>
>  }<br>
><br>
>  static void si_setup_tgsi_grid(struct si_context *sctx,<br>
> @@ -790,8 +795,10 @@ static void si_launch_grid(<br>
>                 si_set_atom_dirty(sctx, sctx->atoms.s.render_cond, false);<br>
>         }<br>
><br>
> -       if (program->input_size || program->ir_type == PIPE_SHADER_IR_NATIVE)<br>
> -               si_upload_compute_input(sctx, code_object, info);<br>
> +       if ((program->input_size || program->ir_type == PIPE_SHADER_IR_NATIVE)<br>
> +            && unlikely(!si_upload_compute_in<wbr>put(sctx, code_object, info))) {<br>
> +               return false;<br>
> +       }<br>
><br>
>         /* Global buffers */<br>
>         for (i = 0; i < MAX_GLOBAL_BUFFERS; i++) {<br>
> --<br>
> 2.7.4<br>
><br>
</div></div>> ______________________________<wbr>_________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div></div>