mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-24 19:14:40 +00:00
Minor Cleanup
This commit is contained in:
parent
f66380e3b1
commit
0c9aec94c2
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -46,5 +46,4 @@
|
|||||||
url = https://github.com/shadps4-emu/ext-zlib-ng.git
|
url = https://github.com/shadps4-emu/ext-zlib-ng.git
|
||||||
[submodule "externals/sdl3"]
|
[submodule "externals/sdl3"]
|
||||||
path = externals/sdl3
|
path = externals/sdl3
|
||||||
url = https://github.com/shadps4-emu/ext-SDL.git
|
url = https://github.com/shadps4-emu/ext-SDL.git
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
# SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
# SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.16.3)
|
cmake_minimum_required(VERSION 3.22)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 23)
|
set(CMAKE_CXX_STANDARD 23)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
@ -38,7 +38,6 @@ function(create_target_directory_groups target_name)
|
|||||||
endforeach()
|
endforeach()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
# Setup a custom clang-format target (if clang-format can be found) that will run
|
# Setup a custom clang-format target (if clang-format can be found) that will run
|
||||||
# against all the src files. This should be used before making a pull request.
|
# against all the src files. This should be used before making a pull request.
|
||||||
# =======================================================================
|
# =======================================================================
|
||||||
|
10
README.md
10
README.md
@ -5,14 +5,13 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||||||
|
|
||||||
# shadPS4
|
# shadPS4
|
||||||
|
|
||||||
An early PS4 emulator for Windows and Linux written in C++
|
shadPS4 is an early PS4 emulator for Windows and Linux written in C++
|
||||||
by shadow , skmp , wheremyfoodat , GPUCode
|
|
||||||
|
|
||||||
[Check us on twitter](https://twitter.com/shadps4 "Check us on twitter")
|
[Check us on twitter](https://twitter.com/shadps4 "Check us on twitter")
|
||||||
|
|
||||||
# Status
|
# Status
|
||||||
|
|
||||||
Early progress , a small amount of ps4 sdk demos and homebrew games working
|
Early progress, a small amount of ps4 sdk demos and homebrew games working.
|
||||||
|
|
||||||
# Why?
|
# Why?
|
||||||
|
|
||||||
@ -22,7 +21,7 @@ The project started as a fun project. Due to short free time, it will probably t
|
|||||||
|
|
||||||
## Windows
|
## Windows
|
||||||
|
|
||||||
Check building instructions in [windows build](https://github.com/shadps4-emu/shadPS4/blob/main/documents/building-windows.md)
|
Check building instructions in [windows build](https://github.com/shadps4-emu/shadPS4/blob/main/documents/windows_building.md)
|
||||||
|
|
||||||
## Linux
|
## Linux
|
||||||
|
|
||||||
@ -51,7 +50,6 @@ Logo is done by Xphalnos
|
|||||||
|
|
||||||
We currently accept any contribution, just open a pr and we will check it :)
|
We currently accept any contribution, just open a pr and we will check it :)
|
||||||
|
|
||||||
|
|
||||||
# Sister Projects
|
# Sister Projects
|
||||||
- [Panda3DS](https://github.com/wheremyfoodat/Panda3DS): An multiplatform 3DS emulator from our co-author wheremyfoodat
|
- [Panda3DS](https://github.com/wheremyfoodat/Panda3DS): An multiplatform 3DS emulator from our co-author wheremyfoodat
|
||||||
- [hydra](https://github.com/hydra-emu/hydra): An multisystem , multiplatform emulator (chip-8,GB,NES,N64) from Paris
|
- [hydra](https://github.com/hydra-emu/hydra): An multisystem , multiplatform emulator (chip-8,GB,NES,N64) from Paris
|
@ -31,7 +31,6 @@ I would like to thank the following people for helping me so far , with coding o
|
|||||||
- skmp - or kornilios for being good old friend
|
- skmp - or kornilios for being good old friend
|
||||||
- PandaBad - our beloved stalker
|
- PandaBad - our beloved stalker
|
||||||
- emufan4568 - for advices
|
- emufan4568 - for advices
|
||||||
- velocity - for talking 1-2 times per year on discord server . We miss you velocity
|
- velocity - for talking 1-2 times per year on discord server. We miss you velocity
|
||||||
|
|
||||||
- probably more , will include in the next readme :D
|
|
||||||
|
|
||||||
|
- probably more , will include in the next readme :D
|
@ -5,9 +5,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||||||
|
|
||||||
# How to build shadps4 in windows
|
# How to build shadps4 in windows
|
||||||
|
|
||||||
## Download VStudio Community 2022 17.9.5
|
## Download Visual Studio Community 2022 17.9.5
|
||||||
|
|
||||||
[VStudio 2022](https://visualstudio.microsoft.com/vs/)
|
[Visual Studio 2022](https://visualstudio.microsoft.com/vs/)
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
@ -22,4 +22,4 @@ Install the following
|
|||||||
|
|
||||||
- ## Compiling
|
- ## Compiling
|
||||||
|
|
||||||
- Open vstudio and select the clang debug or clang release . It should compile just fine
|
- Open Visual Studio and select the clang debug or clang release. It should compile just fine.
|
@ -1,8 +1,8 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <common/assert.h>
|
#include "common/assert.h"
|
||||||
#include <core/libraries/error_codes.h>
|
#include "core/libraries/error_codes.h"
|
||||||
#include "sdl_audio.h"
|
#include "sdl_audio.h"
|
||||||
|
|
||||||
namespace Audio {
|
namespace Audio {
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <core/libraries/libsceaudioout.h>
|
|
||||||
|
|
||||||
|
#include "src/core/libraries/libsceaudioout.h"
|
||||||
#include "src/common/types.h"
|
#include "src/common/types.h"
|
||||||
|
|
||||||
namespace Audio {
|
namespace Audio {
|
||||||
|
@ -15,9 +15,8 @@
|
|||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
||||||
|
|
||||||
/**
|
// Native endianness
|
||||||
* Native endianness
|
|
||||||
*/
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
using NativeEndian = T;
|
using NativeEndian = T;
|
||||||
|
|
||||||
@ -239,4 +238,4 @@ using u64_be = Common::BigEndian<u64>;
|
|||||||
|
|
||||||
using u16_le = Common::LittleEndian<u16>;
|
using u16_le = Common::LittleEndian<u16>;
|
||||||
using u32_le = Common::LittleEndian<u32>;
|
using u32_le = Common::LittleEndian<u32>;
|
||||||
using u64_le = Common::LittleEndian<u64>;
|
using u64_le = Common::LittleEndian<u64>;
|
@ -55,9 +55,8 @@ private:
|
|||||||
std::atomic_bool enabled{true};
|
std::atomic_bool enabled{true};
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
// Backend that writes to a file passed into the constructor
|
||||||
* Backend that writes to a file passed into the constructor
|
|
||||||
*/
|
|
||||||
class FileBackend {
|
class FileBackend {
|
||||||
public:
|
public:
|
||||||
explicit FileBackend(const std::filesystem::path& filename)
|
explicit FileBackend(const std::filesystem::path& filename)
|
||||||
@ -117,9 +116,8 @@ public:
|
|||||||
|
|
||||||
bool initialization_in_progress_suppress_logging = true;
|
bool initialization_in_progress_suppress_logging = true;
|
||||||
|
|
||||||
/**
|
// Static state as a singleton.
|
||||||
* Static state as a singleton.
|
|
||||||
*/
|
|
||||||
class Impl {
|
class Impl {
|
||||||
public:
|
public:
|
||||||
static Impl& Instance() {
|
static Impl& Instance() {
|
||||||
|
@ -16,9 +16,8 @@ namespace Common::Log {
|
|||||||
*/
|
*/
|
||||||
const char* GetLogClassName(Class log_class);
|
const char* GetLogClassName(Class log_class);
|
||||||
|
|
||||||
/**
|
// Returns the name of the passed log level as a C-string.
|
||||||
* Returns the name of the passed log level as a C-string.
|
|
||||||
*/
|
|
||||||
const char* GetLevelName(Level log_level);
|
const char* GetLevelName(Level log_level);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "core/hle/libraries/libscegnmdriver/libscegnmdriver.h"
|
#include "core/hle/libraries/libscegnmdriver/libscegnmdriver.h"
|
||||||
#include "core/loader/symbols_resolver.h"
|
#include "core/loader/symbols_resolver.h"
|
||||||
#include "emulator.h"
|
#include "emulator.h"
|
||||||
#include "src/core/libraries/libsceuserservice.h"
|
#include "core/libraries/libsceuserservice.h"
|
||||||
|
|
||||||
namespace HLE::Libs::Graphics::VideoOut {
|
namespace HLE::Libs::Graphics::VideoOut {
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <Zydis/Zydis.h>
|
#include <Zydis/Zydis.h>
|
||||||
#include <common/assert.h>
|
#include "common/assert.h"
|
||||||
#include "common/config.h"
|
#include "common/config.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/path_util.h"
|
#include "common/path_util.h"
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <core/PS4/HLE/Graphics/graphics_ctx.h>
|
#include "core/PS4/HLE/Graphics/graphics_ctx.h"
|
||||||
|
|
||||||
#include <condition_variable>
|
#include <condition_variable>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
#include <common/logging/log.h>
|
#include "common/logging/log.h"
|
||||||
#include <core/hle/libraries/libc/libc.h>
|
#include "core/hle/libraries/libc/libc.h"
|
||||||
#include <core/hle/libraries/libkernel/thread_management.h>
|
#include "core/hle/libraries/libkernel/thread_management.h"
|
||||||
#include "common/config.h"
|
#include "common/config.h"
|
||||||
#include "common/discord.h"
|
#include "common/discord.h"
|
||||||
#include "common/logging/backend.h"
|
#include "common/logging/backend.h"
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <SDL_vulkan.h>
|
#include <SDL_vulkan.h>
|
||||||
#include <core/PS4/GPU/gpu_memory.h>
|
|
||||||
#include <fmt/core.h>
|
#include <fmt/core.h>
|
||||||
#include <vulkan/vk_enum_string_helper.h>
|
#include <vulkan/vk_enum_string_helper.h>
|
||||||
#include <vulkan/vulkan_core.h>
|
#include <vulkan/vulkan_core.h>
|
||||||
|
|
||||||
|
#include "core/PS4/GPU/gpu_memory.h"
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/debug.h"
|
#include "common/debug.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/singleton.h"
|
#include "common/singleton.h"
|
||||||
#include "vulkan_util.h"
|
#include "vulkan_util.h"
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
|
|
||||||
void Graphics::Vulkan::vulkanCreate(Emu::WindowCtx* ctx) {
|
void Graphics::Vulkan::vulkanCreate(Emu::WindowCtx* ctx) {
|
||||||
Emu::VulkanExt ext;
|
Emu::VulkanExt ext;
|
||||||
vulkanGetInstanceExtensions(&ext);
|
vulkanGetInstanceExtensions(&ext);
|
||||||
|
5
third-party/CMakeLists.txt
vendored
5
third-party/CMakeLists.txt
vendored
@ -31,7 +31,4 @@ target_include_directories(xxhash INTERFACE xxhash)
|
|||||||
# Zydis
|
# Zydis
|
||||||
option(ZYDIS_BUILD_TOOLS "" OFF)
|
option(ZYDIS_BUILD_TOOLS "" OFF)
|
||||||
option(ZYDIS_BUILD_EXAMPLES "" OFF)
|
option(ZYDIS_BUILD_EXAMPLES "" OFF)
|
||||||
add_subdirectory(zydis EXCLUDE_FROM_ALL)
|
add_subdirectory(zydis EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user