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 <mattst88@gmail.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
This commit is contained in:
committed by
Matt Turner
parent
28dda47ae4
commit
83984f134b
@@ -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.
|
||||
*/
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user