yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Pica/VertexShader: Be robust against invalid inputs. 

More specifically, this also fixes crashes by Citra trying to load a src2 register even if the current instruction does not use that.
This commit is contained in:
Tony Wasserka 2014-12-19 19:58:21 +01:00
parent ad5db467d7
commit a664574ecb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_core/vertex_shader.cpp
View File

@ -99,6 +99,10 @@ struct VertexShaderState {
}; };
static void ProcessShaderCode(VertexShaderState& state) { static void ProcessShaderCode(VertexShaderState& state) {
// Placeholder for invalid inputs
static float24 dummy_vec4_float24[4];
while (true) { while (true) {
if (!state.call_stack.empty()) { if (!state.call_stack.empty()) {
if (state.program_counter - shader_memory.data() == state.call_stack.top().final_address) { if (state.program_counter - shader_memory.data() == state.call_stack.top().final_address) {
@ -132,6 +136,9 @@ static void ProcessShaderCode(VertexShaderState& state) {
case RegisterType::FloatUniform: case RegisterType::FloatUniform:
return &shader_uniforms.f[source_reg.GetIndex()].x; return &shader_uniforms.f[source_reg.GetIndex()].x;
default:
return dummy_vec4_float24;
} }
}; };
@ -182,9 +189,9 @@ static void ProcessShaderCode(VertexShaderState& state) {
} }
float24* dest = (instr.common.dest < 0x08) ? state.output_register_table[4*instr.common.dest.GetIndex()] float24* dest = (instr.common.dest < 0x08) ? state.output_register_table[4*instr.common.dest.GetIndex()]
: (instr.common.dest < 0x10) ? nullptr : (instr.common.dest < 0x10) ? dummy_vec4_float24
: (instr.common.dest < 0x20) ? &state.temporary_registers[instr.common.dest.GetIndex()][0] : (instr.common.dest < 0x20) ? &state.temporary_registers[instr.common.dest.GetIndex()][0]
: nullptr; : dummy_vec4_float24;
state.debug.max_opdesc_id = std::max<u32>(state.debug.max_opdesc_id, 1+instr.common.operand_desc_id); state.debug.max_opdesc_id = std::max<u32>(state.debug.max_opdesc_id, 1+instr.common.operand_desc_id);