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 <nbow...@draconx.ca>
---
src/mesa/main/formats.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index c5f3e0b..112d7a0 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -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;
}
--
1.7.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
