Module: Mesa Branch: master Commit: 14b8d979db4bfde66b8c5cac00a4cbabb285b816 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14b8d979db4bfde66b8c5cac00a4cbabb285b816
Author: Jason Ekstrand <[email protected]> Date: Sat Apr 18 17:22:01 2020 -0500 intel/fs: Rename block to scan_block in can_coalesce_vars Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4627> --- src/intel/compiler/brw_fs_register_coalesce.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs_register_coalesce.cpp b/src/intel/compiler/brw_fs_register_coalesce.cpp index 44ad3e624c3..e1964863519 100644 --- a/src/intel/compiler/brw_fs_register_coalesce.cpp +++ b/src/intel/compiler/brw_fs_register_coalesce.cpp @@ -120,13 +120,13 @@ can_coalesce_vars(const fs_live_variables &live, int start_ip = MAX2(dst_start, src_start); int end_ip = MIN2(dst_end, src_end); - foreach_block(block, cfg) { - if (block->end_ip < start_ip) + foreach_block(scan_block, cfg) { + if (scan_block->end_ip < start_ip) continue; - int scan_ip = block->start_ip - 1; + int scan_ip = scan_block->start_ip - 1; - foreach_inst_in_block(fs_inst, scan_inst, block) { + foreach_inst_in_block(fs_inst, scan_inst, scan_block) { scan_ip++; /* Ignore anything before the intersection of the live ranges */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
