[Mesa-stable] [Mesa-dev] [PATCH 2/2] mesa: fix unpack_Z32_FLOAT_X24S8() / unpack_Z32_FLOAT() mix-up

[Roland Scheidegger]

Am 22.03.2014 18:27, schrieb Brian Paul:
> And use the z32f_x24s8 helper struct in unpack_Z32_FLOAT_X24S8().
> Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
> ---
>  src/mesa/main/format_unpack.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
> index f85c875..906001d 100644
> --- a/src/mesa/main/format_unpack.c
> +++ b/src/mesa/main/format_unpack.c
> @@ -717,20 +717,20 @@ unpack_Z32(const void *src, GLfloat dst[][4], GLuint n)
>  }
>  
>  static void
> -unpack_Z32_FLOAT(const void *src, GLfloat dst[][4], GLuint n)
> +unpack_Z32_FLOAT_X24S8(const void *src, GLfloat dst[][4], GLuint n)
>  {
> -   const GLfloat *s = ((const GLfloat *) src);
> +   const struct z32f_x24s8 *s = (const struct z32f_x24s8 *) src;
>     GLuint i;
>     for (i = 0; i < n; i++) {
>        dst[i][0] =
>        dst[i][1] =
> -      dst[i][2] = s[i * 2];
> +      dst[i][2] = s[i].z;
>        dst[i][3] = 1.0F;
>     }
>  }
>  
>  static void
> -unpack_Z32_FLOAT_X24S8(const void *src, GLfloat dst[][4], GLuint n)
> +unpack_Z32_FLOAT(const void *src, GLfloat dst[][4], GLuint n)
>  {
>     const GLfloat *s = ((const GLfloat *) src);
>     GLuint i;
> 

Looks good to me.

Roland