summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-04-02 15:29:45 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-04-03 08:47:59 -0700
commit6f6e711c721eba8dad1541479e31d5db5108b41d (patch)
treeb870b364a4d96cb9f826a53d1cfeda046c1a3b7a
parentd3e96b106307af7a5de8875cc5d6751c5b5edbb1 (diff)
mesa: ensure that variable is initialized
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 <dylan.c.baker@intel.com> Tested-by: Mark Janes <mark.a.janes@intel.com> Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com>
-rw-r--r--src/mesa/program/ir_to_mesa.cpp2
1 files changed, 1 insertions, 1 deletions
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);