Mesa (7.9): r300g: fix swizzling of texture border color
Marek Olšák
mareko at kemper.freedesktop.org
Tue Sep 28 17:59:54 UTC 2010
Module: Mesa
Branch: 7.9
Commit: 6c3a8aeb27d5e60275e535e3b7f9b6fbeb159100
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c3a8aeb27d5e60275e535e3b7f9b6fbeb159100
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Sep 28 05:07:23 2010 +0200
r300g: fix swizzling of texture border color
NOTE: This is a candidate for the 7.9 branch.
(cherry picked from commit e4fd65e9d752a021c8fcd23d36fbea53933761a6)
---
src/gallium/drivers/r300/r300_state_derived.c | 41 ++++--------------------
1 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 566a828..2613e70 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -568,46 +568,19 @@ static void r300_update_rs_block(struct r300_context *r300)
}
static uint32_t r300_get_border_color(enum pipe_format format,
- const unsigned char swizzle_view[4],
const float border[4])
{
const struct util_format_description *desc;
- unsigned char swizzle[4];
- unsigned i;
- float border_swizzled[4];
+ float border_swizzled[4] = {
+ border[2],
+ border[1],
+ border[0],
+ border[3]
+ };
uint32_t r;
desc = util_format_description(format);
- /* Combine the swizzles. */
- for (i = 0; i < 4; i++) {
- swizzle[i] = swizzle_view[i] <= UTIL_FORMAT_SWIZZLE_W ?
- desc->swizzle[swizzle_view[i]] : swizzle_view[i];
- }
-
- /* Apply swizzling. */
- for (i = 0; i < 4; i++) {
- switch (swizzle[i]) {
- case UTIL_FORMAT_SWIZZLE_X:
- border_swizzled[i] = border[0];
- break;
- case UTIL_FORMAT_SWIZZLE_Y:
- border_swizzled[i] = border[1];
- break;
- case UTIL_FORMAT_SWIZZLE_Z:
- border_swizzled[i] = border[2];
- break;
- case UTIL_FORMAT_SWIZZLE_W:
- border_swizzled[i] = border[3];
- break;
- case UTIL_FORMAT_SWIZZLE_0:
- border_swizzled[i] = 0;
- break;
- default: /* 1, NONE */
- border_swizzled[i] = 1;
- }
- }
-
/* We don't use util_pack_format because it does not handle the formats
* we want, e.g. R4G4B4A4 is non-existent in Gallium. */
switch (desc->channel[0].size) {
@@ -681,7 +654,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300)
/* Set the border color. */
texstate->border_color =
- r300_get_border_color(view->base.format, view->swizzle,
+ r300_get_border_color(view->base.format,
sampler->state.border_color);
/* determine min/max levels */
More information about the mesa-commit
mailing list