From 439c0be9a6af818358801a298a23a356ead6688c Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Wed, 17 Jul 2024 17:57:54 +0300 Subject: [PATCH] clang format fix --- src/emulator.cpp | 5 ++--- .../backend/spirv/emit_spirv_image.cpp | 15 +++++++-------- .../backend/spirv/emit_spirv_instructions.h | 7 +++---- .../renderer_vulkan/liverpool_to_vk.cpp | 3 +-- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/emulator.cpp b/src/emulator.cpp index 9eafe7a6..91d92cd6 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -165,9 +165,8 @@ void Emulator::LoadSystemModules(const std::filesystem::path& file) { found_modules.push_back(entry.path()); } for (const auto& [module_name, init_func] : ModulesToLoad) { - const auto it = std::ranges::find_if(found_modules, [&](const auto& path) { - return path.filename() == module_name; - }); + const auto it = std::ranges::find_if( + found_modules, [&](const auto& path) { return path.filename() == module_name; }); if (it != found_modules.end()) { LOG_INFO(Loader, "Loading {}", it->string()); linker->LoadModule(*it); diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index b7249100..17def57a 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -62,8 +62,7 @@ Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, spv::ImageOperandsMask::Lod, ctx.ConstF32(0.f)); } -Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, - Id offset, Id offset2) { +Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id offset, Id offset2) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); @@ -72,20 +71,20 @@ Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, ImageOperands operands; operands.Add(spv::ImageOperandsMask::Offset, offset); operands.Add(spv::ImageOperandsMask::Lod, ctx.ConstF32(0.f)); - return ctx.OpImageGather(ctx.F32[4], sampled_image, coords, ctx.ConstU32(comp), - operands.mask, operands.operands); + return ctx.OpImageGather(ctx.F32[4], sampled_image, coords, ctx.ConstU32(comp), operands.mask, + operands.operands); } -Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, - Id offset, Id offset2, Id dref) { +Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id offset, + Id offset2, Id dref) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.Add(spv::ImageOperandsMask::Offset, offset); - return ctx.OpImageDrefGather(ctx.F32[4], sampled_image, coords, dref, - operands.mask, operands.operands); + return ctx.OpImageDrefGather(ctx.F32[4], sampled_image, coords, dref, operands.mask, + operands.operands); } Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id offset, Id lod, diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h index 1432041c..e2b411e4 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h +++ b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h @@ -358,10 +358,9 @@ Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id bias_lc, const IR::Value& offset); Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id dref, Id bias_lc, Id offset); -Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, - Id offset, Id offset2); -Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, - Id offset, Id offset2, Id dref); +Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id offset, Id offset2); +Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id offset, + Id offset2, Id dref); Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id offset, Id lod, Id ms); Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, u32 handle, Id lod, bool skip_mips); diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp index bf520874..f361fcad 100644 --- a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp +++ b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp @@ -445,8 +445,7 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu num_format == AmdGpu::NumberFormat::Unorm) { return vk::Format::eR16G16B16A16Unorm; } - if (data_format == AmdGpu::DataFormat::Format8 && - num_format == AmdGpu::NumberFormat::Uint) { + if (data_format == AmdGpu::DataFormat::Format8 && num_format == AmdGpu::NumberFormat::Uint) { return vk::Format::eR8Uint; } if (data_format == AmdGpu::DataFormat::Format16_16_16_16 &&