Mesa (master): ac: fix build error in si_shader

Timothy Arceri tarceri at kemper.freedesktop.org
Sat Jan 13 07:13:57 UTC 2018


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

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Fri Jan 12 15:47:34 2018 +0100

ac: fix build error in si_shader

assert() is replaced by unreachable(), to avoid following building error:

external/mesa/src/gallium/drivers/radeonsi/si_shader.c:1967:1:
error: control may reach end of non-void function [-Werror,-Wreturn-type]
}
^
1 error generated.

Fixes: c797cd6 ("ac: add load_patch_vertices_in() to the abi")

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index dd635ae203..35f82d8d63 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1963,7 +1963,7 @@ static LLVMValueRef si_load_patch_vertices_in(struct ac_shader_abi *abi)
 	else if (ctx->type == PIPE_SHADER_TESS_EVAL)
 		return get_num_tcs_out_vertices(ctx);
 	else
-		assert(!"invalid shader stage for TGSI_SEMANTIC_VERTICESIN");
+		unreachable("invalid shader stage for TGSI_SEMANTIC_VERTICESIN");
 }
 
 void si_load_system_value(struct si_shader_context *ctx,




More information about the mesa-commit mailing list