mesa: Add unpack functions for R/RG/RGB [U]INT8/16/32 formats.

NOTE: This is a candidate for stable branches.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63569
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index 9d565ccf1b3a230555b35f025822fa4901d6faa0..19ed43caa975658abc3386bd9d47358b55f21e33 100644 (file)
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -1076,6 +1076,45 @@ unpack_RG_FLOAT16(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 
+static void
+unpack_R_INT8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLbyte *s = (const GLbyte *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i];
+      dst[i][GCOMP] = 0.0;
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RG_INT8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLbyte *s = (const GLbyte *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*2+0];
+      dst[i][GCOMP] = (GLfloat) s[i*2+1];
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RGB_INT8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLbyte *s = (const GLbyte *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*3+0];
+      dst[i][GCOMP] = (GLfloat) s[i*3+1];
+      dst[i][BCOMP] = (GLfloat) s[i*3+2];
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
 static void
 unpack_RGBA_INT8(const void *src, GLfloat dst[][4], GLuint n)
 {
@@ -1089,6 +1128,45 @@ unpack_RGBA_INT8(const void *src, GLfloat dst[][4], GLuint n)
    }
 }
 
+static void
+unpack_R_INT16(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLshort *s = (const GLshort *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i];
+      dst[i][GCOMP] = 0.0;
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RG_INT16(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLshort *s = (const GLshort *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*2+0];
+      dst[i][GCOMP] = (GLfloat) s[i*2+1];
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RGB_INT16(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLshort *s = (const GLshort *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*3+0];
+      dst[i][GCOMP] = (GLfloat) s[i*3+1];
+      dst[i][BCOMP] = (GLfloat) s[i*3+2];
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
 static void
 unpack_RGBA_INT16(const void *src, GLfloat dst[][4], GLuint n)
 {
@@ -1102,6 +1180,46 @@ unpack_RGBA_INT16(const void *src, GLfloat dst[][4], GLuint n)
    }
 }
 
+static void
+unpack_R_INT32(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLint *s = (const GLint *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i];
+      dst[i][GCOMP] = 0.0;
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RG_INT32(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLint *s = (const GLint *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*2+0];
+      dst[i][GCOMP] = (GLfloat) s[i*2+1];
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RGB_INT32(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLint *s = (const GLint *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*3+0];
+      dst[i][GCOMP] = (GLfloat) s[i*3+1];
+      dst[i][BCOMP] = (GLfloat) s[i*3+2];
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+
 static void
 unpack_RGBA_INT32(const void *src, GLfloat dst[][4], GLuint n)
 {
@@ -1115,6 +1233,45 @@ unpack_RGBA_INT32(const void *src, GLfloat dst[][4], GLuint n)
    }
 }
 
+static void
+unpack_R_UINT8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLubyte *s = (const GLubyte *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i];
+      dst[i][GCOMP] = 0.0;
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RG_UINT8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLubyte *s = (const GLubyte *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*2+0];
+      dst[i][GCOMP] = (GLfloat) s[i*2+1];
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RGB_UINT8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLubyte *s = (const GLubyte *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*3+0];
+      dst[i][GCOMP] = (GLfloat) s[i*3+1];
+      dst[i][BCOMP] = (GLfloat) s[i*3+2];
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
 static void
 unpack_RGBA_UINT8(const void *src, GLfloat dst[][4], GLuint n)
 {
@@ -1128,6 +1285,45 @@ unpack_RGBA_UINT8(const void *src, GLfloat dst[][4], GLuint n)
    }
 }
 
+static void
+unpack_R_UINT16(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLushort *s = (const GLushort *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i];
+      dst[i][GCOMP] = 0.0;
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RG_UINT16(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLushort *s = (const GLushort *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*2+0];
+      dst[i][GCOMP] = (GLfloat) s[i*2+1];
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RGB_UINT16(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLushort *s = (const GLushort *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*3+0];
+      dst[i][GCOMP] = (GLfloat) s[i*3+1];
+      dst[i][BCOMP] = (GLfloat) s[i*3+2];
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
 static void
 unpack_RGBA_UINT16(const void *src, GLfloat dst[][4], GLuint n)
 {
@@ -1141,6 +1337,45 @@ unpack_RGBA_UINT16(const void *src, GLfloat dst[][4], GLuint n)
    }
 }
 
+static void
+unpack_R_UINT32(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLuint *s = (const GLuint *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i];
+      dst[i][GCOMP] = 0.0;
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RG_UINT32(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLuint *s = (const GLuint *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*2+0];
+      dst[i][GCOMP] = (GLfloat) s[i*2+1];
+      dst[i][BCOMP] = 0.0;
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
+static void
+unpack_RGB_UINT32(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLuint *s = (const GLuint *) src;
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = (GLfloat) s[i*3+0];
+      dst[i][GCOMP] = (GLfloat) s[i*3+1];
+      dst[i][BCOMP] = (GLfloat) s[i*3+2];
+      dst[i][ACOMP] = 1.0;
+   }
+}
+
 static void
 unpack_RGBA_UINT32(const void *src, GLfloat dst[][4], GLuint n)
 {
@@ -1828,11 +2063,29 @@ get_unpack_rgba_function(gl_format format)
       table[MESA_FORMAT_RG_FLOAT32] = unpack_RG_FLOAT32;
       table[MESA_FORMAT_RG_FLOAT16] = unpack_RG_FLOAT16;
 
+      table[MESA_FORMAT_R_INT8] = unpack_R_INT8;
+      table[MESA_FORMAT_RG_INT8] = unpack_RG_INT8;
+      table[MESA_FORMAT_RGB_INT8] = unpack_RGB_INT8;
       table[MESA_FORMAT_RGBA_INT8] = unpack_RGBA_INT8;
+      table[MESA_FORMAT_R_INT16] = unpack_R_INT16;
+      table[MESA_FORMAT_RG_INT16] = unpack_RG_INT16;
+      table[MESA_FORMAT_RGB_INT16] = unpack_RGB_INT16;
       table[MESA_FORMAT_RGBA_INT16] = unpack_RGBA_INT16;
+      table[MESA_FORMAT_R_INT32] = unpack_R_INT32;
+      table[MESA_FORMAT_RG_INT32] = unpack_RG_INT32;
+      table[MESA_FORMAT_RGB_INT32] = unpack_RGB_INT32;
       table[MESA_FORMAT_RGBA_INT32] = unpack_RGBA_INT32;
+      table[MESA_FORMAT_R_UINT8] = unpack_R_UINT8;
+      table[MESA_FORMAT_RG_UINT8] = unpack_RG_UINT8;
+      table[MESA_FORMAT_RGB_UINT8] = unpack_RGB_UINT8;
       table[MESA_FORMAT_RGBA_UINT8] = unpack_RGBA_UINT8;
+      table[MESA_FORMAT_R_UINT16] = unpack_R_UINT16;
+      table[MESA_FORMAT_RG_UINT16] = unpack_RG_UINT16;
+      table[MESA_FORMAT_RGB_UINT16] = unpack_RGB_UINT16;
       table[MESA_FORMAT_RGBA_UINT16] = unpack_RGBA_UINT16;
+      table[MESA_FORMAT_R_UINT32] = unpack_R_UINT32;
+      table[MESA_FORMAT_RG_UINT32] = unpack_RG_UINT32;
+      table[MESA_FORMAT_RGB_UINT32] = unpack_RGB_UINT32;
       table[MESA_FORMAT_RGBA_UINT32] = unpack_RGBA_UINT32;
 
       table[MESA_FORMAT_DUDV8] = unpack_DUDV8;