fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: Fix rendering into PIPE_FORMAT_X8*_UNORM.

Browse source 
Mesa state tracker recently started using PIPE_FORMAT_X8B8G8R8_UNORM,
causing segfaults in texture-packed-formats, because swizze[chan] was
0xff for padding channel (X).

Signed-off-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Roland Scheidegger 2013-02-22 08:53:22 +00:00 • committed by José Fonseca
parent 8ed1279b10
commit b6f15954b4
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/gallium/drivers/llvmpipe/lp_state_fs.c
View file

@ -969,13 +969,19 @@ static INLINE void
lp_mem_type_from_format_desc(const struct util_format_description *format_desc,
struct lp_type* type)
{
int i;
unsigned i;
unsigned chan;
for (i = 0; i < 4; i++)
if (format_desc->channel[i].type != UTIL_FORMAT_TYPE_VOID)
break;
chan = i;
memset(type, 0, sizeof(struct lp_type));
type->floating = format_desc->channel[0].type == UTIL_FORMAT_TYPE_FLOAT;
type->fixed = format_desc->channel[0].type == UTIL_FORMAT_TYPE_FIXED;
type->sign = format_desc->channel[0].type != UTIL_FORMAT_TYPE_UNSIGNED;
type->norm = format_desc->channel[0].normalized;
type->floating = format_desc->channel[chan].type == UTIL_FORMAT_TYPE_FLOAT;
type->fixed = format_desc->channel[chan].type == UTIL_FORMAT_TYPE_FIXED;
type->sign = format_desc->channel[chan].type != UTIL_FORMAT_TYPE_UNSIGNED;
type->norm = format_desc->channel[chan].normalized;
if (is_arithmetic_format(format_desc)) {
type->width = 0;
@ -985,7 +991,7 @@ lp_mem_type_from_format_desc(const struct util_format_description *format_desc,
type->width += format_desc->channel[i].size;
}
} else {
type->width = format_desc->channel[0].size;
type->width = format_desc->channel[chan].size;
type->length = format_desc->nr_channels;
}
}
@ -1000,14 +1006,20 @@ static INLINE void
lp_blend_type_from_format_desc(const struct util_format_description *format_desc,
struct lp_type* type)
{
int i;
unsigned i;
unsigned chan;
for (i = 0; i < 4; i++)
if (format_desc->channel[i].type != UTIL_FORMAT_TYPE_VOID)
break;
chan = i;
memset(type, 0, sizeof(struct lp_type));
type->floating = format_desc->channel[0].type == UTIL_FORMAT_TYPE_FLOAT;
type->fixed = format_desc->channel[0].type == UTIL_FORMAT_TYPE_FIXED;
type->sign = format_desc->channel[0].type != UTIL_FORMAT_TYPE_UNSIGNED;
type->norm = format_desc->channel[0].normalized;
type->width = format_desc->channel[0].size;
type->floating = format_desc->channel[chan].type == UTIL_FORMAT_TYPE_FLOAT;
type->fixed = format_desc->channel[chan].type == UTIL_FORMAT_TYPE_FIXED;
type->sign = format_desc->channel[chan].type != UTIL_FORMAT_TYPE_UNSIGNED;
type->norm = format_desc->channel[chan].normalized;
type->width = format_desc->channel[chan].size;
type->length = format_desc->nr_channels;
for (i = 1; i < format_desc->nr_channels; ++i) {
@ -1493,7 +1505,7 @@ generate_unswizzled_blend(struct gallivm_state *gallivm,
vector_width = dst_type.floating ? lp_native_vector_width : lp_integer_vector_width;
/* Compute correct swizzle and count channels */
memset(swizzle, 0xFF, TGSI_NUM_CHANNELS);
memset(swizzle, LP_BLD_SWIZZLE_DONTCARE, TGSI_NUM_CHANNELS);
dst_channels = 0;
for (i = 0; i < TGSI_NUM_CHANNELS; ++i) {
@ -1522,8 +1534,10 @@ generate_unswizzled_blend(struct gallivm_state *gallivm,
/* If 3 channels then pad to include alpha for 4 element transpose */
if (dst_channels == 3 && !has_alpha) {
swizzle[3] = 3;
for (i = 0; i < TGSI_NUM_CHANNELS; i++) {
if (swizzle[i] > TGSI_NUM_CHANNELS)
swizzle[i] = 3;
}
if (out_format_desc->nr_channels == 4) {
dst_channels = 4;
}
@ -1538,6 +1552,7 @@ generate_unswizzled_blend(struct gallivm_state *gallivm,
/* Load each channel */
for (j = 0; j < dst_channels; ++j) {
assert(swizzle[j] < 4);
fs_src[i][j] = LLVMBuildLoad(builder, fs_out_color[rt][swizzle[j]][i], "");
}
@ -1568,6 +1583,7 @@ generate_unswizzled_blend(struct gallivm_state *gallivm,
LLVMValueRef alpha = LLVMBuildLoad(builder, fs_out_color[1][alpha_channel][i], "");
for (j = 0; j < dst_channels; ++j) {
assert(swizzle[j] < 4);
fs_src1[i][j] = LLVMBuildLoad(builder, fs_out_color[1][swizzle[j]][i], "");
}
if (dst_channels == 3 && !has_alpha) {