Mesa (mesa_7_7_branch): st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()

[Brian Paul]

Module: Mesa
Branch: mesa_7_7_branch
Commit: f00bf0598cfcd9ab9b923d80b7ce2cec14a74da5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f00bf0598cfcd9ab9b923d80b7ce2cec14a74da5

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Dec 29 23:24:04 2009 -0700

st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()

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

---

 src/mesa/state_tracker/st_format.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 091f681..2785728 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 {