removed hardware info seems make perfomance issues , will test something more lightweight
This commit is contained in:
parent
4ae879875e
commit
d4d7e9f5f6
|
@ -58,6 +58,3 @@
|
||||||
[submodule "externals/tracy"]
|
[submodule "externals/tracy"]
|
||||||
path = externals/tracy
|
path = externals/tracy
|
||||||
url = https://github.com/shadps4-emu/tracy.git
|
url = https://github.com/shadps4-emu/tracy.git
|
||||||
[submodule "externals/hwinfo"]
|
|
||||||
path = externals/hwinfo
|
|
||||||
url = https://github.com/lfreist/hwinfo.git
|
|
||||||
|
|
|
@ -544,7 +544,7 @@ endif()
|
||||||
|
|
||||||
create_target_directory_groups(shadps4)
|
create_target_directory_groups(shadps4)
|
||||||
|
|
||||||
target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient hwinfo::HWinfo)
|
target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient)
|
||||||
target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::SPIRV glslang::glslang SDL3::SDL3)
|
target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::SPIRV glslang::glslang SDL3::SDL3)
|
||||||
|
|
||||||
if (NOT ENABLE_QT_GUI)
|
if (NOT ENABLE_QT_GUI)
|
||||||
|
|
|
@ -140,6 +140,3 @@ option(TRACY_ON_DEMAND "" ON)
|
||||||
option(TRACY_NO_FRAME_IMAGE "" ON)
|
option(TRACY_NO_FRAME_IMAGE "" ON)
|
||||||
option(TRACY_FIBERS "" ON) # For AmdGpu frontend profiling
|
option(TRACY_FIBERS "" ON) # For AmdGpu frontend profiling
|
||||||
add_subdirectory(tracy)
|
add_subdirectory(tracy)
|
||||||
|
|
||||||
# hwinfo
|
|
||||||
add_subdirectory(hwinfo)
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 81ea6332fd4839890b1904f9668865145450f8da
|
|
|
@ -22,7 +22,6 @@
|
||||||
#include "core/linker.h"
|
#include "core/linker.h"
|
||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
#include "emulator.h"
|
#include "emulator.h"
|
||||||
#include "hwinfo/hwinfo.h"
|
|
||||||
|
|
||||||
Frontend::WindowSDL* g_window = nullptr;
|
Frontend::WindowSDL* g_window = nullptr;
|
||||||
|
|
||||||
|
@ -43,7 +42,6 @@ Emulator::Emulator()
|
||||||
Common::Log::Initialize();
|
Common::Log::Initialize();
|
||||||
Common::Log::Start();
|
Common::Log::Start();
|
||||||
LOG_INFO(Loader, "Starting shadps4 emulator v{} ", Common::VERSION);
|
LOG_INFO(Loader, "Starting shadps4 emulator v{} ", Common::VERSION);
|
||||||
PrintSystemInfo();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Emulator::~Emulator() {
|
Emulator::~Emulator() {
|
||||||
|
@ -181,17 +179,4 @@ void Emulator::LoadSystemModules(const std::filesystem::path& file) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Emulator::PrintSystemInfo() {
|
|
||||||
auto cpus = hwinfo::getAllCPUs();
|
|
||||||
for (const auto& cpu : cpus) {
|
|
||||||
LOG_INFO(Loader, "CPU #{} {}", cpu.id(), cpu.modelName());
|
|
||||||
}
|
|
||||||
hwinfo::OS os;
|
|
||||||
LOG_INFO(Loader, "{}", os.name());
|
|
||||||
auto gpus = hwinfo::getAllGPUs();
|
|
||||||
for (auto& gpu : gpus) {
|
|
||||||
LOG_INFO(Loader, "GPU #{} {}", gpu.id(), gpu.name());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Core
|
} // namespace Core
|
||||||
|
|
|
@ -29,7 +29,6 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadSystemModules(const std::filesystem::path& file);
|
void LoadSystemModules(const std::filesystem::path& file);
|
||||||
void PrintSystemInfo();
|
|
||||||
|
|
||||||
Core::MemoryManager* memory;
|
Core::MemoryManager* memory;
|
||||||
Input::GameController* controller = Common::Singleton<Input::GameController>::Instance();
|
Input::GameController* controller = Common::Singleton<Input::GameController>::Instance();
|
||||||
|
|
Loading…
Reference in New Issue