fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: Avoid C99-isms.

Browse source
This commit is contained in:
José Fonseca 2009-08-02 13:48:16 +01:00
parent fe90e46dc9
commit f478b6fe76
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/llvmpipe/lp_bld_pack.c
View file

@ -39,7 +39,12 @@ lp_build_pack_rgba(LLVMBuilderRef builder,
const struct util_format_description *desc;
LLVMTypeRef type;
LLVMValueRef packed = NULL;
unsigned shift = 0;
LLVMValueRef swizzles[4];
LLVMValueRef shifted, casted, scaled, unswizzled;
LLVMValueRef shifts[4];
LLVMValueRef scales[4];
bool normalized;
unsigned shift;
unsigned i, j;
desc = util_format_description(format);
@ -50,10 +55,6 @@ lp_build_pack_rgba(LLVMBuilderRef builder,
type = LLVMIntType(desc->block.bits);
LLVMValueRef swizzles[4];
LLVMValueRef shifted, casted, scaled, unswizzled;
/* Unswizzle the color components into the source vector. */
for (i = 0; i < 4; ++i) {
for (j = 0; j < 4; ++j) {
@ -70,10 +71,8 @@ lp_build_pack_rgba(LLVMBuilderRef builder,
LLVMGetUndef(LLVMVectorType(LLVMFloatType(), 4)),
LLVMConstVector(swizzles, 4), "");
LLVMValueRef shifts[4];
LLVMValueRef scales[4];
bool normalized = FALSE;
normalized = FALSE;
shift = 0;
for (i = 0; i < 4; ++i) {
unsigned bits = desc->channel[i].size;

27
src/gallium/drivers/llvmpipe/lp_bld_unpack.c
View file

@ -38,7 +38,15 @@ lp_build_unpack_rgba(LLVMBuilderRef builder,
{
const struct util_format_description *desc;
LLVMTypeRef type;
unsigned shift = 0;
LLVMValueRef shifted, casted, scaled, masked;
LLVMValueRef shifts[4];
LLVMValueRef masks[4];
LLVMValueRef scales[4];
LLVMValueRef swizzles[4];
LLVMValueRef aux[4];
bool normalized;
int empty_channel;
unsigned shift;
unsigned i;
desc = util_format_description(format);
@ -68,14 +76,10 @@ lp_build_unpack_rgba(LLVMBuilderRef builder,
LLVMConstNull(LLVMVectorType(LLVMInt32Type(), 4)),
"");
LLVMValueRef shifted, casted, scaled, masked, swizzled;
LLVMValueRef shifts[4];
LLVMValueRef masks[4];
LLVMValueRef scales[4];
bool normalized = FALSE;
int empty_channel = -1;
/* Initialize vector constants */
normalized = FALSE;
empty_channel = -1;
shift = 0;
for (i = 0; i < 4; ++i) {
unsigned bits = desc->channel[i].size;
@ -115,9 +119,6 @@ lp_build_unpack_rgba(LLVMBuilderRef builder,
else
scaled = casted;
LLVMValueRef swizzles[4];
LLVMValueRef aux[4];
for (i = 0; i < 4; ++i)
aux[i] = LLVMGetUndef(LLVMFloatType());
@ -146,8 +147,6 @@ lp_build_unpack_rgba(LLVMBuilderRef builder,
}
}
swizzled = LLVMBuildShuffleVector(builder, scaled, LLVMConstVector(aux, 4), LLVMConstVector(swizzles, 4), "");
return swizzled;
return LLVMBuildShuffleVector(builder, scaled, LLVMConstVector(aux, 4), LLVMConstVector(swizzles, 4), "");
}