diff options
author | bunnei <bunneidev@gmail.com> | 2020-06-04 17:40:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-04 17:40:52 +0200 |
commit | 34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0 (patch) | |
tree | 95b864039ba58c858b0bb89c2eb6b56a25475d22 /src/video_core/engines/maxwell_3d.h | |
parent | Merge pull request #4039 from FearlessTobi/port-5376 (diff) | |
parent | Default init labels and use initializer list for macro engine (diff) | |
download | yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.tar yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.tar.gz yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.tar.bz2 yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.tar.lz yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.tar.xz yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.tar.zst yuzu-34d4abc4f9c264fb4dfc32b9b44aaeecaa4695a0.zip |
Diffstat (limited to 'src/video_core/engines/maxwell_3d.h')
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 05dd6b39b..b827b112f 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -23,7 +23,7 @@ #include "video_core/engines/engine_upload.h" #include "video_core/engines/shader_type.h" #include "video_core/gpu.h" -#include "video_core/macro_interpreter.h" +#include "video_core/macro/macro.h" #include "video_core/textures/texture.h" namespace Core { @@ -1411,15 +1411,6 @@ public: const VideoCore::GuestDriverProfile& AccessGuestDriverProfile() const override; - /// Memory for macro code - it's undetermined how big this is, however 1MB is much larger than - /// we've seen used. - using MacroMemory = std::array<u32, 0x40000>; - - /// Gets a reference to macro memory. - const MacroMemory& GetMacroMemory() const { - return macro_memory; - } - bool ShouldExecute() const { return execute_on; } @@ -1468,16 +1459,13 @@ private: std::array<bool, Regs::NUM_REGS> mme_inline{}; - /// Memory for macro code - MacroMemory macro_memory; - /// Macro method that is currently being executed / being fed parameters. u32 executing_macro = 0; /// Parameters that have been submitted to the macro call so far. std::vector<u32> macro_params; /// Interpreter for the macro codes uploaded to the GPU. - MacroInterpreter macro_interpreter; + std::unique_ptr<MacroEngine> macro_engine; static constexpr u32 null_cb_data = 0xFFFFFFFF; struct { @@ -1506,7 +1494,7 @@ private: * @param num_parameters Number of arguments * @param parameters Arguments to the method call */ - void CallMacroMethod(u32 method, std::size_t num_parameters, const u32* parameters); + void CallMacroMethod(u32 method, const std::vector<u32>& parameters); /// Handles writes to the macro uploading register. void ProcessMacroUpload(u32 data); |