summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-12-15 09:35:47 +0100
committerGitHub <noreply@github.com>2020-12-15 09:35:47 +0100
commit37bec068c2e3814bf23f1b8c1c6dd00d80191d27 (patch)
tree5697ab2010a0634bb2869d7fcdf01fdd72f46216
parentMerge pull request #5168 from Morph1984/aoc-PurchaseEventManager (diff)
parentmaxwell_3d: Move member variables to end of class (diff)
downloadyuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.tar
yuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.tar.gz
yuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.tar.bz2
yuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.tar.lz
yuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.tar.xz
yuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.tar.zst
yuzu-37bec068c2e3814bf23f1b8c1c6dd00d80191d27.zip
-rw-r--r--src/video_core/engines/maxwell_3d.h67
1 files changed, 33 insertions, 34 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index b0d9559d0..564acbc53 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -1473,39 +1473,6 @@ private:
void ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argument, bool is_last_call);
- Core::System& system;
- MemoryManager& memory_manager;
-
- VideoCore::RasterizerInterface* rasterizer = nullptr;
-
- /// Start offsets of each macro in macro_memory
- std::array<u32, 0x80> macro_positions = {};
-
- std::array<bool, Regs::NUM_REGS> mme_inline{};
-
- /// 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.
- std::unique_ptr<MacroEngine> macro_engine;
-
- static constexpr u32 null_cb_data = 0xFFFFFFFF;
- struct {
- std::array<std::array<u32, 0x4000>, 16> buffer;
- u32 current{null_cb_data};
- u32 id{null_cb_data};
- u32 start_pos{};
- u32 counter{};
- } cb_data_state;
-
- Upload::State upload_state;
-
- bool execute_on{true};
-
- std::array<u8, Regs::NUM_REGS> dirty_pointers{};
-
/// Retrieves information about a specific TIC entry from the TIC buffer.
Texture::TICEntry GetTICEntry(u32 tic_index) const;
@@ -1514,8 +1481,8 @@ private:
/**
* Call a macro on this engine.
+ *
* @param method Method to call
- * @param num_parameters Number of arguments
* @param parameters Arguments to the method call
*/
void CallMacroMethod(u32 method, const std::vector<u32>& parameters);
@@ -1564,6 +1531,38 @@ private:
/// Returns a query's value or an empty object if the value will be deferred through a cache.
std::optional<u64> GetQueryResult();
+
+ Core::System& system;
+ MemoryManager& memory_manager;
+
+ VideoCore::RasterizerInterface* rasterizer = nullptr;
+
+ /// Start offsets of each macro in macro_memory
+ std::array<u32, 0x80> macro_positions{};
+
+ std::array<bool, Regs::NUM_REGS> mme_inline{};
+
+ /// 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.
+ std::unique_ptr<MacroEngine> macro_engine;
+
+ static constexpr u32 null_cb_data = 0xFFFFFFFF;
+ struct CBDataState {
+ std::array<std::array<u32, 0x4000>, 16> buffer;
+ u32 current{null_cb_data};
+ u32 id{null_cb_data};
+ u32 start_pos{};
+ u32 counter{};
+ };
+ CBDataState cb_data_state;
+
+ Upload::State upload_state;
+
+ bool execute_on{true};
};
#define ASSERT_REG_POSITION(field_name, position) \