Browse Source
Merge pull request #9393 from liamwhite/more-vulkan
vulkan_common: further initialization tweaks
pull/15/merge
Fernando S
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
9 additions and
1 deletions
-
src/video_core/vulkan_common/vulkan_device.cpp
-
src/video_core/vulkan_common/vulkan_wrapper.cpp
|
|
|
@ -86,6 +86,8 @@ constexpr std::array REQUIRED_EXTENSIONS{ |
|
|
|
}; |
|
|
|
|
|
|
|
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_SHADER_FLOAT_CONTROLS_EXTENSION_NAME, |
|
|
|
VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, |
|
|
|
|
|
|
|
@ -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, |
|
|
|
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{ |
|
|
|
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, |
|
|
|
.pNext = nullptr, |
|
|
|
@ -466,7 +472,7 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char |
|
|
|
const VkInstanceCreateInfo ci{ |
|
|
|
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, |
|
|
|
.pNext = nullptr, |
|
|
|
.flags = 0, |
|
|
|
.flags = ci_flags, |
|
|
|
.pApplicationInfo = &application_info, |
|
|
|
.enabledLayerCount = layers.size(), |
|
|
|
.ppEnabledLayerNames = layers.data(), |
|
|
|
|