KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300g: add a default channel ordering of texture border for unhandled formats 

It should fix the texture border for compressed textures.
Broken since 8449a4772a.
This commit is contained in:
Marek Olšák 2010-10-27 21:13:41 +02:00
parent 8ff7885e8f
commit 676c3f08bd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/r300/r300_state_derived.c
View File

@ -620,13 +620,6 @@ static uint32_t r300_get_border_color(enum pipe_format format,
} }
break; 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: case 16:
r = ((float_to_ubyte(border_swizzled[2]) & 0xff) << 0) | r = ((float_to_ubyte(border_swizzled[2]) & 0xff) << 0) |
((float_to_ubyte(border_swizzled[1]) & 0xff) << 8) | ((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); ((float_to_ubyte(border_swizzled[3]) & 0xff) << 24);
break; break;
case 8:
default: default:
assert(0); r = ((float_to_ubyte(border_swizzled[0]) & 0xff) << 0) |
r = 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; break;
} }