From 6f6e711c721eba8dad1541479e31d5db5108b41d Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 2 Apr 2018 15:29:45 -0700 Subject: [PATCH] mesa: ensure that variable is initialized MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This variable controls whether we link using the glsl code path or the spirv path. It's set when we validate that all shaders are glsl or spirv, but if there are no shaders attached to the program it will remain unset, resulting in undefined behavior. We want to go down the glsl path in that case, so initialize to false. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105820 Fixes: 16f6634e7fb5ada308e55b852cd49251e7f3f8b1 ("mesa/program: Link SPIR-V shaders using the SPIR-V code-path") Signed-off-by: Dylan Baker Tested-by: Mark Janes Reviewed-by: Alejandro Piñeiro --- src/mesa/program/ir_to_mesa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 49ef5ea52d8..60fb24bf664 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3126,7 +3126,7 @@ void _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) { unsigned int i; - bool spirv; + bool spirv = false; _mesa_clear_shader_program_data(ctx, prog); -- 2.30.2