Mesa (master): radeonsi: Use proper hardware format for stencil texturing.

[Michel Dänzer]

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

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Jan 11 19:51:09 2013 +0100

radeonsi: Use proper hardware format for stencil texturing.

Fixes piglit 'spec/ARB_depth_buffer_float/fbo-clear-formats stencil' crash.

Reviewed-by: Christian König <christian.koenig at amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_state.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 46112f7..fd046c6 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1136,10 +1136,11 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen,
 		case PIPE_FORMAT_Z24X8_UNORM:
 		case PIPE_FORMAT_Z24_UNORM_S8_UINT:
 			return V_008F14_IMG_DATA_FORMAT_24_8;
-		case PIPE_FORMAT_S8X24_UINT:
 		case PIPE_FORMAT_X8Z24_UNORM:
 		case PIPE_FORMAT_S8_UINT_Z24_UNORM:
 			return V_008F14_IMG_DATA_FORMAT_8_24;
+		case PIPE_FORMAT_X32_S8X24_UINT:
+		case PIPE_FORMAT_S8X24_UINT:
 		case PIPE_FORMAT_S8_UINT:
 			return V_008F14_IMG_DATA_FORMAT_8;
 		case PIPE_FORMAT_Z32_FLOAT: