From 06d038c4bd479207576bcbfee9f6c3dc7ee64b94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Sun, 25 Jun 2017 15:26:47 +0200 Subject: [PATCH] st/glsl_to_nir: fix the case where NIR clone testing is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In that case, prog->nir must be assigned at the end. Reviewed-by: Eric Anholt Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 89f78884389..5c4ae813055 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -236,7 +236,6 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog, return prog->nir; nir = glsl_to_nir(shader_program, stage, options); - prog->nir = nir; NIR_PASS_V(nir, nir_lower_io_to_temporaries, nir_shader_get_entrypoint(nir), @@ -281,6 +280,8 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog, _mesa_log("\n\n"); } + prog->nir = nir; + return nir; } -- 2.30.2