diff options
author | Michel Dänzer <daenzer@vmware.com> | 2010-03-12 19:00:47 +0100 |
---|---|---|
committer | Michel Dänzer <daenzer@vmware.com> | 2010-03-12 19:00:47 +0100 |
commit | b13e305ee1a2454265fd957a99640a2e49507bea (patch) | |
tree | e62dfd0ff761ec89de478499130d58d4b119aa0d /src/mesa/shader/program_lexer.l | |
parent | d1ca1599f0319f5c99852ce24420aa592e806db0 (diff) | |
parent | 8561bec0ac1ae5a8871c86f1f2cc29d44cb0f878 (diff) |
Merge branch '7.8'
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 83bc5089d9..b00765793d 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 = _mesa_strtod(yytext, NULL); + yylval->real = (float) _mesa_strtod(yytext, NULL); return REAL; } {num}"."/[^.] { - yylval->real = _mesa_strtod(yytext, NULL); + yylval->real = (float) _mesa_strtod(yytext, NULL); return REAL; } {num}{exp} { - yylval->real = _mesa_strtod(yytext, NULL); + yylval->real = (float) _mesa_strtod(yytext, NULL); return REAL; } {num}"."{exp} { - yylval->real = _mesa_strtod(yytext, NULL); + yylval->real = (float) _mesa_strtod(yytext, NULL); return REAL; } |