[Mesa-dev] [PATCH 4/7] radv: remove one useless check in ac_nir_shader_info_pass()

Samuel Pitoiset samuel.pitoiset at gmail.com
Mon Dec 18 18:38:55 UTC 2017


pipeline->layout can't be NULL now.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/amd/common/ac_shader_info.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/amd/common/ac_shader_info.c b/src/amd/common/ac_shader_info.c
index 3299b47e6b..4df428ae81 100644
--- a/src/amd/common/ac_shader_info.c
+++ b/src/amd/common/ac_shader_info.c
@@ -149,10 +149,8 @@ ac_nir_shader_info_pass(struct nir_shader *nir,
 	struct nir_function *func = (struct nir_function *)exec_list_get_head(&nir->functions);
 
 	info->needs_push_constants = true;
-	if (!options->layout)
-		info->needs_push_constants = false;
-	else if (!options->layout->push_constant_size &&
-		 !options->layout->dynamic_offset_count)
+	if (!options->layout->push_constant_size &&
+	    !options->layout->dynamic_offset_count)
 		info->needs_push_constants = false;
 
 	nir_foreach_variable(variable, &nir->inputs)
-- 
2.15.1



More information about the mesa-dev mailing list