diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-25 10:59:54 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 10:59:54 -0400 | 
| commit | be2f1eabd702b8a842270e555da39e5a8cdab482 (patch) | |
| tree | 66e7034c9cb7ca6d11a8ef40bb65a7c09cdd304e | |
| parent | 23b86fd3ea9e67b9135908c9228b23ebe0e60024 (diff) | |
| parent | 20800f2df720be274f49343ccfec18d750dbeee1 (diff) | |
Merge pull request #1173 from lioncash/batch
maxwell3d: Move FinishedPrimitiveBatch event after AcceleratedDrawBatch()
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 68f91cc75..f32a79d7b 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -218,10 +218,6 @@ void Maxwell3D::DrawArrays() {          debug_context->OnEvent(Tegra::DebugContext::Event::IncomingPrimitiveBatch, nullptr);      } -    if (debug_context) { -        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"); @@ -237,6 +233,10 @@ void Maxwell3D::DrawArrays() {      const bool is_indexed{regs.index_array.count && !regs.vertex_buffer.count};      rasterizer.AccelerateDrawBatch(is_indexed); +    if (debug_context) { +        debug_context->OnEvent(Tegra::DebugContext::Event::FinishedPrimitiveBatch, nullptr); +    } +      // TODO(bunnei): Below, we reset vertex count so that we can use these registers to determine if      // the game is trying to draw indexed or direct mode. This needs to be verified on HW still -      // it's possible that it is incorrect and that there is some other register used to specify the | 
