diff options
| author | Marek Olšák <[email protected]> | 2010-09-23 22:56:50 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2010-09-24 02:57:36 +0200 |
| commit | 9f35dcd24cb520af5e39501672a3324000cdbfce (patch) | |
| tree | 936e3b8d8c79e868e6363b05dd452923acf04805 /src/gallium/drivers/r300/r300_state.c | |
| parent | 7d28ec8500fc08fafbdb3ae5443b32dd756eddd7 (diff) | |
r300g: fix the border color for every format other than PIPE_FORMAT_B8G8R8A8
TX_BORDER_COLOR should be formatted according to the texture format.
Also the interaction with ARB_texture_swizzle should be fixed too.
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, 0 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index d6cded927a1..ad3282a4e6b 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1169,7 +1169,6 @@ static void* struct r300_sampler_state* sampler = CALLOC_STRUCT(r300_sampler_state); boolean is_r500 = r300->screen->caps.is_r500; int lod_bias; - union util_color uc; sampler->state = *state; @@ -1226,9 +1225,6 @@ static void* sampler->filter1 |= r500_anisotropy(state->max_anisotropy); } - util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); - sampler->border_color = uc.ui; - /* R500-specific fixups and optimizations */ if (r300->screen->caps.is_r500) { sampler->filter1 |= R500_BORDER_FIX; |