From: Brian Paul <brianp@vmware.com>
Date: Mon, 13 Feb 2012 15:49:34 +0000 (-0700)
Subject: mesa: add MESA_FORMAT_Z32_FLOAT_X24S8 case in format unpack code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82ddd1129e76b8bb978497df2940d1449a848551;p=mesa.git

mesa: add MESA_FORMAT_Z32_FLOAT_X24S8 case in format unpack code

Added in _mesa_pack_uint_24_8_depth_stencil_row().  This could be hit
by something like glDrawPixels(GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8)
into a MESA_FORMAT_Z32_FLOAT_X24S8 buffer.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index ea1d95ee9e9..e20e361c842 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -2530,6 +2530,19 @@ _mesa_pack_uint_24_8_depth_stencil_row(gl_format format, GLuint n,
          }
       }
       break;
+   case MESA_FORMAT_Z32_FLOAT_X24S8:
+      {
+         const GLdouble scale = 1.0 / (GLdouble) 0xffffff;
+         GLuint *destu = (GLuint *) dst;
+         GLfloat *destf = (GLfloat *) dst;
+         GLint i;
+         for (i = 0; i < n; i++) {
+            GLfloat z = (src[i] >> 8) * scale;
+            destf[i * 2 + 0] = z;
+            destu[i * 2 + 1] = src[i] & 0xff;
+         }
+      }
+      break;
    default:
       _mesa_problem(NULL, "bad format %s in _mesa_pack_ubyte_s_row",
                     _mesa_get_format_name(format));