From ac57577e29643a59a33a7c2b01def2e297db3448 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 6 Feb 2016 17:07:59 -0500 Subject: [PATCH] glsl: make sure builtins are initialized before getting the shader The builtin function shader is part of the builtin state, released when glReleaseShaderCompiler is called. We must ensure that the builtins have been (re)initialized before attempting to link with the builtin shader. Signed-off-by: Ilia Mirkin Reviewed-by: Timothy Arceri Tested-by: Rob Herring Cc: mesa-stable@lists.freedesktop.org --- src/compiler/glsl/linker.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 4776ffa6acd..f1ac53abb0a 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2125,6 +2125,7 @@ link_intrastage_shaders(void *mem_ctx, if (ok) { memcpy(linking_shaders, shader_list, num_shaders * sizeof(gl_shader *)); + _mesa_glsl_initialize_builtin_functions(); linking_shaders[num_shaders] = _mesa_glsl_get_builtin_function_shader(); ok = link_function_calls(prog, linked, linking_shaders, num_shaders + 1); -- 2.30.2