[Mesa-dev] [PATCH] mesa: add unpacking code for MESA_FORMAT_Z32_FLOAT_S8X24_UINT

[Kenneth Graunke]

On 02/28/2014 06:58 AM, Brian Paul wrote:
> Fixes glGetTexImage() when converting from MESA_FORMAT_Z32_FLOAT_S8X24_UINT
> to GL_UNSIGNED_INT_24_8.  Hit by the piglit
> ext_packed_depth_stencil-getteximage test.
> ---
>  src/mesa/main/format_unpack.c |   22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
> index c948a9d..276ba55 100644
> --- a/src/mesa/main/format_unpack.c
> +++ b/src/mesa/main/format_unpack.c
> @@ -4189,11 +4189,30 @@ unpack_uint_24_8_depth_stencil_S8_Z24(const GLuint *src, GLuint *dst, GLuint n)
>  }
>  
>  static void
> +unpack_uint_24_8_depth_stencil_Z32_S8X24(const GLuint *src,
> +                                         GLuint *dst, GLuint n)
> +{
> +   GLuint i;
> +
> +   for (i = 0; i < n; i++) {
> +      /* 8 bytes per pixel (float + uint32) */
> +      GLfloat zf = ((GLfloat *) src)[i * 2 + 0];
> +      GLuint z24 = (GLuint) (zf * (GLfloat) 0xffffff);
> +      GLuint s = src[i * 2 + 1] & 0xff;
> +      dst[i] = (z24 << 8) | s;
> +   }
> +}
> +
> +static void
>  unpack_uint_24_8_depth_stencil_Z24_S8(const GLuint *src, GLuint *dst, GLuint n)
>  {
>     memcpy(dst, src, n * 4);
>  }
>  
> +/**
> + * Unpack depth/stencil returning as GL_UNSIGNED_INT_24_8.
> + * \param format  the source data format
> + */
>  void
>  _mesa_unpack_uint_24_8_depth_stencil_row(mesa_format format, GLuint n,
>  					 const void *src, GLuint *dst)
> @@ -4205,6 +4224,9 @@ _mesa_unpack_uint_24_8_depth_stencil_row(mesa_format format, GLuint n,
>     case MESA_FORMAT_Z24_UNORM_S8_UINT:
>        unpack_uint_24_8_depth_stencil_S8_Z24(src, dst, n);
>        break;
> +   case MESA_FORMAT_Z32_FLOAT_S8X24_UINT:
> +      unpack_uint_24_8_depth_stencil_Z32_S8X24(src, dst, n);
> +      break;
>     default:
>        _mesa_problem(NULL,
>                      "bad format %s in _mesa_unpack_uint_24_8_depth_stencil_row",
> 

LGTM.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140228/a0b95a35/attachment.pgp>