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/slang/slang_compile.c | |
| 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/slang/slang_compile.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_compile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c index b95c15fea6..ad86676157 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/shader/slang/slang_compile.c @@ -246,7 +246,7 @@ parse_general_number(slang_parse_ctx *ctx, float *number) if (flt[strlen(flt) - 1] == 'f' || flt[strlen(flt) - 1] == 'F') { flt[strlen(flt) - 1] = '\0'; } - *number = (float)_mesa_strtod(flt, (char **)NULL); + *number = _mesa_strtof(flt, (char **)NULL); free(flt); return 1; @@ -312,7 +312,7 @@ parse_float(slang_parse_ctx * C, float *number) slang_string_concat(whole, "E"); slang_string_concat(whole, exponent); - *number = (float) (_mesa_strtod(whole, (char **) NULL)); + *number = _mesa_strtof(whole, (char **) NULL); _slang_free(whole); } |