diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-11 11:54:09 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-14 10:04:36 +0200 |
| commit | 878a6e6eed9490109f0196e6af77cfba374a5fcc (patch) | |
| tree | 0fb02e0143b01309012c3ee29e0bb2e08acb87f7 /src/mesa/program | |
| parent | 70f2573103298b0bc6857a3d5d372ca9c1cede97 (diff) | |
mesa: pass gl_program to _mesa_associate_uniform_storage()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 7 | ||||
| -rw-r--r-- | src/mesa/program/ir_to_mesa.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index ab39406bd21..f6608af2240 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2529,9 +2529,11 @@ _mesa_generate_parameters_list_for_uniforms(struct gl_shader_program void _mesa_associate_uniform_storage(struct gl_context *ctx, struct gl_shader_program *shader_program, - struct gl_program_parameter_list *params, + struct gl_program *prog, bool propagate_to_storage) { + struct gl_program_parameter_list *params = prog->Parameters; + /* After adding each uniform to the parameter list, connect the storage for * the parameter with the tracking structure used by the API for the * uniform. @@ -2979,8 +2981,7 @@ get_mesa_program(struct gl_context *ctx, * prog->ParameterValues to get reallocated (e.g., anything that adds a * program constant) has to happen before creating this linkage. */ - _mesa_associate_uniform_storage(ctx, shader_program, prog->Parameters, - true); + _mesa_associate_uniform_storage(ctx, shader_program, prog, true); if (!shader_program->data->LinkStatus) { goto fail_exit; } diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h index 09446197b24..e3d364455cf 100644 --- a/src/mesa/program/ir_to_mesa.h +++ b/src/mesa/program/ir_to_mesa.h @@ -45,8 +45,8 @@ _mesa_generate_parameters_list_for_uniforms(struct gl_shader_program *params); void _mesa_associate_uniform_storage(struct gl_context *ctx, - struct gl_shader_program *shader_program, - struct gl_program_parameter_list *params, + struct gl_shader_program *shader_program, + struct gl_program *prog, bool propagate_to_storage); #ifdef __cplusplus |