From 86ddb356e8278423ef41125be627e57e073471d1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Aug 2010 09:20:18 -0600 Subject: st/mesa: add missing packed depth/stencil formats in st_format_datatype() Fixes llvmpipe regression from one of the prev commits. --- src/mesa/state_tracker/st_format.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/mesa/state_tracker/st_format.c') diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index c9fa7a62e1..86a471f195 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -78,7 +78,9 @@ st_format_datatype(enum pipe_format format) return GL_UNSIGNED_SHORT; } else if (format == PIPE_FORMAT_Z24_UNORM_S8_USCALED || - format == PIPE_FORMAT_S8_USCALED_Z24_UNORM) { + format == PIPE_FORMAT_S8_USCALED_Z24_UNORM || + format == PIPE_FORMAT_Z24X8_UNORM || + format == PIPE_FORMAT_X8Z24_UNORM) { return GL_UNSIGNED_INT_24_8; } else { -- cgit v1.2.3 From 9b4384c32233c6d75021bcc67552b7ea9dc56de6 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 26 Aug 2010 10:38:28 -0700 Subject: st/mesa: Remove unnecessary header. --- src/mesa/state_tracker/st_format.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mesa/state_tracker/st_format.c') diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 86a471f195..1ed79524b2 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -35,7 +35,6 @@ #include "main/imports.h" #include "main/context.h" #include "main/texstore.h" -#include "main/enums.h" #include "main/image.h" #include "main/macros.h" -- cgit v1.2.3