projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/xorg: If dri2 version is 2 support version 1 as well
[mesa.git]
/
src
/
gallium
/
drivers
/
llvmpipe
/
lp_bld_tgsi_soa.c
diff --git
a/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
b/src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
index adc81569ed514f6531224ccadc48101553e649a4..0dea2cd4c86da00d46a7f8bf445d45d2238d38da 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
+++ b/
src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
@@
-158,14
+158,14
@@
emit_fetch(
const unsigned chan_index )
{
const struct tgsi_full_src_register *reg = &inst->FullSrcRegisters[index];
const unsigned chan_index )
{
const struct tgsi_full_src_register *reg = &inst->FullSrcRegisters[index];
- unsigned swizzle = tgsi_util_get_full_src_register_
ext
swizzle( reg, chan_index );
+ unsigned swizzle = tgsi_util_get_full_src_register_swizzle( reg, chan_index );
LLVMValueRef res;
switch (swizzle) {
LLVMValueRef res;
switch (swizzle) {
- case TGSI_
EXT
SWIZZLE_X:
- case TGSI_
EXT
SWIZZLE_Y:
- case TGSI_
EXT
SWIZZLE_Z:
- case TGSI_
EXT
SWIZZLE_W:
+ case TGSI_SWIZZLE_X:
+ case TGSI_SWIZZLE_Y:
+ case TGSI_SWIZZLE_Z:
+ case TGSI_SWIZZLE_W:
switch (reg->SrcRegister.File) {
case TGSI_FILE_CONSTANT: {
switch (reg->SrcRegister.File) {
case TGSI_FILE_CONSTANT: {
@@
-198,14
+198,6
@@
emit_fetch(
}
break;
}
break;
- case TGSI_EXTSWIZZLE_ZERO:
- res = bld->base.zero;
- break;
-
- case TGSI_EXTSWIZZLE_ONE:
- res = bld->base.one;
- break;
-
default:
assert( 0 );
return bld->base.undef;
default:
assert( 0 );
return bld->base.undef;
@@
-329,7
+321,7
@@
emit_tex( struct lp_build_tgsi_soa_context *bld,
{
const uint unit = inst->FullSrcRegisters[1].SrcRegister.Index;
LLVMValueRef lodbias;
{
const uint unit = inst->FullSrcRegisters[1].SrcRegister.Index;
LLVMValueRef lodbias;
- LLVMValueRef oow;
+ LLVMValueRef oow
= NULL
;
LLVMValueRef coords[3];
unsigned num_coords;
unsigned i;
LLVMValueRef coords[3];
unsigned num_coords;
unsigned i;
@@
-394,12
+386,7
@@
emit_kil(
unsigned swizzle;
/* Unswizzle channel */
unsigned swizzle;
/* Unswizzle channel */
- swizzle = tgsi_util_get_full_src_register_extswizzle( reg, chan_index );
-
- /* Note that we test if the value is less than zero, so 1.0 and 0.0 need
- * not to be tested. */
- if(swizzle == TGSI_EXTSWIZZLE_ZERO || swizzle == TGSI_EXTSWIZZLE_ONE)
- continue;
+ swizzle = tgsi_util_get_full_src_register_swizzle( reg, chan_index );
/* Check if the component has not been already tested. */
assert(swizzle < NUM_CHANNELS);
/* Check if the component has not been already tested. */
assert(swizzle < NUM_CHANNELS);
@@
-459,7
+446,12
@@
emit_instruction(
{
unsigned chan_index;
LLVMValueRef src0, src1, src2;
{
unsigned chan_index;
LLVMValueRef src0, src1, src2;
- LLVMValueRef tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+ LLVMValueRef tmp0, tmp1, tmp2;
+ LLVMValueRef tmp3 = NULL;
+ LLVMValueRef tmp4 = NULL;
+ LLVMValueRef tmp5 = NULL;
+ LLVMValueRef tmp6 = NULL;
+ LLVMValueRef tmp7 = NULL;
LLVMValueRef res;
LLVMValueRef dst0[NUM_CHANNELS];
LLVMValueRef res;
LLVMValueRef dst0[NUM_CHANNELS];
@@
-488,7
+480,6
@@
emit_instruction(
#endif
case TGSI_OPCODE_MOV:
#endif
case TGSI_OPCODE_MOV:
- case TGSI_OPCODE_SWZ:
FOR_EACH_DST0_ENABLED_CHANNEL( inst, chan_index ) {
dst0[chan_index] = emit_fetch( bld, inst, 0, chan_index );
}
FOR_EACH_DST0_ENABLED_CHANNEL( inst, chan_index ) {
dst0[chan_index] = emit_fetch( bld, inst, 0, chan_index );
}
@@
-574,9
+565,9
@@
emit_instruction(
if (IS_DST0_CHANNEL_ENABLED( inst, CHAN_X ) ||
IS_DST0_CHANNEL_ENABLED( inst, CHAN_Y ) ||
IS_DST0_CHANNEL_ENABLED( inst, CHAN_Z )) {
if (IS_DST0_CHANNEL_ENABLED( inst, CHAN_X ) ||
IS_DST0_CHANNEL_ENABLED( inst, CHAN_Y ) ||
IS_DST0_CHANNEL_ENABLED( inst, CHAN_Z )) {
- LLVMValueRef *p_floor_log2;
- LLVMValueRef *p_exp;
- LLVMValueRef *p_log2;
+ LLVMValueRef *p_floor_log2
= NULL
;
+ LLVMValueRef *p_exp
= NULL
;
+ LLVMValueRef *p_log2
= NULL
;
src0 = emit_fetch( bld, inst, 0, CHAN_X );
src0 = lp_build_abs( &bld->base, src0 );
src0 = emit_fetch( bld, inst, 0, CHAN_X );
src0 = lp_build_abs( &bld->base, src0 );
@@
-1386,15
+1377,6
@@
emit_instruction(
return 0;
break;
return 0;
break;
- case TGSI_OPCODE_NOISE1:
- case TGSI_OPCODE_NOISE2:
- case TGSI_OPCODE_NOISE3:
- case TGSI_OPCODE_NOISE4:
- FOR_EACH_DST0_ENABLED_CHANNEL( inst, chan_index ) {
- dst0[chan_index] = bld->base.zero;
- }
- break;
-
case TGSI_OPCODE_NOP:
break;
case TGSI_OPCODE_NOP:
break;