diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2014-08-20 14:40:22 +0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-10-30 02:26:19 -0700 |
| commit | e3f20294799d727107012d40f6c973975084e4e6 (patch) | |
| tree | 0078109ef4b6fed9197e3bd2c19dd5502c1966e0 /src/glsl/glsl_lexer.ll | |
| parent | 2c2ada67206326911a36368015b9501a023bbac8 (diff) | |
| download | external_mesa3d-e3f20294799d727107012d40f6c973975084e4e6.zip external_mesa3d-e3f20294799d727107012d40f6c973975084e4e6.tar.gz external_mesa3d-e3f20294799d727107012d40f6c973975084e4e6.tar.bz2 | |
util: add _mesa_strtod and _mesa_strtof
Both core mesa and glsl have their own wrappers for strtof_l. Merge
and move them to util/. They are compiled with a C++ compiler so that
we can make them thread-safe in a following commit.
Signed-off-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Kenneth Graunke <kenneth@whiteacpe.org>
Diffstat (limited to 'src/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index e66a935..ad6d32f 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -23,7 +23,7 @@ */ #include <ctype.h> #include <limits.h> -#include "strtod.h" +#include "util/strtod.h" #include "ast.h" #include "glsl_parser_extras.h" #include "glsl_parser.h" @@ -451,23 +451,23 @@ layout { } [0-9]+\.[0-9]+([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtof(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return FLOATCONSTANT; } \.[0-9]+([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtof(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return FLOATCONSTANT; } [0-9]+\.([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtof(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return FLOATCONSTANT; } [0-9]+[eE][+-]?[0-9]+[fF]? { - yylval->real = glsl_strtof(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return FLOATCONSTANT; } [0-9]+[fF] { - yylval->real = glsl_strtof(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return FLOATCONSTANT; } |