diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-06-06 16:12:55 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-06-08 16:58:19 +0200 |
| commit | f4535f6e5ae63d8c59428cf190a95e0eb4ae233d (patch) | |
| tree | dbc9f979d2abeae6b694544904e00b0e7e739aad /src/mesa/state_tracker | |
| parent | a47c222803483c208f720e3fb5015050d4d0eaf4 (diff) | |
mesa: Add MESA_FORMAT_S8_Z24 texture format
None of the fetch and store functions implemented.
This atleast stops shadowtex from locking the GPU on
i915 with the linux-dri-x86 target. It most of it looks
okay, with the exception of actually displaying the texture.
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_format.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 17a3cfd5a4..1b9325c159 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -274,6 +274,8 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat) return PIPE_FORMAT_Z32_UNORM; case MESA_FORMAT_Z24_S8: return PIPE_FORMAT_Z24S8_UNORM; + case MESA_FORMAT_S8_Z24: + return PIPE_FORMAT_S8Z24_UNORM; case MESA_FORMAT_YCBCR: return PIPE_FORMAT_YCBCR; case MESA_FORMAT_RGB_DXT1: @@ -559,10 +561,10 @@ translate_gallium_format_to_mesa_format(enum pipe_format format) return &_mesa_texformat_z16; case PIPE_FORMAT_Z32_UNORM: return &_mesa_texformat_z32; - case PIPE_FORMAT_S8Z24_UNORM: - /* XXX fallthrough OK? */ case PIPE_FORMAT_Z24S8_UNORM: return &_mesa_texformat_z24_s8; + case PIPE_FORMAT_S8Z24_UNORM: + return &_mesa_texformat_s8_z24; case PIPE_FORMAT_YCBCR: return &_mesa_texformat_ycbcr; case PIPE_FORMAT_YCBCR_REV: |