[Mesa-dev] [PATCH] u_vbuf: fix src_offset alignment in u_vbuf_create_vertex_elements()

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Fri, Jun 19, 2015 at 4:39 PM, Brian Paul <brianp at vmware.com> wrote:
> If the driver says PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY=1,
> the driver should never receive a pipe_vertex_element::src_offset value
> that's not a multiple of four.  But the vbuf code wasn't actually adjusting
> the src_offset value when creating the vertex element state object.
>
> We just need to align the src_offset values put in the driver_attribs[]
> array.
>
> See the piglit gl-1.5-vertex-buffer-offsets test.
> ---
>  src/gallium/auxiliary/util/u_vbuf.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/auxiliary/util/u_vbuf.c b/src/gallium/auxiliary/util/u_vbuf.c
> index b1b89bf..02ae0b8 100644
> --- a/src/gallium/auxiliary/util/u_vbuf.c
> +++ b/src/gallium/auxiliary/util/u_vbuf.c
> @@ -781,10 +781,11 @@ u_vbuf_create_vertex_elements(struct u_vbuf *mgr, unsigned count,
>     ve->compatible_vb_mask_all = ~ve->incompatible_vb_mask_any & used_buffers;
>     ve->incompatible_vb_mask_all = ~ve->compatible_vb_mask_any & used_buffers;
>
> -   /* Align the formats to the size of DWORD if needed. */
> +   /* Align the formats and offsets to the size of DWORD if needed. */
>     if (!mgr->caps.velem_src_offset_unaligned) {
>        for (i = 0; i < count; i++) {
>           ve->native_format_size[i] = align(ve->native_format_size[i], 4);
> +         driver_attribs[i].src_offset = align(ve->ve[i].src_offset, 4);
>        }
>     }
>
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev