From 83984f134b4a1e2829cb238c404bc82c98be6082 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 3 Jul 2015 09:46:01 +0200 Subject: [PATCH] glsl: add a missing call to _mesa_locale_init After c61bc6e ("util: port _mesa_strto[df] to C"), "make check" fails due to a missing _mesa_locale_init. Fixup this oversight, by moving the stand-alone compiler initializer inside initialize_context_to_defaults(). Reviewed-by: Matt Turner Signed-off-by: Erik Faye-Lund --- src/glsl/main.cpp | 3 --- src/glsl/standalone_scaffolding.cpp | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index 58651df10a0..23412980dce 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -38,7 +38,6 @@ #include "program/hash_table.h" #include "loop_analysis.h" #include "standalone_scaffolding.h" -#include "util/strtod.h" static int glsl_version = 330; @@ -47,8 +46,6 @@ initialize_context(struct gl_context *ctx, gl_api api) { initialize_context_to_defaults(ctx, api); - _mesa_locale_init(); - /* The standalone compiler needs to claim support for almost * everything in order to compile the built-in functions. */ diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp index 00db61e409b..172c6f41570 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/glsl/standalone_scaffolding.cpp @@ -33,6 +33,7 @@ #include #include #include "util/ralloc.h" +#include "util/strtod.h" void _mesa_warning(struct gl_context *ctx, const char *fmt, ...) @@ -191,4 +192,6 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api) for (int sh = 0; sh < MESA_SHADER_STAGES; ++sh) memcpy(&ctx->Const.ShaderCompilerOptions[sh], &options, sizeof(options)); + + _mesa_locale_init(); } -- 2.30.2