diff options
| author | 2016-05-04 10:21:51 +0200 | |
|---|---|---|
| committer | 2016-05-04 10:21:51 +0200 | |
| commit | 7a77b8356ca0aebbd29b88402c9470dd22fedeab (patch) | |
| tree | 41c66a1e6f3d0ccd386a40f87a974ab7ce0f688d /src/video_core | |
| parent | Merge pull request #1754 from JayFoxRox/fix-const_color-revert (diff) | |
| download | yuzu-7a77b8356ca0aebbd29b88402c9470dd22fedeab.tar.gz yuzu-7a77b8356ca0aebbd29b88402c9470dd22fedeab.tar.xz yuzu-7a77b8356ca0aebbd29b88402c9470dd22fedeab.zip | |
Pica: Rename VertexLoaded breakpoint to VertexShaderInvocation
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/command_processor.cpp | 10 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index be1a936b2..dd1379503 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -146,10 +146,9 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 146 | Shader::UnitState<false> shader_unit; | 146 | Shader::UnitState<false> shader_unit; |
| 147 | Shader::Setup(); | 147 | Shader::Setup(); |
| 148 | 148 | ||
| 149 | if (g_debug_context) | ||
| 150 | g_debug_context->OnEvent(DebugContext::Event::VertexLoaded, static_cast<void*>(&immediate_input)); | ||
| 151 | |||
| 152 | // Send to vertex shader | 149 | // Send to vertex shader |
| 150 | if (g_debug_context) | ||
| 151 | g_debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation, static_cast<void*>(&immediate_input)); | ||
| 153 | Shader::OutputVertex output = Shader::Run(shader_unit, immediate_input, regs.vs.num_input_attributes+1); | 152 | Shader::OutputVertex output = Shader::Run(shader_unit, immediate_input, regs.vs.num_input_attributes+1); |
| 154 | 153 | ||
| 155 | // Send to renderer | 154 | // Send to renderer |
| @@ -272,10 +271,9 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 272 | Shader::InputVertex input; | 271 | Shader::InputVertex input; |
| 273 | loader.LoadVertex(base_address, index, vertex, input, memory_accesses); | 272 | loader.LoadVertex(base_address, index, vertex, input, memory_accesses); |
| 274 | 273 | ||
| 275 | if (g_debug_context) | ||
| 276 | g_debug_context->OnEvent(DebugContext::Event::VertexLoaded, (void*)&input); | ||
| 277 | |||
| 278 | // Send to vertex shader | 274 | // Send to vertex shader |
| 275 | if (g_debug_context) | ||
| 276 | g_debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation, (void*)&input); | ||
| 279 | output = Shader::Run(shader_unit, input, loader.GetNumTotalAttributes()); | 277 | output = Shader::Run(shader_unit, input, loader.GetNumTotalAttributes()); |
| 280 | 278 | ||
| 281 | if (is_indexed) { | 279 | if (is_indexed) { |
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index be2d0301a..f628292a4 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h | |||
| @@ -40,7 +40,7 @@ public: | |||
| 40 | PicaCommandProcessed, | 40 | PicaCommandProcessed, |
| 41 | IncomingPrimitiveBatch, | 41 | IncomingPrimitiveBatch, |
| 42 | FinishedPrimitiveBatch, | 42 | FinishedPrimitiveBatch, |
| 43 | VertexLoaded, | 43 | VertexShaderInvocation, |
| 44 | IncomingDisplayTransfer, | 44 | IncomingDisplayTransfer, |
| 45 | GSPCommandProcessed, | 45 | GSPCommandProcessed, |
| 46 | BufferSwapped, | 46 | BufferSwapped, |