catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang format fixes

This commit is contained in:
georgemoralis 2024-06-26 20:32:08 +03:00
parent 550bfa1c88
commit 521ff4d14b
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/libraries/kernel/file_system.cpp
View File

@ -3,8 +3,8 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/singleton.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "common/singleton.h"
#include "core/file_sys/fs.h" #include "core/file_sys/fs.h"
#include "core/libraries/error_codes.h" #include "core/libraries/error_codes.h"
#include "core/libraries/kernel/file_system.h" #include "core/libraries/kernel/file_system.h"
@ -148,7 +148,7 @@ size_t PS4_SYSV_ABI sceKernelWrite(int d, const void* buf, size_t nbytes) {
size_t PS4_SYSV_ABI _readv(int d, const SceKernelIovec* iov, int iovcnt) { size_t PS4_SYSV_ABI _readv(int d, const SceKernelIovec* iov, int iovcnt) {
auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance(); auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
auto* file = h->GetFile(d); auto* file = h->GetFile(d);
size_t total_read = 0; size_t total_read = 0;
std::scoped_lock lk{file->m_mutex}; std::scoped_lock lk{file->m_mutex};
for (int i = 0; i < iovcnt; i++) { for (int i = 0; i < iovcnt; i++) {
total_read += file->f.ReadRaw<u8>(iov[i].iov_base, iov[i].iov_len); total_read += file->f.ReadRaw<u8>(iov[i].iov_base, iov[i].iov_len);
@ -278,7 +278,9 @@ s64 PS4_SYSV_ABI sceKernelPread(int d, void* buf, size_t nbytes, s64 offset) {
std::scoped_lock lk{file->m_mutex}; std::scoped_lock lk{file->m_mutex};
const s64 pos = file->f.Tell(); const s64 pos = file->f.Tell();
SCOPE_EXIT { file->f.Seek(pos); }; SCOPE_EXIT {
file->f.Seek(pos);
};
file->f.Seek(offset); file->f.Seek(offset);
return file->f.ReadRaw<u8>(buf, nbytes); return file->f.ReadRaw<u8>(buf, nbytes);
} }
@ -370,7 +372,9 @@ s64 PS4_SYSV_ABI sceKernelPwrite(int d, void* buf, size_t nbytes, s64 offset) {
std::scoped_lock lk{file->m_mutex}; std::scoped_lock lk{file->m_mutex};
const s64 pos = file->f.Tell(); const s64 pos = file->f.Tell();
SCOPE_EXIT { file->f.Seek(pos); }; SCOPE_EXIT {
file->f.Seek(pos);
};
file->f.Seek(offset); file->f.Seek(offset);
return file->f.WriteRaw<u8>(buf, nbytes); return file->f.WriteRaw<u8>(buf, nbytes);
} }

8
src/core/libraries/kernel/threads/semaphore.cpp
View File

@ -9,8 +9,8 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/libraries/error_codes.h" #include "core/libraries/error_codes.h"
#include "core/libraries/libs.h"
#include "core/libraries/kernel/thread_management.h" #include "core/libraries/kernel/thread_management.h"
#include "core/libraries/libs.h"
namespace Libraries::Kernel { namespace Libraries::Kernel {
@ -20,8 +20,8 @@ using ListBaseHook =
class Semaphore { class Semaphore {
public: public:
Semaphore(s32 init_count, s32 max_count, std::string_view name, bool is_fifo) Semaphore(s32 init_count, s32 max_count, std::string_view name, bool is_fifo)
: name{name}, token_count{init_count}, max_count{max_count}, : name{name}, token_count{init_count}, max_count{max_count}, init_count{init_count},
init_count{init_count}, is_fifo{is_fifo} {} is_fifo{is_fifo} {}
~Semaphore() { ~Semaphore() {
ASSERT(wait_list.empty()); ASSERT(wait_list.empty());
} }
@ -187,7 +187,7 @@ s32 PS4_SYSV_ABI sceKernelPollSema(OrbisKernelSema sem, s32 needCount) {
return sem->Wait(false, needCount, nullptr); return sem->Wait(false, needCount, nullptr);
} }
int PS4_SYSV_ABI sceKernelCancelSema(OrbisKernelSema sem, s32 setCount, s32 *pNumWaitThreads) { int PS4_SYSV_ABI sceKernelCancelSema(OrbisKernelSema sem, s32 setCount, s32* pNumWaitThreads) {
return sem->Cancel(setCount, pNumWaitThreads); return sem->Cancel(setCount, pNumWaitThreads);
} }

3
src/video_core/renderer_vulkan/liverpool_to_vk.cpp
View File

@ -354,7 +354,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
if (data_format == AmdGpu::DataFormat::FormatBc2 && num_format == AmdGpu::NumberFormat::Unorm) { if (data_format == AmdGpu::DataFormat::FormatBc2 && num_format == AmdGpu::NumberFormat::Unorm) {
return vk::Format::eBc2UnormBlock; return vk::Format::eBc2UnormBlock;
} }
if (data_format == AmdGpu::DataFormat::Format16_16 && num_format == AmdGpu::NumberFormat::Snorm) { if (data_format == AmdGpu::DataFormat::Format16_16 &&
num_format == AmdGpu::NumberFormat::Snorm) {
return vk::Format::eR16G16Snorm; return vk::Format::eR16G16Snorm;
} }
UNREACHABLE_MSG("Unknown data_format={} and num_format={}", u32(data_format), u32(num_format)); UNREACHABLE_MSG("Unknown data_format={} and num_format={}", u32(data_format), u32(num_format));