Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-14 13:45:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into Feature/initial-ps4-ime-keyboard

Browse source
This commit is contained in:
Valdis Bogdāns 2025-04-23 22:37:44 +03:00 • committed by GitHub
commit d9ea8154ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1105,7 +1105,7 @@ if (APPLE)
cmake_path(GET MVK_ICD_DST PARENT_PATH MVK_ICD_DST_PARENT) cmake_path(GET MVK_ICD_DST PARENT_PATH MVK_ICD_DST_PARENT)
cmake_path(GET MVK_DYLIB_DST PARENT_PATH MVK_DYLIB_DST_PARENT) cmake_path(GET MVK_DYLIB_DST PARENT_PATH MVK_DYLIB_DST_PARENT)
set(MVK_ICD "\\\{ \\\"file_format_version\\\": \\\"1.0.0\\\", \\\"ICD\\\": \\\{ \\\"library_path\\\": \\\"${MVK_DYLIB_ICD_PATH}\\\", \\\"api_version\\\": \\\"1.2.0\\\", \\\"is_portability_driver\\\": true \\\} \\\}") set(MVK_ICD "\\\{ \\\"file_format_version\\\": \\\"1.0.0\\\", \\\"ICD\\\": \\\{ \\\"library_path\\\": \\\"${MVK_DYLIB_ICD_PATH}\\\", \\\"api_version\\\": \\\"1.3.0\\\", \\\"is_portability_driver\\\": true \\\} \\\}")
add_custom_command( add_custom_command(
OUTPUT ${MVK_ICD_DST} OUTPUT ${MVK_ICD_DST}
COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_ICD_DST_PARENT} && ${CMAKE_COMMAND} -E echo ${MVK_ICD} > ${MVK_ICD_DST}) COMMAND ${CMAKE_COMMAND} -E make_directory ${MVK_ICD_DST_PARENT} && ${CMAKE_COMMAND} -E echo ${MVK_ICD} > ${MVK_ICD_DST})

8
src/video_core/renderer_vulkan/vk_instance.cpp
View file

@ -521,9 +521,11 @@ void Instance::CollectDeviceParameters() {
LOG_INFO(Render_Vulkan, "GPU_Vulkan_Extensions: {}", extensions); LOG_INFO(Render_Vulkan, "GPU_Vulkan_Extensions: {}", extensions);
} }
void Instance::CollectToolingInfo() { void Instance::CollectToolingInfo() const {
if (GetDriverID() == vk::DriverId::eAmdProprietary) { if (driver_id == vk::DriverId::eAmdProprietary ||
// Currently causes issues with Reshade on AMD proprietary, disabled until fix released. driver_id == vk::DriverId::eIntelProprietaryWindows) {
// AMD: Causes issues with Reshade.
// Intel: Causes crash on start.
return; return;
} }
const auto [tools_result, tools] = physical_device.getToolProperties(); const auto [tools_result, tools] = physical_device.getToolProperties();

2
src/video_core/renderer_vulkan/vk_instance.h
View file

@ -311,7 +311,7 @@ private:
/// Collects telemetry information from the device. /// Collects telemetry information from the device.
void CollectDeviceParameters(); void CollectDeviceParameters();
void CollectToolingInfo(); void CollectToolingInfo() const;
/// Gets the supported feature flags for a format. /// Gets the supported feature flags for a format.
[[nodiscard]] vk::FormatFeatureFlags2 GetFormatFeatureFlags(vk::Format format) const; [[nodiscard]] vk::FormatFeatureFlags2 GetFormatFeatureFlags(vk::Format format) const;