Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Honeybunch committed Nov 10, 2024
1 parent afd9c00 commit fba6a96
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 34 deletions.
6 changes: 3 additions & 3 deletions qrenderdoc/Windows/BufferViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3128,7 +3128,6 @@ void BufferViewer::stageRowMenu(MeshDataStage stage, QMenu *menu, const QPoint &
}
menu->addAction(m_DebugMeshletVert);


menu->addSeparator();

m_GotoTask->setEnabled(m_Ctx.CurPipelineState().GetShaderReflection(ShaderStage::Task));
Expand Down Expand Up @@ -6690,8 +6689,9 @@ void BufferViewer::debugMeshletVertex()
if(!idx.isValid())
{
GUIInvoke::call(this, [this]() {
RDDialog::critical(this, tr("Error debugging"),
tr("Error debugging meshlet vertex - make sure a valid vertex is selected"));
RDDialog::critical(
this, tr("Error debugging"),
tr("Error debugging meshlet vertex - make sure a valid vertex is selected"));
});
return;
}
Expand Down
2 changes: 1 addition & 1 deletion renderdoc/api/replay/renderdoc_replay.h
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ bucket when the pixel values are divided between ``minval`` and ``maxval``.
:rtype: ShaderDebugTrace
)");
virtual ShaderDebugTrace *DebugMeshletVertex(const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid) = 0;
const rdcfixedarray<uint32_t, 3> &threadid) = 0;

DOCUMENT(R"(Continue a shader's debugging with a given shader debugger instance. This will run an
implementation defined number of steps and then return those steps in a list. This may be a fixed
Expand Down
2 changes: 1 addition & 1 deletion renderdoc/core/image_viewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class ImageViewer : public IReplayDriver
return new ShaderDebugTrace();
}
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
const rdcfixedarray<uint32_t, 3> &threadid)
{
return new ShaderDebugTrace();
}
Expand Down
10 changes: 5 additions & 5 deletions renderdoc/core/replay_proxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1686,9 +1686,9 @@ ShaderDebugTrace *ReplayProxy::DebugThread(uint32_t eventId,

template <typename ParamSerialiser, typename ReturnSerialiser>
ShaderDebugTrace *ReplayProxy::Proxied_DebugMeshletVertex(ParamSerialiser &paramser,
ReturnSerialiser &retser, uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
ReturnSerialiser &retser, uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
{
const ReplayProxyPacket expectedPacket = eReplayProxy_DebugMeshletVertex;
ReplayProxyPacket packet = eReplayProxy_DebugMeshletVertex;
Expand Down Expand Up @@ -1716,8 +1716,8 @@ ShaderDebugTrace *ReplayProxy::Proxied_DebugMeshletVertex(ParamSerialiser &param
}

ShaderDebugTrace *ReplayProxy::DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
{
PROXY_FUNCTION(DebugMeshletVertex, eventId, groupid, threadid);
}
Expand Down
3 changes: 1 addition & 2 deletions renderdoc/driver/d3d11/d3d11_replay.h
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,7 @@ class D3D11Replay : public IReplayDriver
const DebugPixelInputs &inputs);
ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
void FreeDebugger(ShaderDebugger *debugger);
Expand Down
4 changes: 2 additions & 2 deletions renderdoc/driver/d3d11/d3d11_shaderdebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2688,8 +2688,8 @@ ShaderDebugTrace *D3D11Replay::DebugThread(uint32_t eventId,
}

ShaderDebugTrace *D3D11Replay::DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
{
// Not supported
return new ShaderDebugTrace;
Expand Down
3 changes: 1 addition & 2 deletions renderdoc/driver/d3d12/d3d12_replay.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,7 @@ class D3D12Replay : public IReplayDriver
const DebugPixelInputs &inputs);
ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
void FreeDebugger(ShaderDebugger *debugger);
Expand Down
4 changes: 2 additions & 2 deletions renderdoc/driver/d3d12/d3d12_shaderdebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3376,8 +3376,8 @@ ShaderDebugTrace *D3D12Replay::DebugThread(uint32_t eventId,
}

ShaderDebugTrace *D3D12Replay::DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
{
// Not implemented yet
return new ShaderDebugTrace;
Expand Down
4 changes: 2 additions & 2 deletions renderdoc/driver/gl/gl_replay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4301,8 +4301,8 @@ ShaderDebugTrace *GLReplay::DebugThread(uint32_t eventId, const rdcfixedarray<ui
}

ShaderDebugTrace *GLReplay::DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
{
GLNOTIMP("DebugMeshletVertex");
return new ShaderDebugTrace();
Expand Down
3 changes: 1 addition & 2 deletions renderdoc/driver/gl/gl_replay.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ class GLReplay : public IReplayDriver
const DebugPixelInputs &inputs);
ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
void FreeDebugger(ShaderDebugger *debugger);
Expand Down
2 changes: 1 addition & 1 deletion renderdoc/driver/vulkan/vk_replay.h
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ class VulkanReplay : public IReplayDriver
ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
const rdcfixedarray<uint32_t, 3> &threadid);
rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
void FreeDebugger(ShaderDebugger *debugger);

Expand Down
9 changes: 4 additions & 5 deletions renderdoc/driver/vulkan/vk_shaderdebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ class VulkanAPIWrapper : public rdcspv::DebugAPIWrapper
}

virtual bool ReadTexelBuffer(ShaderBindIndex bind, const ShaderVariable &coord,
ShaderVariable &output) override
ShaderVariable &output) override
{
const TexelBufData &data = PopulateTexelBuffer(bind);

Expand All @@ -505,9 +505,8 @@ class VulkanAPIWrapper : public rdcspv::DebugAPIWrapper
{
m_pDriver->AddDebugMessage(
MessageCategory::Execution, MessageSeverity::High, MessageSource::RuntimeWarning,
StringFormat::Fmt(
"Out of bounds access to buffer, index %u outside size of %u",
index, data.bytes.size() / data.texelSize));
StringFormat::Fmt("Out of bounds access to buffer, index %u outside size of %u", index,
data.bytes.size() / data.texelSize));
return false;
}

Expand Down Expand Up @@ -1860,7 +1859,7 @@ class VulkanAPIWrapper : public rdcspv::DebugAPIWrapper
return data;
}

TexelBufData &PopulateTexelBuffer(ShaderBindIndex bind)
TexelBufData &PopulateTexelBuffer(ShaderBindIndex bind)
{
auto insertIt = texelBufCache.insert(std::make_pair(bind, TexelBufData()));
TexelBufData &data = insertIt.first->second;
Expand Down
4 changes: 2 additions & 2 deletions renderdoc/replay/dummy_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ ShaderDebugTrace *DummyDriver::DebugVertex(uint32_t eventId, uint32_t vertid, ui
}

ShaderDebugTrace *DummyDriver::DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid)
{
return new ShaderDebugTrace;
}
Expand Down
3 changes: 1 addition & 2 deletions renderdoc/replay/dummy_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ class DummyDriver : public IReplayDriver
const DebugPixelInputs &inputs);
ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);
rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
void FreeDebugger(ShaderDebugger *debugger);
Expand Down
4 changes: 2 additions & 2 deletions renderdoc/replay/replay_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ class IRemoteDriver
virtual ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid) = 0;
virtual ShaderDebugTrace *DebugMeshletVertex(uint32_t eventId,
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid) = 0;
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid) = 0;
virtual rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger) = 0;
virtual void FreeDebugger(ShaderDebugger *debugger) = 0;

Expand Down

0 comments on commit fba6a96

Please sign in to comment.