Module: Mesa Branch: master Commit: 0ba4320d94f23da45525699c1a3a947f2c598c3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ba4320d94f23da45525699c1a3a947f2c598c3e
Author: Wladimir J. van der Laan <[email protected]> Date: Sat Oct 28 15:57:14 2017 +0200 etnaviv: Allow clearing constant buffer using buffer==NULL user_buffer==NULL Prevents an assertion when using GALLIUM_HUD with ioquake3, when cso_restore_constant_buffer_slot0 restores an empty constant buffer in slot 0. Signed-off-by: Wladimir J. van der Laan <[email protected]> Signed-off-by: Lucas Stach <[email protected]> --- src/gallium/drivers/etnaviv/etnaviv_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index 34bcb19069..ba62c5f194 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -89,7 +89,7 @@ etna_set_constant_buffer(struct pipe_context *pctx, /* Note that the state tracker can unbind constant buffers by * passing NULL here. */ - if (unlikely(!cb)) + if (unlikely(!cb || (!cb->buffer && !cb->user_buffer))) return; /* there is no support for ARB_uniform_buffer_object */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
