summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2022-06-16 02:12:21 +0200
committerGravatar Fernando Sahmkow2022-10-06 21:00:53 +0200
commitfe24c65153349d3a759a2eef02ec703851a96847 (patch)
tree68148597dbb554d427ce43a660c88c28fc9545bb
parentCommon: Fix variable shadowing. (diff)
downloadyuzu-fe24c65153349d3a759a2eef02ec703851a96847.tar.gz
yuzu-fe24c65153349d3a759a2eef02ec703851a96847.tar.xz
yuzu-fe24c65153349d3a759a2eef02ec703851a96847.zip
General: Fix clang format.
-rw-r--r--src/common/address_space.inc4
-rw-r--r--src/video_core/control/channel_state_cache.h1
-rw-r--r--src/video_core/host1x/codecs/vp9.cpp5
-rw-r--r--src/video_core/host1x/syncpoint_manager.h4
-rw-r--r--src/video_core/host1x/vic.cpp4
-rw-r--r--src/video_core/memory_manager.cpp1
-rw-r--r--src/video_core/renderer_vulkan/renderer_vulkan.cpp13
7 files changed, 14 insertions, 18 deletions
diff --git a/src/common/address_space.inc b/src/common/address_space.inc
index e1241d099..7cfbb150b 100644
--- a/src/common/address_space.inc
+++ b/src/common/address_space.inc
@@ -261,8 +261,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) {
261 unmapCallback(virt, size); 261 unmapCallback(virt, size);
262} 262}
263 263
264ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart_, VaType vaLimit) 264ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart_, VaType vaLimit_)
265 : Base(vaLimit), currentLinearAllocEnd(vaStart_), vaStart(vaStart_) {} 265 : Base(vaLimit_), currentLinearAllocEnd(vaStart_), vaStart(vaStart_) {}
266 266
267ALLOC_MEMBER(VaType)::Allocate(VaType size) { 267ALLOC_MEMBER(VaType)::Allocate(VaType size) {
268 std::scoped_lock lock(this->blockMutex); 268 std::scoped_lock lock(this->blockMutex);
diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h
index dbf833de7..102947adb 100644
--- a/src/video_core/control/channel_state_cache.h
+++ b/src/video_core/control/channel_state_cache.h
@@ -9,6 +9,7 @@
9#include <mutex> 9#include <mutex>
10#include <optional> 10#include <optional>
11#include <unordered_map> 11#include <unordered_map>
12#include <vector>
12 13
13#include "common/common_types.h" 14#include "common/common_types.h"
14 15
diff --git a/src/video_core/host1x/codecs/vp9.cpp b/src/video_core/host1x/codecs/vp9.cpp
index 667aadc6a..cf40c9012 100644
--- a/src/video_core/host1x/codecs/vp9.cpp
+++ b/src/video_core/host1x/codecs/vp9.cpp
@@ -382,8 +382,9 @@ Vp9FrameContainer VP9::GetCurrentFrame(const Host1x::NvdecCommon::NvdecRegisters
382 // gpu.SyncGuestHost(); epic, why? 382 // gpu.SyncGuestHost(); epic, why?
383 current_frame.info = GetVp9PictureInfo(state); 383 current_frame.info = GetVp9PictureInfo(state);
384 current_frame.bit_stream.resize(current_frame.info.bitstream_size); 384 current_frame.bit_stream.resize(current_frame.info.bitstream_size);
385 host1x.MemoryManager().ReadBlock(state.frame_bitstream_offset, current_frame.bit_stream.data(), 385 host1x.MemoryManager().ReadBlock(state.frame_bitstream_offset,
386 current_frame.info.bitstream_size); 386 current_frame.bit_stream.data(),
387 current_frame.info.bitstream_size);
387 } 388 }
388 if (!next_frame.bit_stream.empty()) { 389 if (!next_frame.bit_stream.empty()) {
389 Vp9FrameContainer temp{ 390 Vp9FrameContainer temp{
diff --git a/src/video_core/host1x/syncpoint_manager.h b/src/video_core/host1x/syncpoint_manager.h
index 0ecc040ab..440b1508a 100644
--- a/src/video_core/host1x/syncpoint_manager.h
+++ b/src/video_core/host1x/syncpoint_manager.h
@@ -49,9 +49,9 @@ public:
49 expected_value, func); 49 expected_value, func);
50 } 50 }
51 51
52 void DeregisterGuestAction(u32 syncpoint_id,ActionHandle& handle); 52 void DeregisterGuestAction(u32 syncpoint_id, ActionHandle& handle);
53 53
54 void DeregisterHostAction(u32 syncpoint_id,ActionHandle& handle); 54 void DeregisterHostAction(u32 syncpoint_id, ActionHandle& handle);
55 55
56 void IncrementGuest(u32 syncpoint_id); 56 void IncrementGuest(u32 syncpoint_id);
57 57
diff --git a/src/video_core/host1x/vic.cpp b/src/video_core/host1x/vic.cpp
index b9ac41529..ac0b7d20e 100644
--- a/src/video_core/host1x/vic.cpp
+++ b/src/video_core/host1x/vic.cpp
@@ -157,8 +157,8 @@ void Vic::WriteRGBFrame(const AVFrame* frame, const VicConfig& config) {
157 const auto size = Texture::CalculateSize(true, 4, width, height, 1, block_height, 0); 157 const auto size = Texture::CalculateSize(true, 4, width, height, 1, block_height, 0);
158 luma_buffer.resize(size); 158 luma_buffer.resize(size);
159 std::span<const u8> frame_buff(converted_frame_buf_addr, 4 * width * height); 159 std::span<const u8> frame_buff(converted_frame_buf_addr, 4 * width * height);
160 Texture::SwizzleSubrect(luma_buffer, frame_buff, 4, width, height, 1, 160 Texture::SwizzleSubrect(luma_buffer, frame_buff, 4, width, height, 1, 0, 0, width, height,
161 0, 0, width, height, block_height, 0, width * 4); 161 block_height, 0, width * 4);
162 162
163 host1x.MemoryManager().WriteBlock(output_surface_luma_address, luma_buffer.data(), size); 163 host1x.MemoryManager().WriteBlock(output_surface_luma_address, luma_buffer.data(), size);
164 } else { 164 } else {
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp
index 3cb2d9224..cca401c74 100644
--- a/src/video_core/memory_manager.cpp
+++ b/src/video_core/memory_manager.cpp
@@ -619,7 +619,6 @@ bool MemoryManager::IsContinousRange(GPUVAddr gpu_addr, std::size_t size) const
619} 619}
620 620
621bool MemoryManager::IsFullyMappedRange(GPUVAddr gpu_addr, std::size_t size) const { 621bool MemoryManager::IsFullyMappedRange(GPUVAddr gpu_addr, std::size_t size) const {
622 std::optional<VAddr> old_page_addr{};
623 bool result{true}; 622 bool result{true};
624 auto fail = [&]([[maybe_unused]] std::size_t page_index, [[maybe_unused]] std::size_t offset, 623 auto fail = [&]([[maybe_unused]] std::size_t page_index, [[maybe_unused]] std::size_t offset,
625 [[maybe_unused]] std::size_t copy_amount) { 624 [[maybe_unused]] std::size_t copy_amount) {
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
index 51d9e8f68..d8131232a 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
@@ -95,19 +95,14 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_,
95 Core::Frontend::EmuWindow& emu_window, 95 Core::Frontend::EmuWindow& emu_window,
96 Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_, 96 Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_,
97 std::unique_ptr<Core::Frontend::GraphicsContext> context_) try 97 std::unique_ptr<Core::Frontend::GraphicsContext> context_) try
98 : RendererBase(emu_window, std::move(context_)), 98 : RendererBase(emu_window, std::move(context_)), telemetry_session(telemetry_session_),
99 telemetry_session(telemetry_session_), 99 cpu_memory(cpu_memory_), gpu(gpu_), library(OpenLibrary()),
100 cpu_memory(cpu_memory_),
101 gpu(gpu_),
102 library(OpenLibrary()),
103 instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, 100 instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type,
104 true, Settings::values.renderer_debug.GetValue())), 101 true, Settings::values.renderer_debug.GetValue())),
105 debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), 102 debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr),
106 surface(CreateSurface(instance, render_window)), 103 surface(CreateSurface(instance, render_window)),
107 device(CreateDevice(instance, dld, *surface)), 104 device(CreateDevice(instance, dld, *surface)), memory_allocator(device, false),
108 memory_allocator(device, false), 105 state_tracker(), scheduler(device, state_tracker),
109 state_tracker(),
110 scheduler(device, state_tracker),
111 swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, 106 swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width,
112 render_window.GetFramebufferLayout().height, false), 107 render_window.GetFramebufferLayout().height, false),
113 blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, 108 blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler,