From: Michel Dänzer Date: Fri, 15 Feb 2013 14:54:28 +0000 (+0100) Subject: radeonsi: Fix PIPE_FORMAT_X32_S8X24_UINT sampler hardware format X-Git-Tag: mesa-9.2.1~2665 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c1107b3e1a4f9f932728d53a8a7961ac948521e;p=platform%2Fupstream%2Fmesa.git radeonsi: Fix PIPE_FORMAT_X32_S8X24_UINT sampler hardware format 4 more little piglits. NOTE: This is a candidate for the 9.1 branch. --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 09665b5..d20e3ff 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1181,7 +1181,6 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, case PIPE_FORMAT_Z24_UNORM_S8_UINT: return V_008F14_IMG_DATA_FORMAT_8_24; case PIPE_FORMAT_X8Z24_UNORM: - case PIPE_FORMAT_X32_S8X24_UINT: case PIPE_FORMAT_S8X24_UINT: case PIPE_FORMAT_S8_UINT_Z24_UNORM: return V_008F14_IMG_DATA_FORMAT_24_8; @@ -1189,6 +1188,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, return V_008F14_IMG_DATA_FORMAT_8; case PIPE_FORMAT_Z32_FLOAT: return V_008F14_IMG_DATA_FORMAT_32; + case PIPE_FORMAT_X32_S8X24_UINT: case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: return V_008F14_IMG_DATA_FORMAT_X24_8_32; default: