AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Make unpack_uint_z_row return 32 bits of data.

Browse Source 
Some of the return values were u32, some were 24 bits, and z16
returned 16 bits.  The caller would have to do all the work of
interpreting the format all over again.  However, there are no callers
of this function at this point.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt
2011-10-13 09:38:30 -07:00
parent 4b8f4e7ce1
commit 789cb3435c
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/format_unpack.c
+12 -27
View File
@@ -1415,37 +1415,26 @@ _mesa_unpack_float_z_row(gl_format format, GLuint n,
typedef void (*unpack_uint_z_func)(const void *src, GLuint *dst);
static void
unpack_uint_z_Z24_S8(const void *src, GLuint *dst)
unpack_uint_z_Z24_X8(const void *src, GLuint *dst)
{
/* only return Z, not stencil data */
const GLuint s = *((const GLuint *) src);
*dst = (s >> 8);
}
static void
unpack_uint_z_S8_Z24(const void *src, GLuint *dst)
{
/* only return Z, not stencil data */
const GLuint s = *((const GLuint *) src);
*dst = s & 0x00ffffff;
}
static void
unpack_uint_z_Z16(const void *src, GLuint *dst)
{
*dst = *((const GLushort *) src);
*dst = (s & 0xffffff00) | (s >> 24);
}
static void
unpack_uint_z_X8_Z24(const void *src, GLuint *dst)
{
unpack_uint_z_S8_Z24(src, dst);
/* only return Z, not stencil data */
const GLuint s = *((const GLuint *) src);
*dst = (s << 8) | ((s >> 16) & 0xff);
}
static void
unpack_uint_z_Z24_X8(const void *src, GLuint *dst)
unpack_uint_z_Z16(const void *src, GLuint *dst)
{
unpack_uint_z_Z24_S8(src, dst);
const GLushort s = *((const GLushort *)src);
*dst = (s << 16) | s;
}
static void
@@ -1466,19 +1455,15 @@ _mesa_unpack_uint_z_row(gl_format format, GLuint n,
switch (format) {
case MESA_FORMAT_Z24_S8:
unpack = unpack_uint_z_Z24_S8;
case MESA_FORMAT_Z24_X8:
unpack = unpack_uint_z_Z24_X8;
break;
case MESA_FORMAT_S8_Z24:
unpack = unpack_uint_z_S8_Z24;
break;
case MESA_FORMAT_Z16:
unpack = unpack_uint_z_Z16;
break;
case MESA_FORMAT_X8_Z24:
unpack = unpack_uint_z_X8_Z24;
break;
case MESA_FORMAT_Z24_X8:
unpack = unpack_uint_z_Z24_X8;
case MESA_FORMAT_Z16:
unpack = unpack_uint_z_Z16;
break;
case MESA_FORMAT_Z32:
unpack = unpack_uint_z_Z32;