[Mesa-dev] [PATCH] i965: Fix gl_DrawID in the vec4 backend.

[Kristian Høgsberg]

On Sat, Feb 13, 2016 at 12:45 PM, Kenneth Graunke <kenneth at whitecape.org> wrote:
> brw_draw_upload.c uploads VertexID/InstanceID first, then DrawID.
> So we need to assign the attribute mapping in that order as well.
>
> Fixes the following Pigit tests with the vec4 backend:
> - arb_shader_draw_parameters-drawid vertexid
> - arb_shader_draw_parameters-drawid-indirect basevertex
>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

Oops, thanks.

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

> ---
>  src/mesa/drivers/dri/i965/brw_vec4.cpp | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
> index 0d8c104..541cf29 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
> @@ -1561,11 +1561,6 @@ vec4_vs_visitor::setup_attributes(int payload_reg)
>        }
>     }
>
> -   if (vs_prog_data->uses_drawid) {
> -      attribute_map[VERT_ATTRIB_MAX + 1] = payload_reg + nr_attributes;
> -      nr_attributes++;
> -   }
> -
>     /* VertexID is stored by the VF as the last vertex element, but we
>      * don't represent it with a flag in inputs_read, so we call it
>      * VERT_ATTRIB_MAX.
> @@ -1576,6 +1571,11 @@ vec4_vs_visitor::setup_attributes(int payload_reg)
>        nr_attributes++;
>     }
>
> +   if (vs_prog_data->uses_drawid) {
> +      attribute_map[VERT_ATTRIB_MAX + 1] = payload_reg + nr_attributes;
> +      nr_attributes++;
> +   }
> +
>     lower_attributes_to_hw_regs(attribute_map, false /* interleaved */);
>
>     return payload_reg + vs_prog_data->nr_attributes;
> --
> 2.7.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev