diff options
| author | Brian Paul <brianp@vmware.com> | 2013-01-22 17:50:53 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-01-25 15:41:40 -0700 |
| commit | d6f8b7ef386ff85034b5ee38b6784bc59e00f213 (patch) | |
| tree | 885c24aea21b4f762fd3bd862776670e4d068125 /src | |
| parent | 811b5b4b398e4eb1617295fe7937e387ca0bcb44 (diff) | |
| download | external_mesa3d-d6f8b7ef386ff85034b5ee38b6784bc59e00f213.zip external_mesa3d-d6f8b7ef386ff85034b5ee38b6784bc59e00f213.tar.gz external_mesa3d-d6f8b7ef386ff85034b5ee38b6784bc59e00f213.tar.bz2 | |
glsl: use glsl_strtof() instead of glsl_strtod()
Since the result of those calls is always assigned to a float.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 10 | ||||
| -rw-r--r-- | src/glsl/s_expression.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index 2f66c58..ddc9f80 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -399,23 +399,23 @@ layout { } [0-9]+\.[0-9]+([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtod(yytext, NULL); + yylval->real = glsl_strtof(yytext, NULL); return FLOATCONSTANT; } \.[0-9]+([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtod(yytext, NULL); + yylval->real = glsl_strtof(yytext, NULL); return FLOATCONSTANT; } [0-9]+\.([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtod(yytext, NULL); + yylval->real = glsl_strtof(yytext, NULL); return FLOATCONSTANT; } [0-9]+[eE][+-]?[0-9]+[fF]? { - yylval->real = glsl_strtod(yytext, NULL); + yylval->real = glsl_strtof(yytext, NULL); return FLOATCONSTANT; } [0-9]+[fF] { - yylval->real = glsl_strtod(yytext, NULL); + yylval->real = glsl_strtof(yytext, NULL); return FLOATCONSTANT; } diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp index 57de9d3..1bdf6bc 100644 --- a/src/glsl/s_expression.cpp +++ b/src/glsl/s_expression.cpp @@ -66,18 +66,18 @@ read_atom(void *ctx, const char *&src, char *&symbol_buffer) return NULL; // no atom // Check for the special symbol '+INF', which means +Infinity. Note: C99 - // requires strtod to parse '+INF' as +Infinity, but we still support some + // requires strtof to parse '+INF' as +Infinity, but we still support some // non-C99-compliant compilers (e.g. MSVC). if (n == 4 && strncmp(src, "+INF", 4) == 0) { expr = new(ctx) s_float(std::numeric_limits<float>::infinity()); } else { // Check if the atom is a number. char *float_end = NULL; - double f = glsl_strtod(src, &float_end); + float f = glsl_strtof(src, &float_end); if (float_end != src) { char *int_end = NULL; int i = strtol(src, &int_end, 10); - // If strtod matched more characters, it must have a decimal part + // If strtof matched more characters, it must have a decimal part if (float_end > int_end) expr = new(ctx) s_float(f); else |