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

gallivm: add support for TGSI instructions with two outputs 

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
This commit is contained in:
Nicolai Hähnle 2017-09-16 12:50:42 +02:00
parent 7af64b4d4a
commit 5cf279bf7e
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gallium/auxiliary/gallivm/lp_bld_tgsi.c
View File

@ -264,11 +264,17 @@ lp_build_tgsi_inst_llvm(
memset(&emit_data, 0, sizeof(emit_data));
assert(info->num_dst <= 1);
assert(info->num_dst <= 2);
if (info->num_dst) {
TGSI_FOR_EACH_DST0_ENABLED_CHANNEL( inst, chan_index ) {
emit_data.output[chan_index] = bld_base->base.undef;
}
if (info->num_dst >= 2) {
TGSI_FOR_EACH_DST1_ENABLED_CHANNEL( inst, chan_index ) {
emit_data.output1[chan_index] = bld_base->base.undef;
}
}
}
emit_data.inst = inst;
@ -309,11 +315,21 @@ lp_build_tgsi_inst_llvm(
TGSI_FOR_EACH_DST0_ENABLED_CHANNEL(inst, chan_index) {
emit_data.output[chan_index] = val;
}
if (info->num_dst >= 2) {
val = emit_data.output1[0];
memset(emit_data.output1, 0, sizeof(emit_data.output1));
TGSI_FOR_EACH_DST1_ENABLED_CHANNEL(inst, chan_index) {
emit_data.output1[chan_index] = val;
}
}
}
}
if (info->num_dst > 0 && info->opcode != TGSI_OPCODE_STORE) {
bld_base->emit_store(bld_base, inst, info, 0, emit_data.output);
if (info->num_dst >= 2)
bld_base->emit_store(bld_base, inst, info, 1, emit_data.output1);
}
return TRUE;
}

5
src/gallium/auxiliary/gallivm/lp_bld_tgsi_action.h
View File

@ -81,6 +81,11 @@ struct lp_build_emit_data {
*/
LLVMValueRef output[4];
/**
* Secondary output for instruction that have a second destination register.
*/
LLVMValueRef output1[4];
/**
* The current instruction that is being 'executed'.
*/

9
src/gallium/auxiliary/tgsi/tgsi_exec.h
View File

@ -58,6 +58,15 @@ extern "C" {
TGSI_FOR_EACH_CHANNEL( CHAN )\
TGSI_IF_IS_DST0_CHANNEL_ENABLED( INST, CHAN )
#define TGSI_IS_DST1_CHANNEL_ENABLED( INST, CHAN )\
((INST)->Dst[1].Register.WriteMask & (1 << (CHAN)))
#define TGSI_IF_IS_DST1_CHANNEL_ENABLED( INST, CHAN )\
if (TGSI_IS_DST1_CHANNEL_ENABLED( INST, CHAN ))
#define TGSI_FOR_EACH_DST1_ENABLED_CHANNEL( INST, CHAN )\
TGSI_FOR_EACH_CHANNEL( CHAN )\
TGSI_IF_IS_DST1_CHANNEL_ENABLED( INST, CHAN )
/**
* Registers may be treated as float, signed int or unsigned int.