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/state_tracker | |
| 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/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_shader_cache.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index fd5eeea0f9a..524eefa236c 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -436,8 +436,7 @@ st_nir_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); struct st_vertex_program *stvp; struct st_fragment_program *stfp; diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 66f0814ddc9..f1e8ec5ead2 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6828,8 +6828,7 @@ get_mesa_program_tgsi(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) { free_glsl_to_tgsi_visitor(v); _mesa_reference_program(ctx, &shader->Program, NULL); diff --git a/src/mesa/state_tracker/st_shader_cache.c b/src/mesa/state_tracker/st_shader_cache.c index 305435ff5bb..ba964eb5f0b 100644 --- a/src/mesa/state_tracker/st_shader_cache.c +++ b/src/mesa/state_tracker/st_shader_cache.c @@ -364,8 +364,7 @@ st_load_tgsi_from_disk_cache(struct gl_context *ctx, } st_set_prog_affected_state_flags(glprog); - _mesa_associate_uniform_storage(ctx, prog, glprog->Parameters, - false); + _mesa_associate_uniform_storage(ctx, prog, glprog, false); /* Create Gallium shaders now instead of on demand. */ if (ST_DEBUG & DEBUG_PRECOMPILE || |