summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorDavid Heidelberger <[email protected]>2009-10-29 09:56:12 -0600
committerBrian Paul <[email protected]>2009-10-29 09:56:14 -0600
commit10a509564fa13f036b1b177fafae4337928a39a9 (patch)
tree6adee32276fb1768e2fccd5f83d20c6668c129db /src/mesa
parentc2f5eb71485e0d4d717bad7ab94fdb4a75f7e38f (diff)
st/mesa: Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24.
Fix glxgears and openarena for Nouveau (no more asserts and crash). Signed-off-by: David Heidelberger <[email protected] Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_format.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 7c6615fe048..02d3bd943db 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -311,6 +311,7 @@ st_pipe_format_to_mesa_format(enum pipe_format pipeFormat)
return MESA_FORMAT_Z32;
case PIPE_FORMAT_Z24S8_UNORM:
return MESA_FORMAT_Z24_S8;
+ case PIPE_FORMAT_X8Z24_UNORM:
case PIPE_FORMAT_S8Z24_UNORM:
return MESA_FORMAT_S8_Z24;
case PIPE_FORMAT_S8_UNORM:
@@ -724,6 +725,7 @@ translate_gallium_format_to_mesa_format(enum pipe_format format)
return MESA_FORMAT_Z32;
case PIPE_FORMAT_Z24S8_UNORM:
return MESA_FORMAT_Z24_S8;
+ case PIPE_FORMAT_X8Z24_UNORM:
case PIPE_FORMAT_S8Z24_UNORM:
return MESA_FORMAT_S8_Z24;
case PIPE_FORMAT_YCBCR: