diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2017-11-08 11:34:10 +1100 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-11-21 18:16:45 +0200 |
| commit | 96fe2da88b4307a5ecf556d34fbe9a94d1256466 (patch) | |
| tree | 6a6de3a796646e8042d5305570ae8bb9631a4f3c | |
| parent | 386cc0c6a844300f6505cbbe0d5ce75e00e65805 (diff) | |
| download | mesa-96fe2da88b4307a5ecf556d34fbe9a94d1256466.tar.gz | |
glsl: use the correct parent when allocating program data members
Cc: "17.2 17.3" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 9c33533586476693a197b7179552d140d54f23f2)
| -rw-r--r-- | src/compiler/glsl/link_atomics.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/shader_cache.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/compiler/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp index d26e62a35b3..d4a6eed639f 100644 --- a/src/compiler/glsl/link_atomics.cpp +++ b/src/compiler/glsl/link_atomics.cpp @@ -207,7 +207,7 @@ link_assign_atomic_counter_resources(struct gl_context *ctx, active_atomic_buffer *abs = find_active_atomic_counters(ctx, prog, &num_buffers); - prog->data->AtomicBuffers = rzalloc_array(prog, gl_active_atomic_buffer, + prog->data->AtomicBuffers = rzalloc_array(prog->data, gl_active_atomic_buffer, num_buffers); prog->data->NumAtomicBuffers = num_buffers; @@ -270,7 +270,7 @@ link_assign_atomic_counter_resources(struct gl_context *ctx, struct gl_program *gl_prog = prog->_LinkedShaders[j]->Program; gl_prog->info.num_abos = num_atomic_buffers[j]; gl_prog->sh.AtomicBuffers = - rzalloc_array(prog, gl_active_atomic_buffer *, + rzalloc_array(gl_prog, gl_active_atomic_buffer *, num_atomic_buffers[j]); unsigned intra_stage_idx = 0; diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index e25a19c80f8..92e41b8bf68 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -1319,7 +1319,7 @@ link_assign_uniform_storage(struct gl_context *ctx, union gl_constant_value *data; if (prog->data->UniformStorage == NULL) { - prog->data->UniformStorage = rzalloc_array(prog, + prog->data->UniformStorage = rzalloc_array(prog->data, struct gl_uniform_storage, prog->data->NumUniformStorage); data = rzalloc_array(prog->data->UniformStorage, diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 419f7d445e5..85fa31a6510 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1208,8 +1208,8 @@ interstage_cross_validate_uniform_blocks(struct gl_shader_program *prog, } for (unsigned int j = 0; j < sh_num_blocks; j++) { - int index = link_cross_validate_uniform_block(prog, &blks, num_blks, - sh_blks[j]); + int index = link_cross_validate_uniform_block(prog->data, &blks, + num_blks, sh_blks[j]); if (index == -1) { linker_error(prog, "buffer block `%s' has mismatching " @@ -3627,7 +3627,7 @@ add_program_resource(struct gl_shader_program *prog, return true; prog->data->ProgramResourceList = - reralloc(prog, + reralloc(prog->data, prog->data->ProgramResourceList, gl_program_resource, prog->data->NumProgramResourceList + 1); diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp index e320fe1c392..04ea004bbec 100644 --- a/src/compiler/glsl/shader_cache.cpp +++ b/src/compiler/glsl/shader_cache.cpp @@ -670,7 +670,7 @@ read_uniforms(struct blob_reader *metadata, struct gl_shader_program *prog) prog->data->NumUniformStorage = blob_read_uint32(metadata); prog->data->NumUniformDataSlots = blob_read_uint32(metadata); - uniforms = rzalloc_array(prog, struct gl_uniform_storage, + uniforms = rzalloc_array(prog->data, struct gl_uniform_storage, prog->data->NumUniformStorage); prog->data->UniformStorage = uniforms; @@ -1126,7 +1126,7 @@ read_program_resource_list(struct blob_reader *metadata, prog->data->NumProgramResourceList = blob_read_uint32(metadata); prog->data->ProgramResourceList = - ralloc_array(prog, gl_program_resource, + ralloc_array(prog->data, gl_program_resource, prog->data->NumProgramResourceList); for (unsigned i = 0; i < prog->data->NumProgramResourceList; i++) { |