summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorZack Rusin <[email protected]>2014-03-26 16:08:25 +0000
committerJosé Fonseca <[email protected]>2014-03-26 16:11:28 +0000
commitbbdefabfc9922d4f4a796c72008f0d40d086c6da (patch)
treed1b704d382d147f592a79963af549b9123213b10 /src/gallium
parentaa2274c1d296c91826633dd687327ecc3cf4d5a6 (diff)
llvmpipe: Fix llvmpipe_create_gs_state.
Revert unintended behaviour change from commit b995a010e688bc4d4557e973e5e28091c378e881. Tested-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_gs.c8
1 files 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 c94afeddd16..7ea7a390669 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;