Mesa (master): freedreno/ir3: we require block_index metadata

Rob Clark robclark at kemper.freedesktop.org
Sun Jan 3 14:11:56 UTC 2016


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

Author: Rob Clark <robclark at freedesktop.org>
Date:   Mon Oct 26 10:50:35 2015 -0400

freedreno/ir3: we require block_index metadata

Found during NIR_TEST_CLONE=1 piglit run.  We were using block->index
but forgetting to require it.  Causing things to not work with a cloned
shader which didn't preserve block_index.

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
index 0a25d52..86afda4 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
@@ -2098,6 +2098,8 @@ emit_stream_out(struct ir3_compile *ctx)
 static void
 emit_function(struct ir3_compile *ctx, nir_function_impl *impl)
 {
+	nir_metadata_require(impl, nir_metadata_block_index);
+
 	emit_cf_list(ctx, &impl->body);
 	emit_block(ctx, impl->end_block);
 




More information about the mesa-commit mailing list