diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-03 14:12:14 +0200 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2014-07-28 12:33:38 +0200 |
commit | bf4655eecca0f66ed74967079805edb0650ef388 (patch) | |
tree | 1f4f608c69cf6236d7684f80e781a1ba79d658ec | |
parent | d0af0ba20147007135635d1512675a238027daa4 (diff) | |
download | mesa-bf4655eecca0f66ed74967079805edb0650ef388.tar.gz mesa-bf4655eecca0f66ed74967079805edb0650ef388.tar.xz |
sync etna driver to 06c1bc8
-rw-r--r-- | src/gallium/drivers/etna/etna_pipe.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/etna/etna_pipe.c b/src/gallium/drivers/etna/etna_pipe.c index 588f24a540..91df5f49b9 100644 --- a/src/gallium/drivers/etna/etna_pipe.c +++ b/src/gallium/drivers/etna/etna_pipe.c @@ -296,7 +296,6 @@ static void sync_context(struct pipe_context *restrict pipe) /* re-link vs and fs if needed */ etna_link_shaders(pipe, &e->shader_state, e->vs, e->fs); } - assert(!e->vs || e->vertex_elements.num_elements == e->vs->num_inputs); /* Pre-processing: see what caches we need to flush before making state * changes. @@ -800,6 +799,12 @@ static void etna_pipe_draw_vbo(struct pipe_context *pipe, } /* First, sync state, then emit DRAW_PRIMITIVES or DRAW_INDEXED_PRIMITIVES */ sync_context(pipe); + if(priv->vs && priv->vertex_elements.num_elements != priv->vs->num_inputs) + { + BUG("Number of elements %i does not match the number of VS inputs %i", + priv->vertex_elements.num_elements, priv->vs->num_inputs); + return; + } if(info->indexed) { etna_draw_indexed_primitives(priv->ctx, translate_draw_mode(info->mode), |