From: Axel Davy <axel.davy@ens.fr>
Date: Mon, 23 Mar 2015 22:31:18 +0000 (+0100)
Subject: st/nine: Fix update_vertex_elements bad rebase
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54f8e8a18da58c85a2f515d5fd0552fa4f5547bb;p=mesa.git

st/nine: Fix update_vertex_elements bad rebase

This code was supposed to be removed, but a rebase seems to have
made it stay.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c
index 6e019558c15..034e666d84c 100644
--- a/src/gallium/state_trackers/nine/nine_state.c
+++ b/src/gallium/state_trackers/nine/nine_state.c
@@ -225,9 +225,6 @@ update_vertex_elements(struct NineDevice9 *device)
     memset(used_streams, 0, device->caps.MaxStreams);
     vs = device->state.vs ? device->state.vs : device->ff.vs;
 
-    if (!vdecl) /* no inputs */
-        return;
-
     if (vdecl) {
         for (n = 0; n < vs->num_inputs; ++n) {
             DBG("looking up input %u (usage %u) from vdecl(%p)\n",