Mesa (master): r300g: add a default channel ordering of texture border for unhandled formats
Marek Olšák
mareko at kemper.freedesktop.org
Wed Oct 27 19:23:17 UTC 2010
Module: Mesa
Branch: master
Commit: 676c3f08bd13564c088ae85c3538ee0ee3c52599
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=676c3f08bd13564c088ae85c3538ee0ee3c52599
Author: Marek Olšák <maraeo at gmail.com>
Date: Wed Oct 27 21:13:41 2010 +0200
r300g: add a default channel ordering of texture border for unhandled formats
It should fix the texture border for compressed textures.
Broken since 8449a4772a73f613d9425b691cffba6a261df813.
---
src/gallium/drivers/r300/r300_state_derived.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index efec949..50366e3 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -620,13 +620,6 @@ static uint32_t r300_get_border_color(enum pipe_format format,
}
break;
- case 8:
- r = ((float_to_ubyte(border_swizzled[0]) & 0xff) << 0) |
- ((float_to_ubyte(border_swizzled[1]) & 0xff) << 8) |
- ((float_to_ubyte(border_swizzled[2]) & 0xff) << 16) |
- ((float_to_ubyte(border_swizzled[3]) & 0xff) << 24);
- break;
-
case 16:
r = ((float_to_ubyte(border_swizzled[2]) & 0xff) << 0) |
((float_to_ubyte(border_swizzled[1]) & 0xff) << 8) |
@@ -634,9 +627,12 @@ static uint32_t r300_get_border_color(enum pipe_format format,
((float_to_ubyte(border_swizzled[3]) & 0xff) << 24);
break;
+ case 8:
default:
- assert(0);
- r = 0;
+ r = ((float_to_ubyte(border_swizzled[0]) & 0xff) << 0) |
+ ((float_to_ubyte(border_swizzled[1]) & 0xff) << 8) |
+ ((float_to_ubyte(border_swizzled[2]) & 0xff) << 16) |
+ ((float_to_ubyte(border_swizzled[3]) & 0xff) << 24);
break;
}
More information about the mesa-commit
mailing list