diff options
| author | Pauli Nieminen <suokkos@gmail.com> | 2010-03-17 11:26:48 +0200 |
|---|---|---|
| committer | Pauli Nieminen <suokkos@gmail.com> | 2010-03-17 11:26:48 +0200 |
| commit | f0f04cd12db156ec53b7ea46fae27199af121f90 (patch) | |
| tree | fdf67a4fd47d4b12eec75aac85496420ca95dbd6 /src/mesa/shader/program_lexer.l | |
| parent | e1ee3eaf6d739ddaa31bad1316e000c6220fa707 (diff) | |
| parent | a29c7948d965ad274ae7ac98fe01f2f877b19d94 (diff) | |
Merge branch '7.8' into master
Conflicts:
Makefile
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/shader/program_lexer.l')
| -rw-r--r-- | src/mesa/shader/program_lexer.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l index b00765793d..fe18272cdb 100644 --- a/src/mesa/shader/program_lexer.l +++ b/src/mesa/shader/program_lexer.l @@ -324,19 +324,19 @@ ARRAYSHADOW2D { return_token_or_IDENTIFIER(require_ARB_fp && require return INTEGER; } {num}?{frac}{exp}? { - yylval->real = (float) _mesa_strtod(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return REAL; } {num}"."/[^.] { - yylval->real = (float) _mesa_strtod(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return REAL; } {num}{exp} { - yylval->real = (float) _mesa_strtod(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return REAL; } {num}"."{exp} { - yylval->real = (float) _mesa_strtod(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return REAL; } |