diff options
author | Marek Olšák <maraeo@gmail.com> | 2010-04-29 04:32:25 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2010-04-29 04:39:19 +0200 |
commit | 3b667700a5d88b71e6e7a41d1521754b393c022e (patch) | |
tree | a4709c9e62545adb71eb54fde4792ce91380cfcf /src/gallium/drivers/r300/r300_state.c | |
parent | 95bfc8f32571751c5c9ec6d8e84f5e3c28d1b20e (diff) |
r300g: compose swizzles from texture formats and sampler views
Diffstat (limited to 'src/gallium/drivers/r300/r300_state.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index edd522288b..9319dadfd1 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1075,11 +1075,9 @@ r300_create_sampler_view(struct pipe_context *pipe, swizzle[2] = templ->swizzle_b; swizzle[3] = templ->swizzle_a; - /* XXX Enable swizzles when they become supported. Now we get RGBA - * everywhere. And do testing! */ view->format = tex->tx_format; view->format.format1 |= r300_translate_texformat(templ->format, - 0); /*swizzle);*/ + swizzle); if (r300_screen(pipe->screen)->caps.is_r500) { view->format.format2 |= r500_tx_format_msb_bit(templ->format); } |