From 77c9dff0541a7ba3f0426ce665d9754ce0a597e9 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 14 Jul 2021 01:31:15 +0300 Subject: [PATCH] vk: Minor whitespace fix - Non-functional formatting and warning fixes --- rpcs3/Emu/RSX/Common/surface_store.h | 2 +- rpcs3/Emu/RSX/VK/VKTextOut.h | 6 ++++-- rpcs3/Emu/RSX/VK/VKTextureCache.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index ffc4ad21e2..f521c0905c 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -1092,7 +1092,7 @@ namespace rsx return true; } - virtual bool handle_memory_pressure(command_list_type cmd, problem_severity severity) + virtual bool handle_memory_pressure(command_list_type cmd, problem_severity /*severity*/) { auto process_list_function = [&](std::unordered_map& data) { diff --git a/rpcs3/Emu/RSX/VK/VKTextOut.h b/rpcs3/Emu/RSX/VK/VKTextOut.h index a169ecf275..09aef0e1f4 100644 --- a/rpcs3/Emu/RSX/VK/VKTextOut.h +++ b/rpcs3/Emu/RSX/VK/VKTextOut.h @@ -264,8 +264,10 @@ namespace vk //At worst case, 1 char = 16*16*8 bytes (average about 24*8), so ~256K for 128 chars. Allocating 512k for verts //uniform params are 8k in size, allocating for 120 lines (max lines at 4k, one column per row. Can be expanded - m_vertex_buffer = std::make_unique(dev, 524288, dev.get_memory_mapping().host_visible_coherent, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED); - m_uniforms_buffer = std::make_unique(dev, 983040, dev.get_memory_mapping().host_visible_coherent, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED); + m_vertex_buffer = std::make_unique(dev, 524288, dev.get_memory_mapping().host_visible_coherent, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED); + m_uniforms_buffer = std::make_unique(dev, 983040, dev.get_memory_mapping().host_visible_coherent, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, 0, VMM_ALLOCATION_POOL_UNDEFINED); m_render_pass = render_pass; m_uniform_buffer_size = 983040; diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp index 7a577b6636..8bd63ad046 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp @@ -340,11 +340,11 @@ namespace vk dst_y = src_h; } - vk::copy_scaled_image(cmd, tmp, _dst, - areai{ 0, 0, src_w, static_cast(src_h) }, - coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } }, - 1, tmp->info.format == _dst->info.format, - VK_FILTER_NEAREST); + vk::copy_scaled_image(cmd, tmp, _dst, + areai{ 0, 0, src_w, static_cast(src_h) }, + coordi{ { dst_x, dst_y }, { section.dst_w, section.dst_h } }, + 1, tmp->info.format == _dst->info.format, + VK_FILTER_NEAREST); } else {