moonpower/azahar-UWP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video_core: Fix crash when no debug context is provided. (#7324)

Browse Source
This commit is contained in:
Steveice10
2024-01-07 10:29:43 -08:00
committed by GitHub
parent 7bacb78ce3
commit 6069fac76d
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/video_core/pica/pica_core.cpp
View File

@@ -30,9 +30,10 @@ union CommandHeader {
};
static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!");
PicaCore::PicaCore(Memory::MemorySystem& memory_, DebugContext& debug_context_)
: memory{memory_}, debug_context{debug_context_}, geometry_pipeline{regs.internal, gs_unit,
gs_setup},
PicaCore::PicaCore(Memory::MemorySystem& memory_, std::shared_ptr<DebugContext> debug_context_)
: memory{memory_}, debug_context{std::move(debug_context_)}, geometry_pipeline{regs.internal,
gs_unit,
gs_setup},
shader_engine{CreateEngine(Settings::values.use_shader_jit.GetValue())} {
SetFramebufferDefaults();
@@ -138,8 +139,10 @@ void PicaCore::WriteInternalReg(u32 id, u32 value, u32 mask) {
DebugUtils::OnPicaRegWrite(id, mask, regs.internal.reg_array[id]);
// Track events.
debug_context.OnEvent(DebugContext::Event::PicaCommandLoaded, &id);
SCOPE_EXIT({ debug_context.OnEvent(DebugContext::Event::PicaCommandProcessed, &id); });
if (debug_context) {
debug_context->OnEvent(DebugContext::Event::PicaCommandLoaded, &id);
SCOPE_EXIT({ debug_context->OnEvent(DebugContext::Event::PicaCommandProcessed, &id); });
}
switch (id) {
// Trigger IRQ
@@ -427,9 +430,12 @@ void PicaCore::DrawImmediate() {
shader_engine->SetupBatch(vs_setup, regs.internal.vs.main_offset);
// Track vertex in the debug recorder.
debug_context.OnEvent(DebugContext::Event::VertexShaderInvocation,
std::addressof(immediate.input_vertex));
SCOPE_EXIT({ debug_context.OnEvent(DebugContext::Event::FinishedPrimitiveBatch, nullptr); });
if (debug_context) {
debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation,
std::addressof(immediate.input_vertex));
SCOPE_EXIT(
{ debug_context->OnEvent(DebugContext::Event::FinishedPrimitiveBatch, nullptr); });
}
ShaderUnit shader_unit;
AttributeBuffer output{};
@@ -459,8 +465,11 @@ void PicaCore::DrawArrays(bool is_indexed) {
MICROPROFILE_SCOPE(GPU_Drawing);
// Track vertex in the debug recorder.
debug_context.OnEvent(DebugContext::Event::IncomingPrimitiveBatch, nullptr);
SCOPE_EXIT({ debug_context.OnEvent(DebugContext::Event::FinishedPrimitiveBatch, nullptr); });
if (debug_context) {
debug_context->OnEvent(DebugContext::Event::IncomingPrimitiveBatch, nullptr);
SCOPE_EXIT(
{ debug_context->OnEvent(DebugContext::Event::FinishedPrimitiveBatch, nullptr); });
}
const bool accelerate_draw = [this] {
// Geometry shaders cannot be accelerated due to register preservation.
@@ -554,8 +563,10 @@ void PicaCore::LoadVertices(bool is_indexed) {
loader.LoadVertex(base_address, index, vertex, input, input_default_attributes);
// Record vertex processing to the debugger.
debug_context.OnEvent(DebugContext::Event::VertexShaderInvocation,
std::addressof(input));
if (debug_context) {
debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation,
std::addressof(input));
}
// Invoke the vertex shader for this vertex.
shader_unit.LoadInput(regs.internal.vs, input);

4
src/video_core/pica/pica_core.h
View File

@@ -29,7 +29,7 @@ class ShaderEngine;
class PicaCore {
public:
explicit PicaCore(Memory::MemorySystem& memory, DebugContext& debug_context_);
explicit PicaCore(Memory::MemorySystem& memory, std::shared_ptr<DebugContext> debug_context_);
~PicaCore();
void BindRasterizer(VideoCore::RasterizerInterface* rasterizer);
@@ -274,7 +274,7 @@ private:
private:
Memory::MemorySystem& memory;
VideoCore::RasterizerInterface* rasterizer;
DebugContext& debug_context;
std::shared_ptr<DebugContext> debug_context;
Service::GSP::InterruptHandler signal_interrupt;
GeometryPipeline geometry_pipeline;
PrimitiveAssembler primitive_assembler;