projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8356962)
radeonsi: Fix PIPE_FORMAT_X32_S8X24_UINT sampler hardware format
authorMichel Dänzer <michel.daenzer@amd.com>
Fri, 15 Feb 2013 14:54:28 +0000 (15:54 +0100)
committerMichel Dänzer <michel@daenzer.net>
Mon, 18 Feb 2013 14:59:02 +0000 (15:59 +0100)
4 more little piglits.

NOTE: This is a candidate for the 9.1 branch.

src/gallium/drivers/radeonsi/si_state.c patch | blob | history

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 09665b5ab88fe4d09b4303b8ca696dcb03f6a18a..d20e3ffb542de29a39ce80287d383dbd97d4b2df 100644 (file)
--- 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: