diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-02-16 05:28:40 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-02-16 07:46:36 +0100 |
| commit | 9e725b9123c41acf84410cb32d28f729b1e5c9e4 (patch) | |
| tree | 272b0b890686238d4303d9f8070f91bbe30f18a7 /src/gallium/drivers/r300/r300_state_derived.c | |
| parent | 4ffef888997888c120deba9c1604cfd56645c041 (diff) | |
| download | external_mesa3d-9e725b9123c41acf84410cb32d28f729b1e5c9e4.zip external_mesa3d-9e725b9123c41acf84410cb32d28f729b1e5c9e4.tar.gz external_mesa3d-9e725b9123c41acf84410cb32d28f729b1e5c9e4.tar.bz2 | |
r300g: fix texture border color for float formats
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_derived.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index 5e86d18..003fe9a 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -677,7 +677,20 @@ static uint32_t r300_get_border_color(enum pipe_format format, case 16: if (desc->nr_channels <= 2) { border_swizzled[0] = border_swizzled[2]; - util_pack_color(border_swizzled, PIPE_FORMAT_R16G16_UNORM, &uc); + if (desc->channel[0].type == UTIL_FORMAT_TYPE_FLOAT) { + util_pack_color(border_swizzled, PIPE_FORMAT_R16G16_FLOAT, &uc); + } else { + util_pack_color(border_swizzled, PIPE_FORMAT_R16G16_UNORM, &uc); + } + } else { + util_pack_color(border_swizzled, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); + } + break; + + case 32: + if (desc->nr_channels == 1) { + border_swizzled[0] = border_swizzled[2]; + util_pack_color(border_swizzled, PIPE_FORMAT_R32_FLOAT, &uc); } else { util_pack_color(border_swizzled, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); } |