diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/macro/macro.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/macro/macro.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index b18b8a02a..c38ebd670 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp | |||
| @@ -240,7 +240,7 @@ void Maxwell3D::CallMacroMethod(u32 method, const std::vector<u32>& parameters) | |||
| 240 | ((method - MacroRegistersStart) >> 1) % static_cast<u32>(macro_positions.size()); | 240 | ((method - MacroRegistersStart) >> 1) % static_cast<u32>(macro_positions.size()); |
| 241 | 241 | ||
| 242 | // Execute the current macro. | 242 | // Execute the current macro. |
| 243 | macro_engine->Execute(*this, macro_positions[entry], parameters); | 243 | macro_engine->Execute(macro_positions[entry], parameters); |
| 244 | if (mme_draw.current_mode != MMEDrawMode::Undefined) { | 244 | if (mme_draw.current_mode != MMEDrawMode::Undefined) { |
| 245 | FlushMMEInlineDraw(); | 245 | FlushMMEInlineDraw(); |
| 246 | } | 246 | } |
diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp index d7fabe605..0870a7687 100644 --- a/src/video_core/macro/macro.cpp +++ b/src/video_core/macro/macro.cpp | |||
| @@ -24,8 +24,7 @@ void MacroEngine::AddCode(u32 method, u32 data) { | |||
| 24 | uploaded_macro_code[method].push_back(data); | 24 | uploaded_macro_code[method].push_back(data); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | void MacroEngine::Execute(Engines::Maxwell3D& maxwell3d, u32 method, | 27 | void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) { |
| 28 | const std::vector<u32>& parameters) { | ||
| 29 | auto compiled_macro = macro_cache.find(method); | 28 | auto compiled_macro = macro_cache.find(method); |
| 30 | if (compiled_macro != macro_cache.end()) { | 29 | if (compiled_macro != macro_cache.end()) { |
| 31 | const auto& cache_info = compiled_macro->second; | 30 | const auto& cache_info = compiled_macro->second; |
diff --git a/src/video_core/macro/macro.h b/src/video_core/macro/macro.h index 31ee3440a..7aaa49286 100644 --- a/src/video_core/macro/macro.h +++ b/src/video_core/macro/macro.h | |||
| @@ -119,7 +119,7 @@ public: | |||
| 119 | void AddCode(u32 method, u32 data); | 119 | void AddCode(u32 method, u32 data); |
| 120 | 120 | ||
| 121 | // Compiles the macro if its not in the cache, and executes the compiled macro | 121 | // Compiles the macro if its not in the cache, and executes the compiled macro |
| 122 | void Execute(Engines::Maxwell3D& maxwell3d, u32 method, const std::vector<u32>& parameters); | 122 | void Execute(u32 method, const std::vector<u32>& parameters); |
| 123 | 123 | ||
| 124 | protected: | 124 | protected: |
| 125 | virtual std::unique_ptr<CachedMacro> Compile(const std::vector<u32>& code) = 0; | 125 | virtual std::unique_ptr<CachedMacro> Compile(const std::vector<u32>& code) = 0; |