diff options
| author | Jason Ekstrand <[email protected]> | 2015-09-09 13:18:29 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-09-11 09:21:04 -0700 |
| commit | 8c8fc5f8336c8c79e5890265ae6c03271aa94075 (patch) | |
| tree | 862f8a0cad00a534a147ccffc70741f71a3428e6 /src/glsl/nir/nir_lower_io.c | |
| parent | 794355e77167291a3acc8d42249c760c24f54f38 (diff) | |
nir: Fix a bunch of ralloc parenting errors
As of a10d4937, we would really like things associated with an instruction
to be allocated out of that instruction and not out of the shader. In
particular, you should be passing the instruction that will ultimately be
holding the source into nir_src_copy rather than an arbitrary memory
context.
We also change the prototypes of nir_dest_copy and nir_alu_src/dest_copy to
explicitly take an instruction so we catch this earlier in the future.
Cc: "11.0" <[email protected]>
Reviewed-by: Thomas Helland <[email protected]>
Diffstat (limited to 'src/glsl/nir/nir_lower_io.c')
| -rw-r--r-- | src/glsl/nir/nir_lower_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/nir/nir_lower_io.c b/src/glsl/nir/nir_lower_io.c index afb463040cc..3739fc83f91 100644 --- a/src/glsl/nir/nir_lower_io.c +++ b/src/glsl/nir/nir_lower_io.c @@ -221,7 +221,7 @@ nir_lower_io_block(nir_block *block, void *void_state) store->const_index[0] = offset; - nir_src_copy(&store->src[0], &intrin->src[0], state->mem_ctx); + nir_src_copy(&store->src[0], &intrin->src[0], store); if (has_indirect) store->src[1] = indirect; |