Mesa (master): i965: Move mistakenly placed line

Matt Turner mattst88 at kemper.freedesktop.org
Mon Feb 5 17:51:17 UTC 2018


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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 31 11:09:36 2018 -0800

i965: Move mistakenly placed line

Ken called this out in review, but it seems I forgot to make the change.
I noticed that the control flow annotations in the fragment shader
disassembly of tests/shaders/glsl-fs-loop-continue.shader_test were not
correct, and moving this line to the correct place fixes it.

---

 src/intel/compiler/brw_disasm_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/compiler/brw_disasm_info.c b/src/intel/compiler/brw_disasm_info.c
index 3db79ede70..f8f4c02e76 100644
--- a/src/intel/compiler/brw_disasm_info.c
+++ b/src/intel/compiler/brw_disasm_info.c
@@ -123,8 +123,8 @@ disasm_annotate(struct disasm_info *disasm,
    struct inst_group *group;
    if (!disasm->use_tail) {
       group = disasm_new_inst_group(disasm, offset);
-      disasm->use_tail = false;
    } else {
+      disasm->use_tail = false;
       group = exec_node_data(struct inst_group,
                              exec_list_get_tail_raw(&disasm->group_list), link);
    }




More information about the mesa-commit mailing list