diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-17 06:07:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 06:07:06 +0200 |
commit | 727136a9c941e11f98ada3a972e860d2d945d96f (patch) | |
tree | 6ee9b1dfda590eaa0cc8bf906c262a07ff82de9f /src/video_core/engines | |
parent | Merge pull request #1087 from MerryMage/dynarmic (diff) | |
parent | Rasterizer: Implemented instanced rendering. (diff) | |
download | yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.gz yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.bz2 yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.lz yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.xz yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.tar.zst yuzu-727136a9c941e11f98ada3a972e860d2d945d96f.zip |
Diffstat (limited to 'src/video_core/engines')
-rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 12 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index a46ed4bd7..68f91cc75 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -222,6 +222,18 @@ void Maxwell3D::DrawArrays() { debug_context->OnEvent(Tegra::DebugContext::Event::FinishedPrimitiveBatch, nullptr); } + // Both instance configuration registers can not be set at the same time. + ASSERT_MSG(!regs.draw.instance_next || !regs.draw.instance_cont, + "Illegal combination of instancing parameters"); + + if (regs.draw.instance_next) { + // Increment the current instance *before* drawing. + state.current_instance += 1; + } else if (!regs.draw.instance_cont) { + // Reset the current instance to 0. + state.current_instance = 0; + } + const bool is_indexed{regs.index_array.count && !regs.vertex_buffer.count}; rasterizer.AccelerateDrawBatch(is_indexed); diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 1b30ce018..771eb5abc 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -638,6 +638,8 @@ public: union { u32 vertex_begin_gl; BitField<0, 16, PrimitiveTopology> topology; + BitField<26, 1, u32> instance_next; + BitField<27, 1, u32> instance_cont; }; } draw; @@ -830,6 +832,7 @@ public: }; std::array<ShaderStageInfo, Regs::MaxShaderStage> shader_stages; + u32 current_instance = 0; ///< Current instance to be used to simulate instanced rendering. }; State state{}; |