retrace: Decode more attribute formats

Decode GL_INT_2_10_10_10_REV, GL_UNSIGNED_INT_2_10_10_10_REV, and
GL_UNSIGNED_INT_10F_11F_11F_REV attribute types.

Signed-off-by: Gert Wollny <[email protected]>

helpers/floating_point_conversion.hpp

@@ -0,0 +1,106 @@
+
+/* The code for converting fp11 and fp10 values to fp32 is taken from Mesa:
+ *
+ * Copyright (C) 2011 Marek Olšák <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef FLOATING_POINT_CONVERSION_H
+#define FLOATING_POINT_CONVERSION_H
+
+#include <stdint.h>
+
+#define UF11_EXPONENT_SHIFT  6
+#define UF10_EXPONENT_SHIFT  5
+#define F32_INFINITY         0x7f800000
+
+inline static float
+uint11ToFLoat(unsigned int val)
+{
+    union {
+       float f;
+       uint32_t ui;
+    } f32;
+
+    int exponent = (val & 0x07c0) >> UF11_EXPONENT_SHIFT;
+    int mantissa = (val & 0x003f);
+
+    f32.f = 0.0;
+
+    if (exponent == 0) {
+       if (mantissa != 0) {
+          const float scale = 1.0 / (1 << 20);
+          f32.f = scale * mantissa;
+       }
+    } else if (exponent == 31) {
+       f32.ui = F32_INFINITY | mantissa;
+    } else {
+       float scale, decimal;
+       exponent -= 15;
+       if (exponent < 0) {
+          scale = 1.0f / (1 << -exponent);
+       } else {
+          scale = (float) (1 << exponent);
+       }
+       decimal = 1.0f + (float) mantissa / 64;
+       f32.f = scale * decimal;
+    }
+
+    return f32.f;
+}
+
+inline static float
+uint10ToFLoat(unsigned int val)
+{
+   union {
+      float f;
+      uint32_t ui;
+   } f32;
+
+   int exponent = (val & 0x03e0) >> UF10_EXPONENT_SHIFT;
+   int mantissa = (val & 0x001f);
+
+   f32.f = 0.0;
+
+   if (exponent == 0) {
+      if (mantissa != 0) {
+         const float scale = 1.0 / (1 << 19);
+         f32.f = scale * mantissa;
+      }
+   } else if (exponent == 31) {
+      f32.ui = F32_INFINITY | mantissa;
+   } else {
+      float scale, decimal;
+      exponent -= 15;
+      if (exponent < 0) {
+         scale = 1.0f / (1 << -exponent);
+      }
+      else {
+         scale = (float) (1 << exponent);
+      }
+      decimal = 1.0f + (float) mantissa / 32;
+      f32.f = scale * decimal;
+   }
+
+   return f32.f;
+}
+
+#endif // FLOATING_POINT_CONVERSION_H

retrace/glstate_shaders.cpp

@@ -40,7 +40,7 @@
 #include "glstate.hpp"
 #include "glstate_internal.hpp"
 #include "halffloat.hpp"
-
+#include "floating_point_conversion.hpp"
 
 namespace glstate {
 
@@ -374,6 +374,18 @@ dumpAttrib(StateWriter &writer,
             case GL_BOOL:
                 writer.writeBool(*u.uivalue);
                 break;
+            case GL_INT_2_10_10_10_REV:
+            case GL_UNSIGNED_INT_2_10_10_10_REV:
+                writer.writeInt(*u.ivalue & 0x3ff);
+                writer.writeInt((*u.ivalue >> 10) & 0x3ff);
+                writer.writeInt((*u.ivalue >> 20) & 0x3ff);
+                writer.writeInt((*u.ivalue >> 30) & 0x3);
+                break;
+            case GL_UNSIGNED_INT_10F_11F_11F_REV:
+                writer.writeFloat(uint11ToFLoat(*u.ivalue & 0x7ff));
+                writer.writeFloat(uint11ToFLoat((*u.ivalue >> 11) & 0x7ff));
+                writer.writeFloat(uint10ToFLoat((*u.ivalue >> 21) & 0x3ff));
+                break;
             default:
                 assert(0);
                 writer.writeNull();