st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()
authorBrian Paul <brianp@vmware.com>
Wed, 30 Dec 2009 06:24:04 +0000 (23:24 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 30 Dec 2009 06:31:43 +0000 (23:31 -0700)
Fixes progs/demos/fbotexture on Nouveau.
Patch submitted by Luca Barbieri <luca@luca-barbieri.com>.

src/mesa/state_tracker/st_format.c

index 091f68190e591f605c0b49b0c1d1dd15a68f124a..27857282c1c48149ae6810b3365931173d416c27 100644 (file)
@@ -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 {