diff options
Diffstat (limited to 'src/video_core/shader/shader.cpp')
| -rw-r--r-- | src/video_core/shader/shader.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 06c1fe653..6a27a8015 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp | |||
| @@ -67,29 +67,29 @@ OutputVertex Run(UnitState& state, const InputVertex& input, int num_attributes) | |||
| 67 | // Setup input register table | 67 | // Setup input register table |
| 68 | const auto& attribute_register_map = config.input_register_map; | 68 | const auto& attribute_register_map = config.input_register_map; |
| 69 | 69 | ||
| 70 | if (num_attributes > 0) state.input_registers[attribute_register_map.attribute0_register] = input.attr[0]; | 70 | if (num_attributes > 0) state.registers.input[attribute_register_map.attribute0_register] = input.attr[0]; |
| 71 | if (num_attributes > 1) state.input_registers[attribute_register_map.attribute1_register] = input.attr[1]; | 71 | if (num_attributes > 1) state.registers.input[attribute_register_map.attribute1_register] = input.attr[1]; |
| 72 | if (num_attributes > 2) state.input_registers[attribute_register_map.attribute2_register] = input.attr[2]; | 72 | if (num_attributes > 2) state.registers.input[attribute_register_map.attribute2_register] = input.attr[2]; |
| 73 | if (num_attributes > 3) state.input_registers[attribute_register_map.attribute3_register] = input.attr[3]; | 73 | if (num_attributes > 3) state.registers.input[attribute_register_map.attribute3_register] = input.attr[3]; |
| 74 | if (num_attributes > 4) state.input_registers[attribute_register_map.attribute4_register] = input.attr[4]; | 74 | if (num_attributes > 4) state.registers.input[attribute_register_map.attribute4_register] = input.attr[4]; |
| 75 | if (num_attributes > 5) state.input_registers[attribute_register_map.attribute5_register] = input.attr[5]; | 75 | if (num_attributes > 5) state.registers.input[attribute_register_map.attribute5_register] = input.attr[5]; |
| 76 | if (num_attributes > 6) state.input_registers[attribute_register_map.attribute6_register] = input.attr[6]; | 76 | if (num_attributes > 6) state.registers.input[attribute_register_map.attribute6_register] = input.attr[6]; |
| 77 | if (num_attributes > 7) state.input_registers[attribute_register_map.attribute7_register] = input.attr[7]; | 77 | if (num_attributes > 7) state.registers.input[attribute_register_map.attribute7_register] = input.attr[7]; |
| 78 | if (num_attributes > 8) state.input_registers[attribute_register_map.attribute8_register] = input.attr[8]; | 78 | if (num_attributes > 8) state.registers.input[attribute_register_map.attribute8_register] = input.attr[8]; |
| 79 | if (num_attributes > 9) state.input_registers[attribute_register_map.attribute9_register] = input.attr[9]; | 79 | if (num_attributes > 9) state.registers.input[attribute_register_map.attribute9_register] = input.attr[9]; |
| 80 | if (num_attributes > 10) state.input_registers[attribute_register_map.attribute10_register] = input.attr[10]; | 80 | if (num_attributes > 10) state.registers.input[attribute_register_map.attribute10_register] = input.attr[10]; |
| 81 | if (num_attributes > 11) state.input_registers[attribute_register_map.attribute11_register] = input.attr[11]; | 81 | if (num_attributes > 11) state.registers.input[attribute_register_map.attribute11_register] = input.attr[11]; |
| 82 | if (num_attributes > 12) state.input_registers[attribute_register_map.attribute12_register] = input.attr[12]; | 82 | if (num_attributes > 12) state.registers.input[attribute_register_map.attribute12_register] = input.attr[12]; |
| 83 | if (num_attributes > 13) state.input_registers[attribute_register_map.attribute13_register] = input.attr[13]; | 83 | if (num_attributes > 13) state.registers.input[attribute_register_map.attribute13_register] = input.attr[13]; |
| 84 | if (num_attributes > 14) state.input_registers[attribute_register_map.attribute14_register] = input.attr[14]; | 84 | if (num_attributes > 14) state.registers.input[attribute_register_map.attribute14_register] = input.attr[14]; |
| 85 | if (num_attributes > 15) state.input_registers[attribute_register_map.attribute15_register] = input.attr[15]; | 85 | if (num_attributes > 15) state.registers.input[attribute_register_map.attribute15_register] = input.attr[15]; |
| 86 | 86 | ||
| 87 | state.conditional_code[0] = false; | 87 | state.conditional_code[0] = false; |
| 88 | state.conditional_code[1] = false; | 88 | state.conditional_code[1] = false; |
| 89 | 89 | ||
| 90 | #ifdef ARCHITECTURE_x86_64 | 90 | #ifdef ARCHITECTURE_x86_64 |
| 91 | if (VideoCore::g_shader_jit_enabled) | 91 | if (VideoCore::g_shader_jit_enabled) |
| 92 | jit_shader(&state); | 92 | jit_shader(&state.registers); |
| 93 | else | 93 | else |
| 94 | RunInterpreter(state); | 94 | RunInterpreter(state); |
| 95 | #else | 95 | #else |
| @@ -117,7 +117,7 @@ OutputVertex Run(UnitState& state, const InputVertex& input, int num_attributes) | |||
| 117 | for (int comp = 0; comp < 4; ++comp) { | 117 | for (int comp = 0; comp < 4; ++comp) { |
| 118 | float24* out = ((float24*)&ret) + semantics[comp]; | 118 | float24* out = ((float24*)&ret) + semantics[comp]; |
| 119 | if (semantics[comp] != Regs::VSOutputAttributes::INVALID) { | 119 | if (semantics[comp] != Regs::VSOutputAttributes::INVALID) { |
| 120 | *out = state.output_registers[i][comp]; | 120 | *out = state.registers.output[i][comp]; |
| 121 | } else { | 121 | } else { |
| 122 | // Zero output so that attributes which aren't output won't have denormals in them, | 122 | // Zero output so that attributes which aren't output won't have denormals in them, |
| 123 | // which would slow us down later. | 123 | // which would slow us down later. |