ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9393 from liamwhite/more-vulkan 

vulkan_common: further initialization tweaks
This commit is contained in:
Fernando S 2022-12-06 17:45:08 +01:00 committed by GitHub
parent 4b7e73e0a6 7e7a23363a
commit 08d4e7c7af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/vulkan_common/vulkan_device.cpp
View File

@ -86,6 +86,8 @@ constexpr std::array REQUIRED_EXTENSIONS{
}; };
constexpr std::array REQUIRED_EXTENSIONS_BEFORE_1_2{ constexpr std::array REQUIRED_EXTENSIONS_BEFORE_1_2{
VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME,
VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME,
VK_KHR_8BIT_STORAGE_EXTENSION_NAME, VK_KHR_8BIT_STORAGE_EXTENSION_NAME,
VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME,
VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,

8
src/video_core/vulkan_common/vulkan_wrapper.cpp
View File

@ -454,6 +454,12 @@ VkResult Free(VkDevice device, VkCommandPool handle, Span<VkCommandBuffer> buffe
Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char*> extensions, Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char*> extensions,
InstanceDispatch& dispatch) { InstanceDispatch& dispatch) {
#ifdef __APPLE__
constexpr VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR};
#else
constexpr VkFlags ci_flags{};
#endif
const VkApplicationInfo application_info{ const VkApplicationInfo application_info{
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pNext = nullptr, .pNext = nullptr,
@ -466,7 +472,7 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
const VkInstanceCreateInfo ci{ const VkInstanceCreateInfo ci{
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = ci_flags,
.pApplicationInfo = &application_info, .pApplicationInfo = &application_info,
.enabledLayerCount = layers.size(), .enabledLayerCount = layers.size(),
.ppEnabledLayerNames = layers.data(), .ppEnabledLayerNames = layers.data(),