st/mesa: Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24.
authorDavid Heidelberger <d.okias@gmail.com>
Thu, 29 Oct 2009 15:56:12 +0000 (09:56 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 29 Oct 2009 15:56:14 +0000 (09:56 -0600)
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>
src/mesa/state_tracker/st_format.c

index 7c6615fe04850b0fb205655a4cd55da6c5239796..02d3bd943dbd26dde6eae4f363ab94aad9eef2dc 100644 (file)
@@ -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: