Mesa (master): st/mesa: add missing packed depth/ stencil formats in st_format_datatype()

[Brian Paul]

Module: Mesa
Branch: master
Commit: 86ddb356e8278423ef41125be627e57e073471d1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=86ddb356e8278423ef41125be627e57e073471d1

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Aug 26 09:20:18 2010 -0600

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 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index c9fa7a6..86a471f 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 {