diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2020-05-29 06:53:27 +0200 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2020-05-30 03:40:04 +0200 |
commit | b032ebdfee1928c4458eaf15faa0cff299371e65 (patch) | |
tree | 2528faa725bf604cf3e44dc38c8f20d6f69aee70 /src/video_core/engines/maxwell_3d.h | |
parent | Merge pull request #4017 from ogniK5377/xbyak (diff) | |
download | yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.tar yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.tar.gz yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.tar.bz2 yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.tar.lz yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.tar.xz yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.tar.zst yuzu-b032ebdfee1928c4458eaf15faa0cff299371e65.zip |
Diffstat (limited to 'src/video_core/engines/maxwell_3d.h')
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 05dd6b39b..077bc9841 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,14 @@ 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; + // MacroInterpreter macro_interpreter; static constexpr u32 null_cb_data = 0xFFFFFFFF; struct { @@ -1506,7 +1495,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, std::vector<u32>&& parameters); /// Handles writes to the macro uploading register. void ProcessMacroUpload(u32 data); |