clang-format issues were found. See CONTRIBUTING.md for more information. diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index 119c0d3..040aaa9 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -2464,8 +2464,7 @@ BufferViewer::BufferViewer(ICaptureContext &ctx, bool meshview, QWidget *parent) QObject::connect(m_ExportBytes, &QAction::triggered, [this] { exportData(BufferExport(BufferExport::RawBytes)); }); QObject::connect(m_DebugVert, &QAction::triggered, this, &BufferViewer::debugVertex); - QObject::connect(m_DebugMeshThread, &QAction::triggered, this, - &BufferViewer::debugMeshThread); + QObject::connect(m_DebugMeshThread, &QAction::triggered, this, &BufferViewer::debugMeshThread); QObject::connect(m_RemoveFilter, &QAction::triggered, [this]() { SetMeshFilter(MeshFilter::None); }); QObject::connect(m_FilterMesh, &QAction::triggered, [this]() { @@ -6712,7 +6711,9 @@ void BufferViewer::debugMeshThread() if(!shaderDetails) return; - rdcfixedarray<uint32_t, 3> threadGroupSize = action->dispatchThreadsDimension[0] == 0 ? shaderDetails->dispatchThreadsDimension : action->dispatchThreadsDimension; + rdcfixedarray<uint32_t, 3> threadGroupSize = action->dispatchThreadsDimension[0] == 0 + ? shaderDetails->dispatchThreadsDimension + : action->dispatchThreadsDimension; m_MeshDebugSelector->SetThreadBounds(action->dispatchDimension, threadGroupSize); // Calculate 3d group id from 1d meshlet index and dispatch dimensions @@ -6728,8 +6729,8 @@ void BufferViewer::debugMeshThread() uint32_t yDim = action->dispatchDimension[1]; uint32_t zDim = action->dispatchDimension[2]; rdcfixedarray<uint32_t, 3> meshletGroup = { - meshletIndex % xDim, - (meshletIndex % (xDim * yDim)) / xDim, + meshletIndex % xDim, + (meshletIndex % (xDim * yDim)) / xDim, meshletIndex / (xDim * yDim), }; m_MeshDebugSelector->SetDefaultDispatch(meshletGroup, {0, 0, 0}); @@ -6738,7 +6739,7 @@ void BufferViewer::debugMeshThread() } void BufferViewer::meshDebugSelector_beginDebug(const rdcfixedarray<uint32_t, 3> &group, - const rdcfixedarray<uint32_t, 3> &thread) + const rdcfixedarray<uint32_t, 3> &thread) { const ActionDescription *action = m_Ctx.CurAction(); diff --git a/qrenderdoc/Windows/BufferViewer.h b/qrenderdoc/Windows/BufferViewer.h index dc0aef8..3189957 100644 --- a/qrenderdoc/Windows/BufferViewer.h +++ b/qrenderdoc/Windows/BufferViewer.h @@ -167,7 +167,7 @@ private slots: void debugVertex(); void debugMeshThread(); void meshDebugSelector_beginDebug(const rdcfixedarray<uint32_t, 3> &group, - const rdcfixedarray<uint32_t, 3> &thread); + const rdcfixedarray<uint32_t, 3> &thread); void fixedVars_contextMenu(const QPoint &pos); private: diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h index 88408fb..dcfe556 100644 --- a/renderdoc/api/replay/renderdoc_replay.h +++ b/renderdoc/api/replay/renderdoc_replay.h @@ -1030,7 +1030,7 @@ bucket when the pixel values are divided between ``minval`` and ``maxval``. :rtype: ShaderDebugTrace )"); virtual ShaderDebugTrace *DebugMeshThread(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 diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp index 9c0fdb0..bd6735e 100644 -