summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2015-06-28 14:51:08 +0200
committerMatt Turner <mattst88@gmail.com>2015-06-29 09:06:40 -0700
commitc61bc6ed844b39e600cc64e3e552c7bf1894d7ba (patch)
tree9339b5149a583451c69d4ddd0117508bd94244ad
parentde3e323be1bdc40a2a7d724d0f3db7a81a93bbbb (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 <kusmabite@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/glsl/glcpp/glcpp.c3
-rw-r--r--src/glsl/main.cpp3
-rw-r--r--src/mesa/main/context.c3
-rw-r--r--src/util/Makefile.sources2
-rw-r--r--src/util/strtod.c (renamed from src/util/strtod.cpp)14
-rw-r--r--src/util/strtod.h3
6 files changed, 21 insertions, 7 deletions
diff --git a/src/glsl/glcpp/glcpp.c b/src/glsl/glcpp/glcpp.c
index 5144516a69c..c62f4efec9d 100644
--- a/src/glsl/glcpp/glcpp.c
+++ b/src/glsl/glcpp/glcpp.c
@@ -29,6 +29,7 @@
#include "glcpp.h"
#include "main/mtypes.h"
#include "main/shaderobj.h"
+#include "util/strtod.h"
extern int glcpp_parser_debug;
@@ -168,6 +169,8 @@ main (int argc, char *argv[])
if (shader == NULL)
return 1;
+ _mesa_locale_init();
+
ret = glcpp_preprocess(ctx, &shader, &info_log, NULL, &gl_ctx);
printf("%s", shader);
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 23412980dce..58651df10a0 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -38,6 +38,7 @@
#include "program/hash_table.h"
#include "loop_analysis.h"
#include "standalone_scaffolding.h"
+#include "util/strtod.h"
static int glsl_version = 330;
@@ -46,6 +47,8 @@ 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/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();
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index dc559391823..82df3bcb00a 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -19,7 +19,7 @@ MESA_UTIL_FILES := \
set.c \
set.h \
simple_list.h \
- strtod.cpp \
+ strtod.c \
strtod.h \
texcompress_rgtc_tmp.h \
u_atomic.h
diff --git a/src/util/strtod.cpp b/src/util/strtod.c
index 2b4dd982a80..a4a60e0404a 100644
--- a/src/util/strtod.cpp
+++ b/src/util/strtod.c
@@ -30,18 +30,20 @@
#include <locale.h>
#ifdef HAVE_XLOCALE_H
#include <xlocale.h>
+static locale_t loc;
#endif
#endif
#include "strtod.h"
+void
+_mesa_locale_init(void)
+{
#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
-static struct locale_initializer {
- locale_initializer() { loc = newlocale(LC_CTYPE_MASK, "C", NULL); }
- locale_t loc;
-} loc_init;
+ loc = newlocale(LC_CTYPE_MASK, "C", NULL);
#endif
+}
/**
* Wrapper around strtod which uses the "C" locale so the decimal
@@ -51,7 +53,7 @@ double
_mesa_strtod(const char *s, char **end)
{
#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
- return strtod_l(s, end, loc_init.loc);
+ return strtod_l(s, end, loc);
#else
return strtod(s, end);
#endif
@@ -66,7 +68,7 @@ float
_mesa_strtof(const char *s, char **end)
{
#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
- return strtof_l(s, end, loc_init.loc);
+ return strtof_l(s, end, loc);
#elif defined(HAVE_STRTOF)
return strtof(s, end);
#else
diff --git a/src/util/strtod.h b/src/util/strtod.h
index 02c25ddb78f..b7e2beb5f30 100644
--- a/src/util/strtod.h
+++ b/src/util/strtod.h
@@ -31,6 +31,9 @@
extern "C" {
#endif
+extern void
+_mesa_locale_init(void);
+
extern double
_mesa_strtod(const char *s, char **end);