mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-23 04:40:42 +02:00
Merge pull request #470 from archshift/master
Pica/VertexShader: Implement JMPC/JMPU/CALLC/CALLU.
This commit is contained in:
commit
65c12d2430
2
externals/nihstro
vendored
2
externals/nihstro
vendored
@ -1 +1 @@
|
|||||||
Subproject commit fc71f8684d26ccf277ad68809c8bd7273141fe89
|
Subproject commit 0a8b4d221425f13e24a3cef9b02edc3221bab211
|
@ -349,12 +349,44 @@ static void ProcessShaderCode(VertexShaderState& state) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
{
|
||||||
|
static auto evaluate_condition = [](const VertexShaderState& state, bool refx, bool refy, Instruction::FlowControlType flow_control) {
|
||||||
|
bool results[2] = { refx == state.conditional_code[0],
|
||||||
|
refy == state.conditional_code[1] };
|
||||||
|
|
||||||
|
switch (flow_control.op) {
|
||||||
|
case flow_control.Or:
|
||||||
|
return results[0] || results[1];
|
||||||
|
|
||||||
|
case flow_control.And:
|
||||||
|
return results[0] && results[1];
|
||||||
|
|
||||||
|
case flow_control.JustX:
|
||||||
|
return results[0];
|
||||||
|
|
||||||
|
case flow_control.JustY:
|
||||||
|
return results[1];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Handle each instruction on its own
|
// Handle each instruction on its own
|
||||||
switch (instr.opcode) {
|
switch (instr.opcode) {
|
||||||
case Instruction::OpCode::END:
|
case Instruction::OpCode::END:
|
||||||
exit_loop = true;
|
exit_loop = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Instruction::OpCode::JMPC:
|
||||||
|
if (evaluate_condition(state, instr.flow_control.refx, instr.flow_control.refy, instr.flow_control)) {
|
||||||
|
state.program_counter = &shader_memory[instr.flow_control.dest_offset] - 1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Instruction::OpCode::JMPU:
|
||||||
|
if (shader_uniforms.b[instr.flow_control.bool_uniform_id]) {
|
||||||
|
state.program_counter = &shader_memory[instr.flow_control.dest_offset] - 1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case Instruction::OpCode::CALL:
|
case Instruction::OpCode::CALL:
|
||||||
call(state,
|
call(state,
|
||||||
instr.flow_control.dest_offset,
|
instr.flow_control.dest_offset,
|
||||||
@ -362,6 +394,24 @@ static void ProcessShaderCode(VertexShaderState& state) {
|
|||||||
binary_offset + 1);
|
binary_offset + 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Instruction::OpCode::CALLU:
|
||||||
|
if (shader_uniforms.b[instr.flow_control.bool_uniform_id]) {
|
||||||
|
call(state,
|
||||||
|
instr.flow_control.dest_offset,
|
||||||
|
instr.flow_control.num_instructions,
|
||||||
|
binary_offset + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Instruction::OpCode::CALLC:
|
||||||
|
if (evaluate_condition(state, instr.flow_control.refx, instr.flow_control.refy, instr.flow_control)) {
|
||||||
|
call(state,
|
||||||
|
instr.flow_control.dest_offset,
|
||||||
|
instr.flow_control.num_instructions,
|
||||||
|
binary_offset + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case Instruction::OpCode::NOP:
|
case Instruction::OpCode::NOP:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -384,29 +434,7 @@ static void ProcessShaderCode(VertexShaderState& state) {
|
|||||||
{
|
{
|
||||||
// TODO: Do we need to consider swizzlers here?
|
// TODO: Do we need to consider swizzlers here?
|
||||||
|
|
||||||
auto flow_control = instr.flow_control;
|
if (evaluate_condition(state, instr.flow_control.refx, instr.flow_control.refy, instr.flow_control)) {
|
||||||
bool results[3] = { (bool)flow_control.refx == state.conditional_code[0],
|
|
||||||
(bool)flow_control.refy == state.conditional_code[1] };
|
|
||||||
|
|
||||||
switch (flow_control.op) {
|
|
||||||
case flow_control.Or:
|
|
||||||
results[2] = results[0] || results[1];
|
|
||||||
break;
|
|
||||||
|
|
||||||
case flow_control.And:
|
|
||||||
results[2] = results[0] && results[1];
|
|
||||||
break;
|
|
||||||
|
|
||||||
case flow_control.JustX:
|
|
||||||
results[2] = results[0];
|
|
||||||
break;
|
|
||||||
|
|
||||||
case flow_control.JustY:
|
|
||||||
results[2] = results[1];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (results[2]) {
|
|
||||||
call(state,
|
call(state,
|
||||||
binary_offset + 1,
|
binary_offset + 1,
|
||||||
instr.flow_control.dest_offset - binary_offset - 1,
|
instr.flow_control.dest_offset - binary_offset - 1,
|
||||||
@ -429,6 +457,7 @@ static void ProcessShaderCode(VertexShaderState& state) {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
++state.program_counter;
|
++state.program_counter;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user