Mesa (master): radeonsi: don't fail in si_shader_io_get_unique_index

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 101a73846b48ebac8e2386a25b24659f013c66a4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=101a73846b48ebac8e2386a25b24659f013c66a4

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jun 25 14:58:37 2015 +0200

radeonsi: don't fail in si_shader_io_get_unique_index

Trivial. Picked from my tessellation branch.

---

 src/gallium/drivers/radeonsi/si_shader.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 47e5f96..a293ef3 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -133,8 +133,12 @@ unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index)
 		return 4 + index;
 
 	default:
-		assert(0);
-		return 63;
+		/* Don't fail here. The result of this function is only used
+		 * for LS, TCS, TES, and GS, where legacy GL semantics can't
+		 * occur, but this function is called for all vertex shaders
+		 * before it's known whether LS will be compiled or not.
+		 */
+		return 0;
 	}
 }