summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-12-29 23:24:04 -0700
committerBrian Paul <brianp@vmware.com>2009-12-29 23:31:43 -0700
commitf00bf0598cfcd9ab9b923d80b7ce2cec14a74da5 (patch)
tree897e1516d56c4dda75b66eef00ac73ba1dcf70ee /src
parentde95e5768bf5186a29c75981350042581b760684 (diff)
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>.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_format.c3
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 091f68190e..27857282c1 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 {