mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 04:00:41 +02:00
Pica: Rename VertexLoaded breakpoint to VertexShaderInvocation
This commit is contained in:
parent
678d15761f
commit
7a77b8356c
@ -44,7 +44,7 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const
|
|||||||
{ Pica::DebugContext::Event::PicaCommandProcessed, tr("Pica command processed") },
|
{ Pica::DebugContext::Event::PicaCommandProcessed, tr("Pica command processed") },
|
||||||
{ Pica::DebugContext::Event::IncomingPrimitiveBatch, tr("Incoming primitive batch") },
|
{ Pica::DebugContext::Event::IncomingPrimitiveBatch, tr("Incoming primitive batch") },
|
||||||
{ Pica::DebugContext::Event::FinishedPrimitiveBatch, tr("Finished primitive batch") },
|
{ Pica::DebugContext::Event::FinishedPrimitiveBatch, tr("Finished primitive batch") },
|
||||||
{ Pica::DebugContext::Event::VertexLoaded, tr("Vertex loaded") },
|
{ Pica::DebugContext::Event::VertexShaderInvocation, tr("Vertex shader invocation") },
|
||||||
{ Pica::DebugContext::Event::IncomingDisplayTransfer, tr("Incoming display transfer") },
|
{ Pica::DebugContext::Event::IncomingDisplayTransfer, tr("Incoming display transfer") },
|
||||||
{ Pica::DebugContext::Event::GSPCommandProcessed, tr("GSP command processed") },
|
{ Pica::DebugContext::Event::GSPCommandProcessed, tr("GSP command processed") },
|
||||||
{ Pica::DebugContext::Event::BufferSwapped, tr("Buffers swapped") }
|
{ Pica::DebugContext::Event::BufferSwapped, tr("Buffers swapped") }
|
||||||
|
@ -365,7 +365,7 @@ GraphicsVertexShaderWidget::GraphicsVertexShaderWidget(std::shared_ptr< Pica::De
|
|||||||
input_data[i]->setValidator(new QDoubleValidator(input_data[i]));
|
input_data[i]->setValidator(new QDoubleValidator(input_data[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
breakpoint_warning = new QLabel(tr("(data only available at VertexLoaded breakpoints)"));
|
breakpoint_warning = new QLabel(tr("(data only available at vertex shader invocation breakpoints)"));
|
||||||
|
|
||||||
// TODO: Add some button for jumping to the shader entry point
|
// TODO: Add some button for jumping to the shader entry point
|
||||||
|
|
||||||
@ -454,7 +454,7 @@ GraphicsVertexShaderWidget::GraphicsVertexShaderWidget(std::shared_ptr< Pica::De
|
|||||||
|
|
||||||
void GraphicsVertexShaderWidget::OnBreakPointHit(Pica::DebugContext::Event event, void* data) {
|
void GraphicsVertexShaderWidget::OnBreakPointHit(Pica::DebugContext::Event event, void* data) {
|
||||||
auto input = static_cast<Pica::Shader::InputVertex*>(data);
|
auto input = static_cast<Pica::Shader::InputVertex*>(data);
|
||||||
if (event == Pica::DebugContext::Event::VertexLoaded) {
|
if (event == Pica::DebugContext::Event::VertexShaderInvocation) {
|
||||||
Reload(true, data);
|
Reload(true, data);
|
||||||
} else {
|
} else {
|
||||||
// No vertex data is retrievable => invalidate currently stored vertex data
|
// No vertex data is retrievable => invalidate currently stored vertex data
|
||||||
|
@ -146,10 +146,9 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
|
|||||||
Shader::UnitState<false> shader_unit;
|
Shader::UnitState<false> shader_unit;
|
||||||
Shader::Setup();
|
Shader::Setup();
|
||||||
|
|
||||||
if (g_debug_context)
|
|
||||||
g_debug_context->OnEvent(DebugContext::Event::VertexLoaded, static_cast<void*>(&immediate_input));
|
|
||||||
|
|
||||||
// Send to vertex shader
|
// Send to vertex shader
|
||||||
|
if (g_debug_context)
|
||||||
|
g_debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation, static_cast<void*>(&immediate_input));
|
||||||
Shader::OutputVertex output = Shader::Run(shader_unit, immediate_input, regs.vs.num_input_attributes+1);
|
Shader::OutputVertex output = Shader::Run(shader_unit, immediate_input, regs.vs.num_input_attributes+1);
|
||||||
|
|
||||||
// Send to renderer
|
// Send to renderer
|
||||||
@ -272,10 +271,9 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
|
|||||||
Shader::InputVertex input;
|
Shader::InputVertex input;
|
||||||
loader.LoadVertex(base_address, index, vertex, input, memory_accesses);
|
loader.LoadVertex(base_address, index, vertex, input, memory_accesses);
|
||||||
|
|
||||||
if (g_debug_context)
|
|
||||||
g_debug_context->OnEvent(DebugContext::Event::VertexLoaded, (void*)&input);
|
|
||||||
|
|
||||||
// Send to vertex shader
|
// Send to vertex shader
|
||||||
|
if (g_debug_context)
|
||||||
|
g_debug_context->OnEvent(DebugContext::Event::VertexShaderInvocation, (void*)&input);
|
||||||
output = Shader::Run(shader_unit, input, loader.GetNumTotalAttributes());
|
output = Shader::Run(shader_unit, input, loader.GetNumTotalAttributes());
|
||||||
|
|
||||||
if (is_indexed) {
|
if (is_indexed) {
|
||||||
|
@ -40,7 +40,7 @@ public:
|
|||||||
PicaCommandProcessed,
|
PicaCommandProcessed,
|
||||||
IncomingPrimitiveBatch,
|
IncomingPrimitiveBatch,
|
||||||
FinishedPrimitiveBatch,
|
FinishedPrimitiveBatch,
|
||||||
VertexLoaded,
|
VertexShaderInvocation,
|
||||||
IncomingDisplayTransfer,
|
IncomingDisplayTransfer,
|
||||||
GSPCommandProcessed,
|
GSPCommandProcessed,
|
||||||
BufferSwapped,
|
BufferSwapped,
|
||||||
|
Loading…
Reference in New Issue
Block a user