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

r300g: fix vertex colors with 8 bits per channel

Browse Source 
The piglit BGRA tests pass now.
This commit is contained in:
Marek Olšák
2010-01-17 04:41:51 +01:00
committed by Corbin Simpson
parent c4a2f13a5c
commit 7d3090f0fe
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_state_inlines.h
+17 -5
View File
@@ -537,6 +537,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
static INLINE uint16_t
r300_translate_vertex_data_swizzle(enum pipe_format format) {
const struct util_format_description *desc = util_format_description(format);
unsigned swizzle[4], i;
assert(format);
@@ -547,11 +548,22 @@ r300_translate_vertex_data_swizzle(enum pipe_format format) {
return 0;
}
return ((desc->swizzle[0] << R300_SWIZZLE_SELECT_X_SHIFT) |
(desc->swizzle[1] << R300_SWIZZLE_SELECT_Y_SHIFT) |
(desc->swizzle[2] << R300_SWIZZLE_SELECT_Z_SHIFT) |
(desc->swizzle[3] << R300_SWIZZLE_SELECT_W_SHIFT) |
(0xf << R300_WRITE_ENA_SHIFT));
/* Swizzles for 8bits formats are in the reversed order, not sure why. */
if (desc->channel[0].size == 8) {
for (i = 0; i < 4; i++) {
swizzle[i] = 3 - desc->swizzle[i];
}
} else {
for (i = 0; i < 4; i++) {
swizzle[i] = desc->swizzle[i];
}
}
return ((swizzle[0] << R300_SWIZZLE_SELECT_X_SHIFT) |
(swizzle[1] << R300_SWIZZLE_SELECT_Y_SHIFT) |
(swizzle[2] << R300_SWIZZLE_SELECT_Z_SHIFT) |
(swizzle[3] << R300_SWIZZLE_SELECT_W_SHIFT) |
(0xf << R300_WRITE_ENA_SHIFT));
}
#endif /* R300_STATE_INLINES_H */