[Mesa-dev] [PATCH 1/2] glsl: make sure builtins are initialized before getting the shader

Rob Herring robh at kernel.org
Sun Feb 7 21:59:46 UTC 2016


On Sat, Feb 6, 2016 at 4:10 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> Cc: mesa-stable at lists.freedesktop.org

Thanks for digging into this.

Tested-by: Rob Herring <robh at kernel.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 4776ffa..f1ac53a 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.4.10
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list