diff options
| author | 2016-04-01 23:33:03 -0400 | |
|---|---|---|
| committer | 2016-04-13 23:04:48 -0400 | |
| commit | ffcf7ecee9f0b2843783e3678edaffbe1dda8ca2 (patch) | |
| tree | f3bf0ec46d7317c0ec4bea8b5912f0d2d0639dcc /src | |
| parent | shader_jit_x64: Specify shader main offset at runtime. (diff) | |
| download | yuzu-ffcf7ecee9f0b2843783e3678edaffbe1dda8ca2.tar.gz yuzu-ffcf7ecee9f0b2843783e3678edaffbe1dda8ca2.tar.xz yuzu-ffcf7ecee9f0b2843783e3678edaffbe1dda8ca2.zip | |
shader: Remove unused 'state' argument from 'Setup' function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/command_processor.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/shader/shader.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/shader/shader.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 08ec2907a..3abe79c09 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -140,7 +140,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 140 | immediate_attribute_id = 0; | 140 | immediate_attribute_id = 0; |
| 141 | 141 | ||
| 142 | Shader::UnitState<false> shader_unit; | 142 | Shader::UnitState<false> shader_unit; |
| 143 | Shader::Setup(shader_unit); | 143 | Shader::Setup(); |
| 144 | 144 | ||
| 145 | if (g_debug_context) | 145 | if (g_debug_context) |
| 146 | g_debug_context->OnEvent(DebugContext::Event::VertexLoaded, static_cast<void*>(&immediate_input)); | 146 | g_debug_context->OnEvent(DebugContext::Event::VertexLoaded, static_cast<void*>(&immediate_input)); |
| @@ -300,7 +300,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 300 | vertex_cache_ids.fill(-1); | 300 | vertex_cache_ids.fill(-1); |
| 301 | 301 | ||
| 302 | Shader::UnitState<false> shader_unit; | 302 | Shader::UnitState<false> shader_unit; |
| 303 | Shader::Setup(shader_unit); | 303 | Shader::Setup(); |
| 304 | 304 | ||
| 305 | for (unsigned int index = 0; index < regs.num_vertices; ++index) | 305 | for (unsigned int index = 0; index < regs.num_vertices; ++index) |
| 306 | { | 306 | { |
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index b35413488..5214864ec 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp | |||
| @@ -32,7 +32,7 @@ static std::unordered_map<u64, std::unique_ptr<JitCompiler>> shader_map; | |||
| 32 | static const JitCompiler* jit_shader; | 32 | static const JitCompiler* jit_shader; |
| 33 | #endif // ARCHITECTURE_x86_64 | 33 | #endif // ARCHITECTURE_x86_64 |
| 34 | 34 | ||
| 35 | void Setup(UnitState<false>& state) { | 35 | void Setup() { |
| 36 | #ifdef ARCHITECTURE_x86_64 | 36 | #ifdef ARCHITECTURE_x86_64 |
| 37 | if (VideoCore::g_shader_jit_enabled) { | 37 | if (VideoCore::g_shader_jit_enabled) { |
| 38 | u64 cache_key = (Common::ComputeHash64(&g_state.vs.program_code, sizeof(g_state.vs.program_code)) ^ | 38 | u64 cache_key = (Common::ComputeHash64(&g_state.vs.program_code, sizeof(g_state.vs.program_code)) ^ |
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h index 7af8f1fa1..9c5bd97bd 100644 --- a/src/video_core/shader/shader.h +++ b/src/video_core/shader/shader.h | |||
| @@ -339,9 +339,8 @@ struct UnitState { | |||
| 339 | /** | 339 | /** |
| 340 | * Performs any shader unit setup that only needs to happen once per shader (as opposed to once per | 340 | * Performs any shader unit setup that only needs to happen once per shader (as opposed to once per |
| 341 | * vertex, which would happen within the `Run` function). | 341 | * vertex, which would happen within the `Run` function). |
| 342 | * @param state Shader unit state, must be setup per shader and per shader unit | ||
| 343 | */ | 342 | */ |
| 344 | void Setup(UnitState<false>& state); | 343 | void Setup(); |
| 345 | 344 | ||
| 346 | /// Performs any cleanup when the emulator is shutdown | 345 | /// Performs any cleanup when the emulator is shutdown |
| 347 | void Shutdown(); | 346 | void Shutdown(); |