diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-11-30 23:28:43 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-12-01 22:29:09 +0100 |
| commit | 6478a4de14d368bf85ba3477d73fd1bd91067e86 (patch) | |
| tree | b02d269ab0ad750013b8704511083e6f2aa8de4a /src/gallium/drivers/r300/r300_state.c | |
| parent | c92550be64abd454560556599cd95b237f4375b1 (diff) | |
r300g: fix texture swizzling with compressed textures on r400-r500
This fixes all S3TC piglit/texwrap tests.
NOTE: This is a candidate for the 7.9 branch.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 247c22216e..405b059d55 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1347,6 +1347,7 @@ r300_create_sampler_view(struct pipe_context *pipe, struct r300_sampler_view *view = CALLOC_STRUCT(r300_sampler_view); struct r300_texture *tex = r300_texture(texture); boolean is_r500 = r300_screen(pipe->screen)->caps.is_r500; + boolean dxtc_swizzle = r300_screen(pipe->screen)->caps.dxtc_swizzle; if (view) { view->base = *templ; @@ -1363,7 +1364,8 @@ r300_create_sampler_view(struct pipe_context *pipe, view->format = tex->tx_format; view->format.format1 |= r300_translate_texformat(templ->format, view->swizzle, - is_r500); + is_r500, + dxtc_swizzle); if (is_r500) { view->format.format2 |= r500_tx_format_msb_bit(templ->format); } |