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

SPIR-V Dst 

Fix a few bugs in the translator
This commit is contained in:
Dr. Chat 2016-03-20 14:21:55 -05:00
parent 38b94dd9e2
commit 7b962e59a4
1 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,7 @@ void SpirvShaderTranslator::StartTranslation() {
push_constants_type, "push_consts"); push_constants_type, "push_consts");
// Texture bindings // Texture bindings
Id sampler_t = b.makeSamplerType();
Id tex_t[] = {b.makeSampledImageType(b.makeImageType( Id tex_t[] = {b.makeSampledImageType(b.makeImageType(
float_type_, spv::Dim::Dim1D, false, false, false, 1, float_type_, spv::Dim::Dim1D, false, false, false, 1,
spv::ImageFormat::ImageFormatUnknown)), spv::ImageFormat::ImageFormatUnknown)),
@ -177,18 +178,17 @@ void SpirvShaderTranslator::StartTranslation() {
float_type_, spv::Dim::DimCube, false, false, false, 1, float_type_, spv::Dim::DimCube, false, false, false, 1,
spv::ImageFormat::ImageFormatUnknown))}; spv::ImageFormat::ImageFormatUnknown))};
// Id samplers_a = b.makeArrayType(sampler_t, b.makeUintConstant(32), 0); Id samplers_a = b.makeArrayType(sampler_t, b.makeUintConstant(32), 0);
Id tex_a_t[] = {b.makeArrayType(tex_t[0], b.makeUintConstant(32), 0), Id tex_a_t[] = {b.makeArrayType(tex_t[0], b.makeUintConstant(32), 0),
b.makeArrayType(tex_t[1], b.makeUintConstant(32), 0), b.makeArrayType(tex_t[1], b.makeUintConstant(32), 0),
b.makeArrayType(tex_t[2], b.makeUintConstant(32), 0), b.makeArrayType(tex_t[2], b.makeUintConstant(32), 0),
b.makeArrayType(tex_t[3], b.makeUintConstant(32), 0)}; b.makeArrayType(tex_t[3], b.makeUintConstant(32), 0)};
// TODO(DrChat): See texture_cache.cc - do we need separate samplers here? // TODO(DrChat): See texture_cache.cc - do we need separate samplers here?
// samplers_ = samplers_ = b.createVariable(spv::StorageClass::StorageClassUniformConstant,
// b.createVariable(spv::StorageClass::StorageClassUniformConstant, samplers_a, "samplers");
// samplers_a, "samplers"); b.addDecoration(samplers_, spv::Decoration::DecorationDescriptorSet, 1);
// b.addDecoration(samplers_, spv::Decoration::DecorationDescriptorSet, 1); b.addDecoration(samplers_, spv::Decoration::DecorationBinding, 0);
// b.addDecoration(samplers_, spv::Decoration::DecorationBinding, 0);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
tex_[i] = b.createVariable(spv::StorageClass::StorageClassUniformConstant, tex_[i] = b.createVariable(spv::StorageClass::StorageClassUniformConstant,
tex_a_t[i], tex_a_t[i],
@ -481,16 +481,17 @@ void SpirvShaderTranslator::ProcessExecInstructionBegin(
// Conditional branch // Conditional branch
assert_true(cf_blocks_.size() > instr.dword_index + 1); assert_true(cf_blocks_.size() > instr.dword_index + 1);
body = &b.makeNewBlock(); body = &b.makeNewBlock();
auto cond = b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, v, auto cond = b.createBinOp(spv::Op::OpIEqual, bool_type_, v,
b.makeBoolConstant(instr.condition)); b.makeUintConstant(uint32_t(instr.condition)));
b.createConditionalBranch(cond, body, cf_blocks_[instr.dword_index + 1]); b.createConditionalBranch(cond, body, cf_blocks_[instr.dword_index + 1]);
} break; } break;
case ParsedExecInstruction::Type::kPredicated: { case ParsedExecInstruction::Type::kPredicated: {
// Branch based on p0. // Branch based on p0.
assert_true(cf_blocks_.size() > instr.dword_index + 1); assert_true(cf_blocks_.size() > instr.dword_index + 1);
body = &b.makeNewBlock(); body = &b.makeNewBlock();
auto cond = b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, p0_, auto cond =
b.makeBoolConstant(instr.condition)); b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, b.createLoad(p0_),
b.makeBoolConstant(instr.condition));
b.createConditionalBranch(cond, body, cf_blocks_[instr.dword_index + 1]); b.createConditionalBranch(cond, body, cf_blocks_[instr.dword_index + 1]);
} break; } break;
} }
@ -545,6 +546,8 @@ void SpirvShaderTranslator::ProcessCallInstruction(
auto head = cf_blocks_[instr.dword_index]; auto head = cf_blocks_[instr.dword_index];
b.setBuildPoint(head); b.setBuildPoint(head);
// Unused instruction(?)
assert_always();
EmitUnimplementedTranslationError(); EmitUnimplementedTranslationError();
assert_true(cf_blocks_.size() > instr.dword_index + 1); assert_true(cf_blocks_.size() > instr.dword_index + 1);
@ -558,6 +561,8 @@ void SpirvShaderTranslator::ProcessReturnInstruction(
auto head = cf_blocks_[instr.dword_index]; auto head = cf_blocks_[instr.dword_index];
b.setBuildPoint(head); b.setBuildPoint(head);
// Unused instruction(?)
assert_always();
EmitUnimplementedTranslationError(); EmitUnimplementedTranslationError();
assert_true(cf_blocks_.size() > instr.dword_index + 1); assert_true(cf_blocks_.size() > instr.dword_index + 1);
@ -576,6 +581,8 @@ void SpirvShaderTranslator::ProcessJumpInstruction(
b.createBranch(cf_blocks_[instr.target_address]); b.createBranch(cf_blocks_[instr.target_address]);
} break; } break;
case ParsedJumpInstruction::Type::kConditional: { case ParsedJumpInstruction::Type::kConditional: {
assert_true(cf_blocks_.size() > instr.dword_index + 1);
// Based off of bool_consts // Based off of bool_consts
std::vector<Id> offsets; std::vector<Id> offsets;
offsets.push_back(b.makeUintConstant(2)); // bool_consts offsets.push_back(b.makeUintConstant(2)); // bool_consts
@ -590,17 +597,19 @@ void SpirvShaderTranslator::ProcessJumpInstruction(
b.makeUintConstant(1)); b.makeUintConstant(1));
// Conditional branch // Conditional branch
auto cond = b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, v, auto cond = b.createBinOp(spv::Op::OpIEqual, bool_type_, v,
b.makeBoolConstant(instr.condition)); b.makeUintConstant(uint32_t(instr.condition)));
b.createConditionalBranch(cond, cf_blocks_[instr.target_address], b.createConditionalBranch(cond, cf_blocks_[instr.target_address],
cf_blocks_[instr.dword_index]); cf_blocks_[instr.dword_index + 1]);
} break; } break;
case ParsedJumpInstruction::Type::kPredicated: { case ParsedJumpInstruction::Type::kPredicated: {
assert_true(cf_blocks_.size() > instr.dword_index + 1); assert_true(cf_blocks_.size() > instr.dword_index + 1);
auto cond = b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, p0_,
b.makeBoolConstant(instr.condition)); auto cond =
b.createBinOp(spv::Op::OpLogicalEqual, bool_type_, b.createLoad(p0_),
b.makeBoolConstant(instr.condition));
b.createConditionalBranch(cond, cf_blocks_[instr.target_address], b.createConditionalBranch(cond, cf_blocks_[instr.target_address],
cf_blocks_[instr.dword_index]); cf_blocks_[instr.dword_index + 1]);
} break; } break;
} }
} }
@ -770,7 +779,15 @@ void SpirvShaderTranslator::ProcessVectorAluInstruction(
} break; } break;
case AluVectorOpcode::kDst: { case AluVectorOpcode::kDst: {
// TODO auto src0_y = b.createCompositeExtract(sources[0], float_type_, 1);
auto src1_y = b.createCompositeExtract(sources[1], float_type_, 1);
auto dst_y = b.createBinOp(spv::Op::OpFMul, float_type_, src0_y, src1_y);
auto src0_z = b.createCompositeExtract(sources[0], float_type_, 3);
auto src1_w = b.createCompositeExtract(sources[0], float_type_, 4);
dest = b.createCompositeConstruct(
vec4_float_type_,
std::vector<Id>({b.makeFloatConstant(1.f), dst_y, src0_z, src1_w}));
} break; } break;
case AluVectorOpcode::kDp2Add: { case AluVectorOpcode::kDp2Add: {
@ -1175,7 +1192,10 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
auto kill_block = &b.makeNewBlock(); auto kill_block = &b.makeNewBlock();
auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0], auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0],
b.makeFloatConstant(0.f)); b.makeFloatConstant(0.f));
cond = b.createBinOp(spv::Op::OpLogicalAnd, bool_type_, cond, pred_cond); if (pred_cond) {
cond =
b.createBinOp(spv::Op::OpLogicalAnd, bool_type_, cond, pred_cond);
}
b.createConditionalBranch(cond, kill_block, continue_block); b.createConditionalBranch(cond, kill_block, continue_block);
b.setBuildPoint(kill_block); b.setBuildPoint(kill_block);
@ -1348,6 +1368,12 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
b.makeFloatConstant(0.f), d); b.makeFloatConstant(0.f), d);
} break; } break;
case AluScalarOpcode::kRsqc: {
} break;
case AluScalarOpcode::kRsqf: {
} break;
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, bool_type_, sources[0], auto c = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0],
@ -1430,12 +1456,10 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
} break; } break;
case AluScalarOpcode::kSetpInv: { case AluScalarOpcode::kSetpInv: {
// p0 = src0 == 1.0
auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0], auto cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, sources[0],
b.makeFloatConstant(1.f)); b.makeFloatConstant(1.f));
auto pred = b.createStore(cond, p0_);
b.createTriOp(spv::Op::OpSelect, bool_type_, cond,
b.makeBoolConstant(true), b.makeBoolConstant(false));
b.createStore(pred, p0_);
// if (!cond) dest = src0 == 0.0 ? 1.0 : src0; // if (!cond) dest = src0 == 0.0 ? 1.0 : src0;
auto dst_cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_, auto dst_cond = b.createBinOp(spv::Op::OpFOrdEqual, bool_type_,
@ -1482,6 +1506,11 @@ void SpirvShaderTranslator::ProcessScalarAluInstruction(
GLSLstd450::kSin, {sources[0]}); GLSLstd450::kSin, {sources[0]});
} break; } break;
case AluScalarOpcode::kSqrt: {
dest = CreateGlslStd450InstructionCall(spv::NoPrecision, float_type_,
GLSLstd450::kSqrt, {sources[0]});
} break;
case AluScalarOpcode::kSubs: case AluScalarOpcode::kSubs:
case AluScalarOpcode::kSubsc0: case AluScalarOpcode::kSubsc0:
case AluScalarOpcode::kSubsc1: { case AluScalarOpcode::kSubsc1: {