diff options
author | Erik Faye-Lund <[email protected]> | 2015-06-28 14:51:08 +0200 |
---|---|---|
committer | Matt Turner <[email protected]> | 2015-06-29 09:06:40 -0700 |
commit | c61bc6ed844b39e600cc64e3e552c7bf1894d7ba (patch) | |
tree | 9339b5149a583451c69d4ddd0117508bd94244ad /src/mesa/main | |
parent | de3e323be1bdc40a2a7d724d0f3db7a81a93bbbb (diff) |
util: port _mesa_strto[df] to C
_mesa_strtod and _mesa_strtof are only used from the GLSL compiler and
the ARB_[vertex|fragment]_program code, meaning that the locale doesn't
need to be initialized before the first OpenGL context gets initialized.
So let's use explicit initialization from the one-time init code instead
of depending on a C++ compiler to initialize at image-load time.
Signed-off-by: Erik Faye-Lund <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index c4af8ea16db..e68de68d645 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -120,6 +120,7 @@ #include "shaderobj.h" #include "shaderimage.h" #include "util/simple_list.h" +#include "util/strtod.h" #include "state.h" #include "stencil.h" #include "texcompress_s3tc.h" @@ -374,6 +375,8 @@ one_time_init( struct gl_context *ctx ) assert( sizeof(GLint) == 4 ); assert( sizeof(GLuint) == 4 ); + _mesa_locale_init(); + _mesa_one_time_init_extension_overrides(); _mesa_get_cpu_features(); |