Module: Mesa
Branch: master
Commit: 10a509564fa13f036b1b177fafae4337928a39a9
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=10a509564fa13f036b1b177fafae4337928a39a9

Author: David Heidelberger <[email protected]>
Date:   Thu Oct 29 09:56:12 2009 -0600

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]>

---

 src/mesa/state_tracker/st_format.c |    2 ++
 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 7c6615f..02d3bd9 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:

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to