From: Brian Paul <brianp@vmware.com>
Date: Thu, 26 Aug 2010 15:20:18 +0000 (-0600)
Subject: st/mesa: add missing packed depth/stencil formats in st_format_datatype()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86ddb356e8278423ef41125be627e57e073471d1;p=mesa.git

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

Fixes llvmpipe regression from one of the prev commits.
---

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