[Mesa-stable] [Mesa-dev] [PATCH] nvc0: don't try to go through the push path for indirect draws

[Samuel Pitoiset]

This makes sense, thanks for fixing this.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

On 05/15/2016 07:28 AM, Ilia Mirkin wrote:
> This fixes
>
> dEQP-GLES31.functional.draw_indirect.draw_elements_indirect.*.default_attribute
>
> These tests were causing a const vbo to be set up, and were small enough
> draws that the logic was trying to go via the push path (which emits
> data directly into the cmd stream rather than uploading a user vbo).
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> Cc: mesa-stable at lists.freedesktop.org
> ---
>  src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
> index 4d9cd57..888c094 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
> @@ -948,7 +948,8 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
>      * if index count is larger and we expect repeated vertices, suggest upload.
>      */
>     nvc0->vbo_push_hint =
> -      info->indexed && (nvc0->vb_elt_limit >= (info->count * 2));
> +      !info->indirect && info->indexed &&
> +      (nvc0->vb_elt_limit >= (info->count * 2));
>
>     /* Check whether we want to switch vertex-submission mode. */
>     if (nvc0->vbo_user && !(nvc0->dirty_3d & (NVC0_NEW_3D_ARRAYS | NVC0_NEW_3D_VERTEX))) {
>