From 979e17459ff337fbf2ad5084e13e30ed2ac889a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczyk?= Date: Tue, 27 May 2025 01:23:34 +0100 Subject: [PATCH] clang-format --- src/video_core/amdgpu/liverpool.cpp | 17 +++++++-------- src/video_core/amdgpu/pm4_cmds.h | 5 +++-- .../renderer_vulkan/vk_rasterizer.cpp | 21 ++++++++++++------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/video_core/amdgpu/liverpool.cpp b/src/video_core/amdgpu/liverpool.cpp index 8c297ff83..c99dbb9a9 100644 --- a/src/video_core/amdgpu/liverpool.cpp +++ b/src/video_core/amdgpu/liverpool.cpp @@ -402,17 +402,16 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span dcb, std::spanEndPredication(); } - } - else if (predication->pred_op.Value() == PredicateOperation::Zpass) { + } else if (predication->pred_op.Value() == PredicateOperation::Zpass) { if (rasterizer) { - rasterizer->StartPredication(predication->Address(), + rasterizer->StartPredication( + predication->Address(), predication->action.Value() == Predication::DrawIfVisible, predication->hint.Value() == PredicationHint::Wait); } - } - else { + } else { LOG_WARNING(Render_Vulkan, "unhandled predicate operation {}", - magic_enum::enum_name(predication->pred_op.Value())); + magic_enum::enum_name(predication->pred_op.Value())); } break; } @@ -618,15 +617,13 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span dcb, std::spanevent_index.Value() == EventIndex::ZpassDone) { if (event->event_type.Value() == EventType::PixelPipeStatControl) { - } - else if (event->event_type.Value() == EventType::PixelPipeStatDump) { + } else if (event->event_type.Value() == EventType::PixelPipeStatDump) { if ((event->Address() & 0x8) == 0) { // occlusion query start if (rasterizer) { rasterizer->StartOcclusionQuery(event->Address()); } - } - else { + } else { // occlusion query end if (rasterizer) { rasterizer->EndOcclusionQuery(event->Address() & ~0xF); diff --git a/src/video_core/amdgpu/pm4_cmds.h b/src/video_core/amdgpu/pm4_cmds.h index a61f46278..898d8cb69 100644 --- a/src/video_core/amdgpu/pm4_cmds.h +++ b/src/video_core/amdgpu/pm4_cmds.h @@ -419,7 +419,7 @@ struct PM4CmdEventWrite { template T Address() const { ASSERT(event_index.Value() >= EventIndex::ZpassDone && - event_index.Value() <= EventIndex::SampleStreamoutStatSx); + event_index.Value() <= EventIndex::SampleStreamoutStatSx); return reinterpret_cast((u64(address[1]) << 32u) | u64(address[0])); } }; @@ -1145,7 +1145,8 @@ struct PM4CmdSetPredication { template T Address() const { - return reinterpret_cast(u64(start_address_lo.Value()) << 4 | u64(start_address_hi.Value()) << 32); + return reinterpret_cast(u64(start_address_lo.Value()) << 4 | + u64(start_address_hi.Value()) << 32); } }; diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 12d187403..e6ca0d546 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -18,7 +18,7 @@ #endif namespace { - const int OCCLUSION_QUERIES_COUNT = 16; +const int OCCLUSION_QUERIES_COUNT = 16; } namespace Vulkan { @@ -43,8 +43,13 @@ Rasterizer::Rasterizer(const Instance& instance_, Scheduler& scheduler_, buffer_cache{instance, scheduler, *this, liverpool_, texture_cache, page_manager}, texture_cache{instance, scheduler, buffer_cache, page_manager}, liverpool{liverpool_}, memory{Core::Memory::Instance()}, pipeline_cache{instance, scheduler, liverpool}, - occlusion_query_buffer{instance, scheduler, VideoCore::MemoryUsage::DeviceLocal, 0, - vk::BufferUsageFlagBits::eConditionalRenderingEXT | vk::BufferUsageFlagBits::eTransferDst, sizeof(u32)*OCCLUSION_QUERIES_COUNT} { + occlusion_query_buffer{instance, + scheduler, + VideoCore::MemoryUsage::DeviceLocal, + 0, + vk::BufferUsageFlagBits::eConditionalRenderingEXT | + vk::BufferUsageFlagBits::eTransferDst, + sizeof(u32) * OCCLUSION_QUERIES_COUNT} { if (!Config::nullGpu()) { liverpool->BindRasterizer(this); } @@ -54,7 +59,8 @@ Rasterizer::Rasterizer(const Instance& instance_, Scheduler& scheduler_, .queryCount = OCCLUSION_QUERIES_COUNT, })); instance.GetDevice().resetQueryPool(occlusion_query_pool, 0, OCCLUSION_QUERIES_COUNT); - Vulkan::SetObjectName(instance.GetDevice(), occlusion_query_buffer.Handle(), "OcclusionQueryBuffer:{:#x}", sizeof(u32)*OCCLUSION_QUERIES_COUNT); + Vulkan::SetObjectName(instance.GetDevice(), occlusion_query_buffer.Handle(), + "OcclusionQueryBuffer:{:#x}", sizeof(u32) * OCCLUSION_QUERIES_COUNT); } Rasterizer::~Rasterizer() = default; @@ -1290,8 +1296,9 @@ void Rasterizer::StartPredication(VAddr addr, bool draw_if_visible, bool wait_fo const auto cmdbuf = scheduler.CommandBuffer(); cmdbuf.copyQueryPoolResults(occlusion_query_pool, index, 1, occlusion_query_buffer.Handle(), - index*sizeof(u32), sizeof(u32), wait_for_result ? vk::QueryResultFlagBits::eWait - : vk::QueryResultFlagBits::ePartial); + index * sizeof(u32), sizeof(u32), + wait_for_result ? vk::QueryResultFlagBits::eWait + : vk::QueryResultFlagBits::ePartial); const auto pre_barrier = vk::BufferMemoryBarrier2{ .srcStageMask = vk::PipelineStageFlagBits2::eCopy, @@ -1309,7 +1316,7 @@ void Rasterizer::StartPredication(VAddr addr, bool draw_if_visible, bool wait_fo }); ScopeMarkerBegin("gfx:{}:predication", fmt::ptr(reinterpret_cast(addr))); - vk::ConditionalRenderingBeginInfoEXT conditional_rendering_info { + vk::ConditionalRenderingBeginInfoEXT conditional_rendering_info{ .buffer = occlusion_query_buffer.Handle(), .offset = index * sizeof(u32), .flags = draw_if_visible ? vk::ConditionalRenderingFlagBitsEXT::eInverted