citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #2080 from yuriks/shader-interp-crash 

VideoCore: Fix dangling lambda context in shader interpreter
This commit is contained in:
Yuri Kunde Schlesner 2016-09-15 22:47:20 -07:00 committed by GitHub
parent f196924ddd a3afeb4687
commit 8bf09b5302
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/shader/shader_interpreter.cpp
View File

@ -77,7 +77,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState<Debug>& state, unsigned
const Instruction instr = { program_code[program_counter] }; const Instruction instr = { program_code[program_counter] };
const SwizzlePattern swizzle = { swizzle_data[instr.common.operand_desc_id] }; const SwizzlePattern swizzle = { swizzle_data[instr.common.operand_desc_id] };
static auto call = [&program_counter, &call_stack](UnitState<Debug>& state, u32 offset, u32 num_instructions, auto call = [&program_counter, &call_stack](UnitState<Debug>& state, u32 offset, u32 num_instructions,
u32 return_offset, u8 repeat_count, u8 loop_increment) { u32 return_offset, u8 repeat_count, u8 loop_increment) {
program_counter = offset - 1; // -1 to make sure when incrementing the PC we end up at the correct offset program_counter = offset - 1; // -1 to make sure when incrementing the PC we end up at the correct offset
ASSERT(call_stack.size() < call_stack.capacity()); ASSERT(call_stack.size() < call_stack.capacity());