From: Brian Paul <brianp@vmware.com>
Date: Wed, 30 Dec 2009 06:24:04 +0000 (-0700)
Subject: st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f00bf0598cfcd9ab9b923d80b7ce2cec14a74da5;p=mesa.git

st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()

Fixes progs/demos/fbotexture on Nouveau.
Patch submitted by Luca Barbieri <luca@luca-barbieri.com>.
---

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 091f68190e5..27857282c1c 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -99,7 +99,8 @@ st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo)
       if (format == PIPE_FORMAT_A1R5G5B5_UNORM || format == PIPE_FORMAT_R5G6B5_UNORM) {
          pinfo->datatype = GL_UNSIGNED_SHORT;
       }
-      else if (format == PIPE_FORMAT_S8Z24_UNORM) {
+      else if (format == PIPE_FORMAT_S8Z24_UNORM ||
+               format == PIPE_FORMAT_Z24S8_UNORM) {
          pinfo->datatype = GL_UNSIGNED_INT_24_8;
       }
       else {