diff options
author | Marek Olšák <[email protected]> | 2019-09-27 17:28:48 -0400 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2019-10-16 20:10:47 -0400 |
commit | b596bb5b665eb2b77718fe219d7d050e88a0cd7b (patch) | |
tree | 31c80f9302ca98cec0951304b2a9a59de8a9926f | |
parent | 4e07869a063c67093eea2dc8c17e182f880f2e22 (diff) |
st/mesa: use *prog at the end of st_link_nir
Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 22175799cf3..dc6429f5671 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -806,17 +806,17 @@ st_link_nir(struct gl_context *ctx, if (shader == NULL) continue; - st_glsl_to_nir_post_opts(st, shader->Program, shader_program); + struct gl_program *prog = shader->Program; + st_glsl_to_nir_post_opts(st, prog, shader_program); - assert(shader->Program); if (!ctx->Driver.ProgramStringNotify(ctx, _mesa_shader_stage_to_program(i), - shader->Program)) { + prog)) { _mesa_reference_program(ctx, &shader->Program, NULL); return false; } - nir_sweep(shader->Program->nir); + nir_sweep(prog->nir); /* The GLSL IR won't be needed anymore. */ ralloc_free(shader->ir); |