Attachment 55692 Details for Bug 44767 – Proposed fix

[patch] Proposed fix

0001-glsl-Fix-isinf-for-non-C99-compliant-compilers.patch (text/plain), 2.51 KB, created by Paul Berry on 2012-01-17 10:43:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Berry

Created: 2012-01-17 10:43:43 UTC

Size: 2.51 KB

patch

obsolete

>From e690e496eb887bdabc042b7daf0a2402c5f410cd Mon Sep 17 00:00:00 2001
>From: Paul Berry <stereotype441@gmail.com>
>Date: Tue, 17 Jan 2012 10:28:10 -0800
>Subject: [PATCH] glsl: Fix isinf() for non-C99-compliant compilers.
>
>Commit ede60bc4670a8d9c14921c77abee1ac57fc0e6bf (glsl: Add isinf() and
>isnan() builtins) uses "+INF" in the .ir file to represent infinity.
>This worked on C99-compliant compilers, since the s-expression reader
>uses strtod() to read numbers, and C99 requires strtod() to understand
>"+INF".  However, it didn't work on non-C99-compliant compilers such
>as MSVC.
>
>This patch modifies the s-expression reader to explicitly check for
>"+INF" rather than relying on strtod() to support it.
>---
> src/glsl/s_expression.cpp |   35 +++++++++++++++++++++--------------
> 1 files changed, 21 insertions(+), 14 deletions(-)
>
>diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp
>index e704a3b..0dcd387 100644
>--- a/src/glsl/s_expression.cpp
>+++ b/src/glsl/s_expression.cpp
>@@ -64,21 +64,28 @@ read_atom(void *ctx, const char *&src, char *&symbol_buffer)
>    if (n == 0)
>       return NULL; // no atom
> 
>-   // Check if the atom is a number.
>-   char *float_end = NULL;
>-   double f = glsl_strtod(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 (float_end > int_end)
>-	 expr = new(ctx) s_float(f);
>-      else
>-	 expr = new(ctx) s_int(i);
>+   // Check for the special symbol '+INF', which means +Infinity.  Note: C99
>+   // requires strtod 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(INFINITY);
>    } else {
>-      // Not a number; return a symbol.
>-      symbol_buffer[n] = '\0';
>-      expr = new(ctx) s_symbol(symbol_buffer, n);
>+      // Check if the atom is a number.
>+      char *float_end = NULL;
>+      double f = glsl_strtod(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 (float_end > int_end)
>+            expr = new(ctx) s_float(f);
>+         else
>+            expr = new(ctx) s_int(i);
>+      } else {
>+         // Not a number; return a symbol.
>+         symbol_buffer[n] = '\0';
>+         expr = new(ctx) s_symbol(symbol_buffer, n);
>+      }
>    }
> 
>    src += n;
>-- 
>1.7.6.5
>

Actions: View | Splinter Review

Attachments on bug 44767: 55692

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.