summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-08-26 09:20:18 -0600
committerBrian Paul <[email protected]>2010-08-26 09:20:21 -0600
commit86ddb356e8278423ef41125be627e57e073471d1 (patch)
treef78d649699971d59d69c36528ca3fbe5bfe0f1d1 /src/mesa
parent7b07674667e8e34c936c417ab6f1c2e33093205b (diff)
st/mesa: add missing packed depth/stencil formats in st_format_datatype()
Fixes llvmpipe regression from one of the prev commits.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_format.c4
1 files changed, 3 insertions, 1 deletions
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 {