From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sun, 8 Jan 2017 21:39:36 +0000 (+0100)
Subject: radv: Only call remove_dead_variables once.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18e70edd8c283463b2a5c8a22b6a5ea9a8d8fcd3;p=mesa.git

radv: Only call remove_dead_variables once.

Port of 43e0b0d4b255d910616c10e3e01bfec5db469e0e
"anv/pipeline: Only call remove_dead_variables once"

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
---

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 61af01ca9e4..03603f5ecc2 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -219,9 +219,9 @@ radv_shader_compile_to_nir(struct radv_device *device,
 		assert(exec_list_length(&nir->functions) == 1);
 		entry_point->name = ralloc_strdup(entry_point, "main");
 
-		nir_remove_dead_variables(nir, nir_var_shader_in);
-		nir_remove_dead_variables(nir, nir_var_shader_out);
-		nir_remove_dead_variables(nir, nir_var_system_value);
+		nir_remove_dead_variables(nir, nir_var_shader_in |
+		                               nir_var_shader_out |
+		                               nir_var_system_value);
 		nir_validate_shader(nir);
 
 		nir_lower_system_values(nir);