diff options
author | Subv <subv2112@gmail.com> | 2018-04-24 03:03:50 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-04-25 18:55:28 +0200 |
commit | c16cfbbc6c062491d84a6bc9976027b7a7587fdb (patch) | |
tree | 469124577a54f93b859ac9f08357bc5479c30b1a | |
parent | GPU: Move the Maxwell3D macro uploading code to the inside of the Maxwell3D processor. (diff) | |
download | yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.tar yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.tar.gz yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.tar.bz2 yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.tar.lz yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.tar.xz yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.tar.zst yuzu-c16cfbbc6c062491d84a6bc9976027b7a7587fdb.zip |
-rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 6 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index bc40f8d98..4306b894f 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -33,9 +33,6 @@ void Maxwell3D::CallMacroMethod(u32 method, std::vector<u32> parameters) { } void Maxwell3D::WriteReg(u32 method, u32 value, u32 remaining_params) { - ASSERT_MSG(method < Regs::NUM_REGS, - "Invalid Maxwell3D register, increase the size of the Regs structure"); - auto debug_context = Core::System::GetInstance().GetGPUDebugContext(); // It is an error to write to a register other than the current macro's ARG register before it @@ -64,6 +61,9 @@ void Maxwell3D::WriteReg(u32 method, u32 value, u32 remaining_params) { return; } + ASSERT_MSG(method < Regs::NUM_REGS, + "Invalid Maxwell3D register, increase the size of the Regs structure"); + if (debug_context) { debug_context->OnEvent(Tegra::DebugContext::Event::MaxwellCommandLoaded, nullptr); } diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 8edc3cd38..5cf62fb01 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -31,7 +31,7 @@ public: /// Register structure of the Maxwell3D engine. /// TODO(Subv): This structure will need to be made bigger as more registers are discovered. struct Regs { - static constexpr size_t NUM_REGS = 0xE36; + static constexpr size_t NUM_REGS = 0xE00; static constexpr size_t NumRenderTargets = 8; static constexpr size_t NumViewports = 16; @@ -613,7 +613,7 @@ public: u32 size[MaxShaderStage]; } tex_info_buffers; - INSERT_PADDING_WORDS(0x102); + INSERT_PADDING_WORDS(0xCC); }; std::array<u32, NUM_REGS> reg_array; }; |