[Mesa-dev] [PATCH] mesa/format_unpack: add LUMINANCE 8/16 UINT/INT

[Brian Paul]

On Sun, Jan 29, 2012 at 9:27 AM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> This just copies what the LUMINANCE_ALPHA bits do.
>
> Fixes piglit tests on softpipe complaining about missing unpack.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/mesa/main/format_unpack.c |   59 +++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 59 insertions(+), 0 deletions(-)
>
> diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
> index a2d8891..a4acdcc 100644
> --- a/src/mesa/main/format_unpack.c
> +++ b/src/mesa/main/format_unpack.c
> @@ -2392,6 +2392,52 @@ unpack_int_rgba_LUMINANCE_UINT32(const GLuint *src, GLuint dst[][4], GLuint n)
>    }
>  }
>
> +
> +static void
> +unpack_int_rgba_LUMINANCE_UINT16(const GLushort *src, GLuint dst[][4], GLuint n)
> +{
> +   unsigned int i;
> +
> +   for (i = 0; i < n; i++) {
> +      dst[i][0] = dst[i][1] = dst[i][2] = src[i * 2 + 0];

I think the [i * 2 + 0] indexing is wrong.  If the source data is just
luminance, the index should be [i].


> +      dst[i][3] = 1;
> +   }
> +}
> +
> +static void
> +unpack_int_rgba_LUMINANCE_INT16(const GLshort *src, GLuint dst[][4], GLuint n)
> +{
> +   unsigned int i;
> +
> +   for (i = 0; i < n; i++) {
> +      dst[i][0] = dst[i][1] = dst[i][2] = src[i * 2 + 0];
> +      dst[i][3] = 1;
> +   }
> +}
> +
> +static void
> +unpack_int_rgba_LUMINANCE_UINT8(const GLubyte *src, GLuint dst[][4], GLuint n)
> +{
> +   unsigned int i;
> +
> +   for (i = 0; i < n; i++) {
> +      dst[i][0] = dst[i][1] = dst[i][2] = src[i * 2 + 0];
> +      dst[i][3] = 1;
> +   }
> +}
> +
> +static void
> +unpack_int_rgba_LUMINANCE_INT8(const GLbyte *src, GLuint dst[][4], GLuint n)
> +{
> +   unsigned int i;
> +
> +   for (i = 0; i < n; i++) {
> +      dst[i][0] = dst[i][1] = dst[i][2] = src[i * 2 + 0];
> +      dst[i][3] = 1;
> +   }
> +}
> +
> +
>  static void
>  unpack_int_rgba_LUMINANCE_ALPHA_UINT32(const GLuint *src, GLuint dst[][4], GLuint n)
>  {
> @@ -2618,6 +2664,19 @@ _mesa_unpack_uint_rgba_row(gl_format format, GLuint n,
>    case MESA_FORMAT_LUMINANCE_INT32:
>       unpack_int_rgba_LUMINANCE_UINT32(src, dst, n);
>       break;
> +   case MESA_FORMAT_LUMINANCE_UINT16:
> +      unpack_int_rgba_LUMINANCE_UINT16(src, dst, n);
> +      break;
> +   case MESA_FORMAT_LUMINANCE_INT16:
> +      unpack_int_rgba_LUMINANCE_INT16(src, dst, n);
> +      break;
> +
> +   case MESA_FORMAT_LUMINANCE_UINT8:
> +      unpack_int_rgba_LUMINANCE_UINT8(src, dst, n);
> +      break;
> +   case MESA_FORMAT_LUMINANCE_INT8:
> +      unpack_int_rgba_LUMINANCE_INT8(src, dst, n);
> +      break;
>
>    case MESA_FORMAT_LUMINANCE_ALPHA_UINT32:
>    case MESA_FORMAT_LUMINANCE_ALPHA_INT32:
> --
> 1.7.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev