mesa: Use the format info to identify packed depth/stencil formats.

Due to a misunderstanding of the Z24_X8 and X8_Z24 formats, the earlier
patch created depth/stencil wrappers for them.  This broke swrast.

Use the format info instead, which only identifies Z24_S8 and S8_Z24 as
packed depth/stencil.  It also has the advantage of being nicer code.

Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Nick Bowler 2010-08-26 17:52:30 -07:00 committed by Brian Paul
parent 579fce2524
commit f57df7f213

View file

@ -945,13 +945,9 @@ _mesa_is_format_compressed(gl_format format)
GLboolean
_mesa_is_format_packed_depth_stencil(gl_format format)
{
if (format == MESA_FORMAT_Z24_S8
|| format == MESA_FORMAT_Z24_X8
|| format == MESA_FORMAT_S8_Z24
|| format == MESA_FORMAT_X8_Z24)
return GL_TRUE;
const struct gl_format_info *info = _mesa_get_format_info(format);
return GL_FALSE;
return info->BaseFormat == GL_DEPTH_STENCIL;
}