From: David Heidelberger <d.okias@gmail.com>
Date: Thu, 29 Oct 2009 15:56:12 +0000 (-0600)
Subject: st/mesa: Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10a509564fa13f036b1b177fafae4337928a39a9;p=mesa.git

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 <d.okias@gmail.com
Signed-off-by: Brian Paul <brianp@vmware.com>
---

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: