<div dir="ltr"><div>Juan, Dylan,</div><div><br></div><div>Yes, the patch is not needed in stable.</div><div><br></div><div>Thanks,<br></div><div>Marek<br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 30, 2018 at 12:01 PM, Dylan Baker <span dir="ltr"><<a href="mailto:dylan@pnwbakers.com" target="_blank">dylan@pnwbakers.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Quoting Marek Olšák (2018-05-28 18:10:42)<br>
<div><div class="h5">> From: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>><br>
> <br>
> Bindless texture handles can be passed via vertex attribs using this type.<br>
> They use the double codepath, so don't use st_pipe_vertex_format.<br>
> <br>
> Cc: 18.0 18.1 <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.<wbr>freedesktop.org</a>><br>
> ---<br>
>  src/mesa/state_tracker/st_<wbr>atom_array.c | 3 ++-<br>
>  1 file changed, 2 insertions(+), 1 deletion(-)<br>
> <br>
> diff --git a/src/mesa/state_tracker/st_<wbr>atom_array.c b/src/mesa/state_tracker/st_<wbr>atom_array.c<br>
> index 9a0935e21a5..e4fc19eb5e2 100644<br>
> --- a/src/mesa/state_tracker/st_<wbr>atom_array.c<br>
> +++ b/src/mesa/state_tracker/st_<wbr>atom_array.c<br>
> @@ -317,21 +317,20 @@ static void init_velement(struct pipe_vertex_element *velement,<br>
>     velement->vertex_buffer_index = vbo_index;<br>
>     assert(velement->src_format);<br>
>  }<br>
>  <br>
>  static void init_velement_lowered(const struct st_vertex_program *vp,<br>
>                                    struct pipe_vertex_element *velements,<br>
>                                    const struct gl_array_attributes *attrib,<br>
>                                    int src_offset, int instance_divisor,<br>
>                                    int vbo_index, int idx)<br>
>  {<br>
> -   const unsigned format = st_pipe_vertex_format(attrib);<br>
>     const GLubyte nr_components = attrib->Size;<br>
>  <br>
>     if (attrib->Doubles) {<br>
>        int lower_format;<br>
>  <br>
>        if (nr_components < 2)<br>
>           lower_format = PIPE_FORMAT_R32G32_UINT;<br>
>        else<br>
>           lower_format = PIPE_FORMAT_R32G32B32A32_UINT;<br>
>  <br>
> @@ -351,20 +350,22 @@ static void init_velement_lowered(const struct st_vertex_program *vp,<br>
>                          lower_format, instance_divisor, vbo_index);<br>
>           } else {<br>
>              /* The values here are undefined. Fill in some conservative<br>
>               * dummy values.<br>
>               */<br>
>              init_velement(&velements[idx], src_offset, PIPE_FORMAT_R32G32_UINT,<br>
>                            instance_divisor, vbo_index);<br>
>           }<br>
>        }<br>
>     } else {<br>
> +      const unsigned format = st_pipe_vertex_format(attrib);<br>
> +<br>
>        init_velement(&velements[idx], src_offset,<br>
>                      format, instance_divisor, vbo_index);<br>
>     }<br>
>  }<br>
>  <br>
>  static void<br>
>  set_vertex_attribs(struct st_context *st,<br>
>                     struct pipe_vertex_buffer *vbuffers,<br>
>                     unsigned num_vbuffers,<br>
>                     struct pipe_vertex_element *velements,<br>
> -- <br>
> 2.17.0<br>
> <br>
</div></div><span class="">> ______________________________<wbr>_________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org">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>
<br>
</span>Hi Marek,<br>
<br>
The first patch in this series is in my 18.1 branch, but this patch doesn't<br>
apply cleanly. I'm not sure that it's actually needed since<br>
19a91841c347107d877bc750371c5f<wbr>a4e9b4de19 isn't in the 18.1 tree, and a quick<br>
glance shows that this patch is changing code from that commit. Let me know what<br>
you want to do.<br>
<br>
Thanks,<br>
Dylan<br>
</blockquote></div><br></div>