Module: Mesa Branch: master Commit: bbdefabfc9922d4f4a796c72008f0d40d086c6da URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bbdefabfc9922d4f4a796c72008f0d40d086c6da
Author: Zack Rusin <[email protected]> Date: Wed Mar 26 16:08:25 2014 +0000 llvmpipe: Fix llvmpipe_create_gs_state. Revert unintended behaviour change from commit b995a010e688bc4d4557e973e5e28091c378e881. Tested-by: José Fonseca <[email protected]> --- src/gallium/drivers/llvmpipe/lp_state_gs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_state_gs.c b/src/gallium/drivers/llvmpipe/lp_state_gs.c index c94afed..7ea7a39 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_gs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_gs.c @@ -60,9 +60,11 @@ llvmpipe_create_gs_state(struct pipe_context *pipe, state->no_tokens = !templ->tokens; memcpy(&state->stream_output, &templ->stream_output, sizeof state->stream_output); - state->dgs = draw_create_geometry_shader(llvmpipe->draw, templ); - if (state->dgs == NULL) { - goto no_dgs; + if (templ->tokens) { + state->dgs = draw_create_geometry_shader(llvmpipe->draw, templ); + if (state->dgs == NULL) { + goto no_dgs; + } } return state; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
