Mesa (master): nir: Fix the control flow tests for nir_loop_first_block changes

Jason Ekstrand jekstrand at kemper.freedesktop.org
Thu Oct 6 22:47:48 UTC 2016


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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Oct  6 15:46:22 2016 -0700

nir: Fix the control flow tests for nir_loop_first_block changes

Commit 2ed17d46de045404042f13c6591895a1cf31b167 changed
nir_loop_first_cf_node and friends to return a nir_block instead of a
nir_cf_node.  This broke one of the NIR control flow tests.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/compiler/nir/tests/control_flow_tests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/tests/control_flow_tests.cpp b/src/compiler/nir/tests/control_flow_tests.cpp
index db660fd..ae0954f 100644
--- a/src/compiler/nir/tests/control_flow_tests.cpp
+++ b/src/compiler/nir/tests/control_flow_tests.cpp
@@ -76,7 +76,7 @@ TEST_F(nir_cf_test, delete_break_in_loop)
     * }
     */
    nir_block *block_0 = nir_start_block(b.impl);
-   nir_block *block_1 = nir_cf_node_as_block(nir_loop_first_cf_node(loop));
+   nir_block *block_1 = nir_loop_first_block(loop);
    nir_block *block_2 = nir_cf_node_as_block(nir_cf_node_next(&loop->cf_node));
    nir_block *block_3 = b.impl->end_block;
    ASSERT_EQ(nir_cf_node_block, block_0->cf_node.type);




More information about the mesa-commit mailing list