fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Basic control flow skeleton and jumps implemented.

Browse Source 
A-train's trees draw right now!
Helps a bit with #473 but still need to implement loops.
This commit is contained in:
Ben Vanik
2015-12-06 11:44:22 -08:00
parent 934b0d5bbc
commit 280c0b35f6
5 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/xenia/gpu/glsl_shader_translator.cc
View File

@@ -287,23 +287,50 @@ void main() {
EmitSource(" vec4 src0;\n");
EmitSource(" vec4 src1;\n");
EmitSource(" vec4 src2;\n");
// Master loop and switch for flow control.
EmitSourceDepth("int pc = 0;\n");
EmitSourceDepth("while (pc != 0xFFFF) {\n");
Indent();
EmitSourceDepth("switch (pc) {\n");
}
std::vector<uint8_t> GlslShaderTranslator::CompleteTranslation() {
// End of master switch.
EmitSourceDepth("default: pc = 0xFFFF; break;\n");
EmitSourceDepth("}; // switch\n");
Unindent();
EmitSourceDepth("} // while\n");
// End of process*() function.
EmitSource("}\n");
return source_.ToBytes();
}
void GlslShaderTranslator::ProcessLabel(uint32_t cf_index) {
EmitUnimplementedTranslationError();
}
void GlslShaderTranslator::ProcessLabel(uint32_t cf_index) {}
void GlslShaderTranslator::ProcessControlFlowNopInstruction() {
EmitSource("// cnop\n");
}
void GlslShaderTranslator::ProcessControlFlowInstructionBegin(
uint32_t cf_index) {
cf_wrote_pc_ = false;
EmitSourceDepth("case 0x%X: // L%d\n", cf_index, cf_index);
Indent();
}
void GlslShaderTranslator::ProcessControlFlowInstructionEnd(uint32_t cf_index) {
if (!cf_wrote_pc_) {
uint32_t next_index = cf_index + 1;
EmitSourceDepth("pc = 0x%X; // Fallthrough to L%d\n", next_index,
next_index);
}
EmitSourceDepth("break;\n");
Unindent();
}
void GlslShaderTranslator::ProcessExecInstructionBegin(
const ParsedExecInstruction& instr) {
EmitSource("// ");
@@ -330,6 +357,10 @@ void GlslShaderTranslator::ProcessExecInstructionEnd(
const ParsedExecInstruction& instr) {
Unindent();
EmitSourceDepth("}\n");
if (instr.is_end) {
EmitSourceDepth("pc = 0xFFFF;\n");
cf_wrote_pc_ = true;
}
}
void GlslShaderTranslator::ProcessLoopStartInstruction(
@@ -369,7 +400,39 @@ void GlslShaderTranslator::ProcessJumpInstruction(
EmitSource("// ");
instr.Disassemble(&source_);
EmitUnimplementedTranslationError();
bool needs_fallthrough = false;
switch (instr.type) {
case ParsedJumpInstruction::Type::kUnconditional:
EmitSourceDepth("{\n");
break;
case ParsedJumpInstruction::Type::kConditional:
EmitSourceDepth("if ((state.bool_consts[%d] & (1 << %d)) == %c) {\n",
instr.bool_constant_index / 32,
instr.bool_constant_index % 32,
instr.condition ? '1' : '0');
needs_fallthrough = true;
break;
case ParsedJumpInstruction::Type::kPredicated:
EmitSourceDepth("if (%cp0) {\n", instr.condition ? ' ' : '!');
needs_fallthrough = true;
break;
}
Indent();
EmitSourceDepth("pc = 0x%X; // L%d\n", instr.target_address,
instr.target_address);
cf_wrote_pc_ = true;
Unindent();
if (needs_fallthrough) {
uint32_t next_address = instr.dword_index + 1;
EmitSourceDepth("} else {\n");
EmitSourceDepth(" pc = 0x%X; // Fallthrough to L%d\n", next_address,
next_address);
EmitSourceDepth("}\n");
} else {
EmitSourceDepth("}\n");
}
}
void GlslShaderTranslator::ProcessAllocInstruction(