diff options
author | Matt Turner <mattst88@gmail.com> | 2014-07-11 16:17:47 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2014-08-18 18:56:30 -0700 |
commit | d688667c7f8ab69b079b7c85dccc2b70e5863e32 (patch) | |
tree | 5a5f68d6d8801a00c390f0f93011ed58984cc026 /src/mesa/drivers/dri/i965/brw_cfg.cpp | |
parent | 19c6617adfec618889bb52d5398b8ac3d5969c18 (diff) | |
download | external_mesa3d-d688667c7f8ab69b079b7c85dccc2b70e5863e32.zip external_mesa3d-d688667c7f8ab69b079b7c85dccc2b70e5863e32.tar.gz external_mesa3d-d688667c7f8ab69b079b7c85dccc2b70e5863e32.tar.bz2 |
i965/cfg: Embed link in bblock_t for main block list.
The next patch adds a foreach_block (block, cfg) macro, which works
better if it provides a direct bblock_t pointer, rather than a
bblock_link pointer that you have to use to find the actual block.
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_cfg.cpp')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_cfg.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp index 07111f5..4a5c912 100644 --- a/src/mesa/drivers/dri/i965/brw_cfg.cpp +++ b/src/mesa/drivers/dri/i965/brw_cfg.cpp @@ -67,8 +67,8 @@ bblock_t::bblock_t() : void bblock_t::add_successor(void *mem_ctx, bblock_t *successor) { - successor->parents.push_tail(link(mem_ctx, this)); - children.push_tail(link(mem_ctx, successor)); + successor->parents.push_tail(::link(mem_ctx, this)); + children.push_tail(::link(mem_ctx, successor)); } void @@ -285,7 +285,7 @@ cfg_t::set_next_block(bblock_t **cur, bblock_t *block, int ip) block->start_ip = ip; block->block_num = num_blocks++; - block_list.push_tail(link(mem_ctx, block)); + block_list.push_tail(&block->link); *cur = block; } @@ -295,8 +295,8 @@ cfg_t::make_block_array() blocks = ralloc_array(mem_ctx, bblock_t *, num_blocks); int i = 0; - foreach_list_typed(bblock_link, link, link, &block_list) { - blocks[i++] = link->block; + foreach_list_typed(bblock_t, block, link, &block_list) { + blocks[i++] = block; } assert(i == num_blocks); } |