fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir: some small cleanups

Browse source 
The various cf nodes all get allocated w/ shader as their ralloc_parent,
so lets make this more explicit.  Plus couple other corrections/
clarifications.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
This commit is contained in:
Rob Clark 2015-10-21 10:57:15 -04:00 • committed by Rob Clark
parent d68226087c
commit 99597d033a
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/glsl/nir/nir.c
View file

@ -302,9 +302,9 @@ nir_function_impl_create(nir_function_overload *overload)
}
nir_block *
nir_block_create(void *mem_ctx)
nir_block_create(nir_shader *shader)
{
nir_block *block = ralloc(mem_ctx, nir_block);
nir_block *block = ralloc(shader, nir_block);
cf_init(&block->cf_node, nir_cf_node_block);
@ -330,19 +330,19 @@ src_init(nir_src *src)
}
nir_if *
nir_if_create(void *mem_ctx)
nir_if_create(nir_shader *shader)
{
nir_if *if_stmt = ralloc(mem_ctx, nir_if);
nir_if *if_stmt = ralloc(shader, nir_if);
cf_init(&if_stmt->cf_node, nir_cf_node_if);
src_init(&if_stmt->condition);
nir_block *then = nir_block_create(mem_ctx);
nir_block *then = nir_block_create(shader);
exec_list_make_empty(&if_stmt->then_list);
exec_list_push_tail(&if_stmt->then_list, &then->cf_node.node);
then->cf_node.parent = &if_stmt->cf_node;
nir_block *else_stmt = nir_block_create(mem_ctx);
nir_block *else_stmt = nir_block_create(shader);
exec_list_make_empty(&if_stmt->else_list);
exec_list_push_tail(&if_stmt->else_list, &else_stmt->cf_node.node);
else_stmt->cf_node.parent = &if_stmt->cf_node;
@ -351,13 +351,13 @@ nir_if_create(void *mem_ctx)
}
nir_loop *
nir_loop_create(void *mem_ctx)
nir_loop_create(nir_shader *shader)
{
nir_loop *loop = ralloc(mem_ctx, nir_loop);
nir_loop *loop = ralloc(shader, nir_loop);
cf_init(&loop->cf_node, nir_cf_node_loop);
nir_block *body = nir_block_create(mem_ctx);
nir_block *body = nir_block_create(shader);
exec_list_make_empty(&loop->body);
exec_list_push_tail(&loop->body, &body->cf_node.node);
body->cf_node.parent = &loop->cf_node;

10
src/glsl/nir/nir.h
View file

@ -394,10 +394,10 @@ typedef struct {
*/
bool is_packed;
/** set of nir_instr's where this register is used (read from) */
/** set of nir_src's where this register is used (read from) */
struct list_head uses;
/** set of nir_instr's where this register is defined (written to) */
/** set of nir_dest's where this register is defined (written to) */
struct list_head defs;
/** set of nir_if's where this register is used as a condition */
@ -1621,9 +1621,9 @@ nir_function_overload *nir_function_overload_create(nir_function *func);
nir_function_impl *nir_function_impl_create(nir_function_overload *func);
nir_block *nir_block_create(void *mem_ctx);
nir_if *nir_if_create(void *mem_ctx);
nir_loop *nir_loop_create(void *mem_ctx);
nir_block *nir_block_create(nir_shader *shader);
nir_if *nir_if_create(nir_shader *shader);
nir_loop *nir_loop_create(nir_shader *shader);
nir_function_impl *nir_cf_node_get_function(nir_cf_node *node);