st/mesa: add missing packed depth/stencil formats in st_format_datatype()
authorBrian Paul <brianp@vmware.com>
Thu, 26 Aug 2010 15:20:18 +0000 (09:20 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 26 Aug 2010 15:20:21 +0000 (09:20 -0600)
Fixes llvmpipe regression from one of the prev commits.

src/mesa/state_tracker/st_format.c

index c9fa7a62e19131ce820c1bf8db840f20b047ea84..86a471f1957ea40f3b8d4e5185e1b30a9eadac51 100644 (file)
@@ -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 {