Attachment 43357 Details for Bug 34047 – Proposed fix

[patch] Proposed fix

0001-tnl-Add-support-for-datatype-GL_FIXED-in-vertex-arra.patch (text/plain), 2.31 KB, created by Chad Versace on 2011-02-14 15:15:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chad Versace

Created: 2011-02-14 15:15:42 UTC

Size: 2.31 KB

patch

obsolete

>From 985fc5f57d3b45b743c2941df5b4ed5be68f0c81 Mon Sep 17 00:00:00 2001
>From: Chad Versace <chad.versace@intel.com>
>Date: Tue, 8 Feb 2011 14:30:55 -0800
>Subject: [PATCH] tnl: Add support for datatype GL_FIXED in vertex arrays
>
>Before populating the vertex buffer attribute pointer (VB->AttribPtr[]),
>convert vertex data in GL_FIXED format to GL_FLOAT.
>
>Fixes bug: http://bugs.freedesktop.org/show_bug.cgi?id=34047
>---
> src/mesa/tnl/t_draw.c |   40 ++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 40 insertions(+), 0 deletions(-)
>
>diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
>index 858b828..b1967e6 100644
>--- a/src/mesa/tnl/t_draw.c
>+++ b/src/mesa/tnl/t_draw.c
>@@ -125,6 +125,43 @@ convert_half_to_float(const struct gl_client_array *input,
>    }
> }
> 
>+/**
>+ * \brief Convert fixed-point to floating-point.
>+ *
>+ * In OpenGL, a fixed-point number is a "signed 2's complement 16.16 scaled
>+ * integer" (Table 2.2 of the OpenGL ES 2.0 spec).
>+ *
>+ * If the buffer has the \c normalized flag set, the formula
>+ *     \code normalize(x) := (2*x + 1) / (2^16 - 1) \endcode
>+ * is used to map the fixed-point numbers into the range [-1, 1].
>+ */
>+static void
>+convert_fixed_to_float(const struct gl_client_array *input,
>+                       const GLubyte *ptr, GLfloat *fptr,
>+                       GLuint count)
>+{
>+   GLuint i, j;
>+   const GLint size = input->Size;
>+
>+   if (input->Normalized) {
>+      for (i = 0; i < count; ++i) {
>+         const GLfixed *in = (GLfixed *) ptr;
>+         for (j = 0; j < size; ++j) {
>+            *fptr++ = (GLfloat) (2 * in[j] + 1) / (GLfloat) ((1 << 16) - 1);
>+         }
>+         ptr += input->StrideB;
>+      }
>+   } else {
>+      for (i = 0; i < count; ++i) {
>+         const GLfixed *in = (GLfixed *) ptr;
>+         for (j = 0; j < size; ++j) {
>+            *fptr++ = in[j] / (GLfloat) (1 << 16);
>+         }
>+         ptr += input->StrideB;
>+      }
>+   }
>+}
>+
> /* Adjust pointer to point at first requested element, convert to
>  * floating point, populate VB->AttribPtr[].
>  */
>@@ -174,6 +211,9 @@ static void _tnl_import_array( struct gl_context *ctx,
>       case GL_HALF_FLOAT:
> 	 convert_half_to_float(input, ptr, fptr, count, sz);
> 	 break;
>+      case GL_FIXED:
>+         convert_fixed_to_float(input, ptr, fptr, count);
>+         break;
>       default:
> 	 assert(0);
> 	 break;
>-- 
>1.7.3.5
>

Actions: View | Splinter Review

Attachments on bug 34047: 43357

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.