diff options
| author | Kenneth Graunke <[email protected]> | 2015-03-28 10:02:17 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2015-04-07 14:34:13 -0700 |
| commit | 4f4b04b7c7ee1ce27da990190a740473db0f2ecb (patch) | |
| tree | 16f5cc9c92f06cb6a5db5124716c259b8f8ea986 /src/glsl | |
| parent | 900498bd111091dfda79d5ca6d84fffd427a866d (diff) | |
nir: Allocate nir_ssa_def::uses/if_uses out of the instruction.
We can't allocate them out of the nir_ssa_def itself, because it may not
be ralloc'd (for example, nir_dest embeds a nir_ssa_def).
However, allocating them out of the instruction should work.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/nir/nir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index 0f807ddcccf..85ff0f46e2e 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -1834,13 +1834,11 @@ void nir_ssa_def_init(nir_instr *instr, nir_ssa_def *def, unsigned num_components, const char *name) { - void *mem_ctx = ralloc_parent(instr); - def->name = name; def->parent_instr = instr; - def->uses = _mesa_set_create(mem_ctx, _mesa_hash_pointer, + def->uses = _mesa_set_create(instr, _mesa_hash_pointer, _mesa_key_pointer_equal); - def->if_uses = _mesa_set_create(mem_ctx, _mesa_hash_pointer, + def->if_uses = _mesa_set_create(instr, _mesa_hash_pointer, _mesa_key_pointer_equal); def->num_components = num_components; |