[Mesa-dev] [PATCH 1/2] ac: match radeonsi code in ac_shader_binary_read_config

Marek Olšák maraeo at gmail.com
Fri May 10 05:20:42 UTC 2019


From: Marek Olšák <marek.olsak at amd.com>

---
 src/amd/common/ac_binary.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/amd/common/ac_binary.c b/src/amd/common/ac_binary.c
index fabeb15a204..8f4755ebe16 100644
--- a/src/amd/common/ac_binary.c
+++ b/src/amd/common/ac_binary.c
@@ -281,25 +281,25 @@ void ac_shader_binary_read_config(struct ac_shader_binary *binary,
 				static bool printed;
 
 				if (!printed) {
 					fprintf(stderr, "Warning: LLVM emitted unknown "
 						"config register: 0x%x\n", reg);
 					printed = true;
 				}
 			}
 			break;
 		}
-
-		if (!conf->spi_ps_input_addr)
-			conf->spi_ps_input_addr = conf->spi_ps_input_ena;
 	}
 
+	if (!conf->spi_ps_input_addr)
+		conf->spi_ps_input_addr = conf->spi_ps_input_ena;
+
 	if (really_needs_scratch) {
 		/* sgprs spills aren't spilling */
 	        conf->scratch_bytes_per_wave = G_00B860_WAVESIZE(wavesize) * 256 * 4;
 	}
 }
 
 void ac_shader_binary_clean(struct ac_shader_binary *b)
 {
 	if (!b)
 		return;
-- 
2.17.1



More information about the mesa-dev mailing list