ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #549 from DrChat/spv_translator 

SPV Quick Fixes
This commit is contained in:
Ben Vanik 2016-02-20 20:21:38 -08:00
parent 6d65439efe 2629ae4a14
commit 1e87d1fa7f
2 changed files with 68 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/xenia/gpu/spirv_shader_translator.cc
View File

@ -566,7 +566,7 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
case AluVectorOpcode::kSge: { case AluVectorOpcode::kSge: {
// foreach(el) src0 >= src1 ? 1.0 : 0.0 // foreach(el) src0 >= src1 ? 1.0 : 0.0
auto c = b.createBinOp(spv::Op::OpFOrdGreaterThanEqual, vec4_float_type_, auto c = b.createBinOp(spv::Op::OpFOrdGreaterThanEqual, vec4_bool_type_,
sources[0], sources[1]); sources[0], sources[1]);
dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c, dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c,
vec4_float_one_, vec4_float_zero_); vec4_float_one_, vec4_float_zero_);
@ -574,7 +574,7 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
case AluVectorOpcode::kSgt: { case AluVectorOpcode::kSgt: {
// foreach(el) src0 > src1 ? 1.0 : 0.0 // foreach(el) src0 > src1 ? 1.0 : 0.0
auto c = b.createBinOp(spv::Op::OpFOrdGreaterThan, vec4_float_type_, auto c = b.createBinOp(spv::Op::OpFOrdGreaterThan, vec4_bool_type_,
sources[0], sources[1]); sources[0], sources[1]);
dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c, dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c,
vec4_float_one_, vec4_float_zero_); vec4_float_one_, vec4_float_zero_);
@ -582,7 +582,7 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
case AluVectorOpcode::kSne: { case AluVectorOpcode::kSne: {
// foreach(el) src0 != src1 ? 1.0 : 0.0 // foreach(el) src0 != src1 ? 1.0 : 0.0
auto c = b.createBinOp(spv::Op::OpFOrdNotEqual, vec4_float_type_, auto c = b.createBinOp(spv::Op::OpFOrdNotEqual, vec4_bool_type_,
sources[0], sources[1]); sources[0], sources[1]);
dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c, dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, c,
vec4_float_one_, vec4_float_zero_); vec4_float_one_, vec4_float_zero_);
@ -599,8 +599,20 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
} }
if (dest) { if (dest) {
// If predicated, discard the result from the instruction.
Id pred_cond = 0;
Id pv_dest = dest;
if (instr.is_predicated) {
pred_cond =
b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, b.createLoad(p0_),
b.makeBoolConstant(instr.predicate_condition));
pv_dest = b.createTriOp(spv::Op::OpSelect, vec4_float_type_, pred_cond,
dest, b.createLoad(pv_));
}
b.createStore(dest, pv_); b.createStore(dest, pv_);
StoreToResult(dest, instr.result); StoreToResult(dest, instr.result, pred_cond);
} }
} }
@ -714,7 +726,7 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
case AluScalarOpcode::kRsq: { case AluScalarOpcode::kRsq: {
// dest = src0 != 0.0 ? inversesqrt(src0) : 0.0; // dest = src0 != 0.0 ? inversesqrt(src0) : 0.0;
auto c = b.createBinOp(spv::Op::OpFOrdEqual, float_type_, sources[0], auto c = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0],
b.makeFloatConstant(0.f)); b.makeFloatConstant(0.f));
auto d = CreateGlslStd450InstructionCall( auto d = CreateGlslStd450InstructionCall(
spv::Decoration::DecorationInvariant, vec4_float_type_, spv::Decoration::DecorationInvariant, vec4_float_type_,
@ -724,19 +736,35 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
} break; } break;
case AluScalarOpcode::kSeqs: { case AluScalarOpcode::kSeqs: {
// TODO: dest = src0 == 0.0 ? 1.0 : 0.0; // dest = src0 == 0.0 ? 1.0 : 0.0;
auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0],
b.makeFloatConstant(0.f));
dest = b.createTriOp(spv::Op::OpSelect, float_type_, cond,
b.makeFloatConstant(1.f), b.makeFloatConstant(0.f));
} break; } break;
case AluScalarOpcode::kSges: { case AluScalarOpcode::kSges: {
// TODO: dest = src0 >= 0.0 ? 1.0 : 0.0; // dest = src0 >= 0.0 ? 1.0 : 0.0;
auto cond = b.createBinOp(spv::Op::OpFOrdGreaterThanEqual, bool_type_,
sources[0], b.makeFloatConstant(0.f));
dest = b.createTriOp(spv::Op::OpSelect, float_type_, cond,
b.makeFloatConstant(1.f), b.makeFloatConstant(0.f));
} break; } break;
case AluScalarOpcode::kSgts: { case AluScalarOpcode::kSgts: {
// TODO: dest = src0 > 0.0 ? 1.0 : 0.0; // dest = src0 > 0.0 ? 1.0 : 0.0;
auto cond = b.createBinOp(spv::Op::OpFOrdGreaterThan, bool_type_,
sources[0], b.makeFloatConstant(0.f));
dest = b.createTriOp(spv::Op::OpSelect, float_type_, cond,
b.makeFloatConstant(1.f), b.makeFloatConstant(0.f));
} break; } break;
case AluScalarOpcode::kSnes: { case AluScalarOpcode::kSnes: {
// TODO: dest = src0 != 0.0 ? 1.0 : 0.0; // dest = src0 != 0.0 ? 1.0 : 0.0;
auto cond = b.createBinOp(spv::Op::OpFOrdNotEqual, bool_type_, sources[0],
b.makeFloatConstant(0.f));
dest = b.createTriOp(spv::Op::OpSelect, float_type_, cond,
b.makeFloatConstant(1.f), b.makeFloatConstant(0.f));
} break; } break;
case AluScalarOpcode::kSetpEq: { case AluScalarOpcode::kSetpEq: {
@ -823,8 +851,20 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
} }
if (dest) { if (dest) {
// If predicated, discard the result from the instruction.
Id pred_cond = 0;
Id ps_dest = dest;
if (instr.is_predicated) {
pred_cond =
b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, b.createLoad(p0_),
b.makeBoolConstant(instr.predicate_condition));
ps_dest = b.createTriOp(spv::Op::OpSelect, float_type_, pred_cond, dest,
b.createLoad(ps_));
}
b.createStore(dest, ps_); b.createStore(dest, ps_);
StoreToResult(dest, instr.result); StoreToResult(dest, instr.result, pred_cond);
} }
} }
@ -932,29 +972,26 @@ Id SpirvShaderTranslator::LoadFromOperand(const InstructionOperand& op) {
swiz = op.components[op.component_count - 1]; swiz = op.components[op.component_count - 1];
} }
uint32_t swiz_id = 0;
switch (swiz) { switch (swiz) {
case SwizzleSource::kX: case SwizzleSource::kX:
swiz_id = 0; operands.push_back(0);
break; break;
case SwizzleSource::kY: case SwizzleSource::kY:
swiz_id = 1; operands.push_back(1);
break; break;
case SwizzleSource::kZ: case SwizzleSource::kZ:
swiz_id = 2; operands.push_back(2);
break; break;
case SwizzleSource::kW: case SwizzleSource::kW:
swiz_id = 3; operands.push_back(3);
break; break;
case SwizzleSource::k0: case SwizzleSource::k0:
swiz_id = 4; operands.push_back(4);
break; break;
case SwizzleSource::k1: case SwizzleSource::k1:
swiz_id = 5; operands.push_back(5);
break; break;
} }
operands.push_back(swiz_id);
} }
storage_value = storage_value =
@ -965,7 +1002,8 @@ Id SpirvShaderTranslator::LoadFromOperand(const InstructionOperand& op) {
} }
void SpirvShaderTranslator::StoreToResult(Id source_value_id, void SpirvShaderTranslator::StoreToResult(Id source_value_id,
const InstructionResult& result) { const InstructionResult& result,
Id predicate_cond) {
auto& b = *builder_; auto& b = *builder_;
if (result.storage_target == InstructionStorageTarget::kNone) { if (result.storage_target == InstructionStorageTarget::kNone) {
@ -1096,7 +1134,6 @@ void SpirvShaderTranslator::StoreToResult(Id source_value_id,
continue; continue;
} }
uint32_t swiz_id = 0;
switch (swiz) { switch (swiz) {
case SwizzleSource::kX: case SwizzleSource::kX:
operands.push_back(0); operands.push_back(0);
@ -1141,6 +1178,14 @@ void SpirvShaderTranslator::StoreToResult(Id source_value_id,
// Perform store into the pointer. // Perform store into the pointer.
assert_true(b.getNumComponents(source_value_id) == assert_true(b.getNumComponents(source_value_id) ==
b.getNumTypeComponents(storage_type)); b.getNumTypeComponents(storage_type));
// Discard if predicate condition is false.
if (predicate_cond) {
source_value_id =
b.createTriOp(spv::Op::OpSelect, storage_type, predicate_cond,
source_value_id, storage_value);
}
b.createStore(source_value_id, storage_pointer); b.createStore(source_value_id, storage_pointer);
} }

3
src/xenia/gpu/spirv_shader_translator.h
View File

@ -71,7 +71,8 @@ class SpirvShaderTranslator : public ShaderTranslator {
// Stores a value based on the specified result information. // Stores a value based on the specified result information.
// The value will be transformed into the appropriate form for the result and // The value will be transformed into the appropriate form for the result and
// the proper components will be selected. // the proper components will be selected.
void StoreToResult(spv::Id source_value_id, const InstructionResult& result); void StoreToResult(spv::Id source_value_id, const InstructionResult& result,
spv::Id predicate_cond = 0);
xe::ui::spirv::SpirvDisassembler disassembler_; xe::ui::spirv::SpirvDisassembler disassembler_;