From: Zack Rusin <zackr@vmware.com>
Date: Wed, 26 Mar 2014 16:08:25 +0000 (+0000)
Subject: llvmpipe: Fix llvmpipe_create_gs_state.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbdefabfc9922d4f4a796c72008f0d40d086c6da;p=mesa.git

llvmpipe: Fix llvmpipe_create_gs_state.

Revert unintended behaviour change from commit
b995a010e688bc4d4557e973e5e28091c378e881.

Tested-by: José Fonseca <jfonseca@vmware.com>
---

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;