diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-05-15 01:26:37 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-05-15 10:48:39 -0400 |
| commit | 9323d084ac5a5f59936097b6f5bf9db41c1a89bd (patch) | |
| tree | 0273540f788edf89fd33715c343dfcde7a33b1d9 | |
| parent | 2ef3cdb07e42d985103b5a3e930b2bba676e920b (diff) | |
| download | external_mesa3d-9323d084ac5a5f59936097b6f5bf9db41c1a89bd.zip external_mesa3d-9323d084ac5a5f59936097b6f5bf9db41c1a89bd.tar.gz external_mesa3d-9323d084ac5a5f59936097b6f5bf9db41c1a89bd.tar.bz2 | |
nvc0: don't try to go through the push path for indirect draws
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@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c | 3 |
1 files changed, 2 insertions, 1 deletions
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))) { |