summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-12-17 14:09:02 -0800
committerGravatar Yuri Kunde Schlesner2017-01-25 18:53:24 -0800
commit9ea5eacf919c8c257f8c5fda65e5fac2b6adee07 (patch)
treec62ade75473e8db7110f4528c40bb32f0be03684 /src
parentShader: Don't read ShaderSetup from global state (diff)
downloadyuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.gz
yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.tar.xz
yuzu-9ea5eacf919c8c257f8c5fda65e5fac2b6adee07.zip
Shader: Initialize conditional_code in interpreter
This doesn't belong in LoadInputVertex because it also happens for non-VS invocations. Since it's not used by the JIT it seems adequate to initialize it in the interpreter which is the only thing that cares about them.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/shader.cpp3
-rw-r--r--src/video_core/shader/shader_interpreter.cpp3
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) {
76 76
77 for (int i = 0; i < num_attributes; i++) 77 for (int i = 0; i < num_attributes; i++)
78 registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i]; 78 registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i];
79
80 conditional_code[0] = false;
81 conditional_code[1] = false;
82} 79}
83 80
84MICROPROFILE_DEFINE(GPU_Shader, "GPU", "Shader", MP_RGB(50, 50, 240)); 81MICROPROFILE_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
45 boost::container::static_vector<CallStackElement, 16> call_stack; 45 boost::container::static_vector<CallStackElement, 16> call_stack;
46 u32 program_counter = offset; 46 u32 program_counter = offset;
47 47
48 state.conditional_code[0] = false;
49 state.conditional_code[1] = false;
50
48 auto call = [&program_counter, &call_stack](u32 offset, u32 num_instructions, u32 return_offset, 51 auto call = [&program_counter, &call_stack](u32 offset, u32 num_instructions, u32 return_offset,
49 u8 repeat_count, u8 loop_increment) { 52 u8 repeat_count, u8 loop_increment) {
50 // -1 to make sure when incrementing the PC we end up at the correct offset 53 // -1 to make sure when incrementing the PC we end up at the correct offset