diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-12-17 23:09:02 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-26 03:53:24 +0100 |
| commit | 9ea5eacf919c8c257f8c5fda65e5fac2b6adee07 (patch) | |
| tree | c62ade75473e8db7110f4528c40bb32f0be03684 | |
| parent | Shader: Don't read ShaderSetup from global state (diff) | |
| download | yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.gz yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.bz2 yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.lz yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.xz yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.zst yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.zip | |
| -rw-r--r-- | src/video_core/shader/shader.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/shader/shader_interpreter.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index b30dae476..1662b5d38 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -76,9 +76,6 @@ void UnitState::LoadInputVertex(const InputVertex& input, int num_attributes) { for (int i = 0; i < num_attributes; i++) registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i]; - - conditional_code[0] = false; - conditional_code[1] = false; } MICROPROFILE_DEFINE(GPU_Shader, "GPU", "Shader", MP_RGB(50, 50, 240)); diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index d1f11142d..ecc227089 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -45,6 +45,9 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData boost::container::static_vector<CallStackElement, 16> call_stack; u32 program_counter = offset; + state.conditional_code[0] = false; + state.conditional_code[1] = false; + auto call = [&program_counter, &call_stack](u32 offset, u32 num_instructions, u32 return_offset, u8 repeat_count, u8 loop_increment) { // -1 to make sure when incrementing the PC we end up at the correct offset |