Otherwise we get: warning: 'num_user_sgprs' may be used uninitialized in this function ... --- src/gallium/drivers/radeonsi/si_shader.c | 2 +- src/gallium/drivers/radeonsi/si_state_shaders.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 4288e9b..819e5a7 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2408,7 +2408,7 @@ static void tex_fetch_args( num_deriv_channels = 1; break; default: - assert(0); /* no other targets are valid here */ + unreachable("invalid target"); } for (param = 0; param < 2; param++) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 0347014..a09f588 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -181,7 +181,7 @@ static void si_shader_es(struct si_shader *shader) vgpr_comp_cnt = 3; /* all components are needed for TES */ num_user_sgprs = SI_TES_NUM_USER_SGPR; } else - assert(0); + unreachable("invalid shader selector type"); num_sgprs = shader->num_sgprs; /* One SGPR after user SGPRs is pre-loaded with es2gs_offset */ @@ -338,7 +338,7 @@ static void si_shader_vs(struct si_shader *shader) vgpr_comp_cnt = 3; /* all components are needed for TES */ num_user_sgprs = SI_TES_NUM_USER_SGPR; } else - assert(0); + unreachable("invalid shader selector type"); num_sgprs = shader->num_sgprs; if (num_user_sgprs > num_sgprs) { -- 1.9.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev