archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 08:21:29 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

vk: Do not do extension test if in a fast context (enum only)

Browse source
This commit is contained in:
kd-11 2018-05-17 19:14:35 +03:00 • committed by kd-11
parent 3f14bc6961
commit d283200e13
1 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

52
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -1883,34 +1883,38 @@ public:
std::vector<const char *> layers; std::vector<const char *> layers;
#ifndef __APPLE__ #ifndef __APPLE__
extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME); if (!fast)
extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); {
extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
#ifdef _WIN32 #ifdef _WIN32
extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
#else #else
supported_extensions support; supported_extensions support;
bool found_surface_ext = false; bool found_surface_ext = false;
if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME))
{ {
extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
found_surface_ext = true; found_surface_ext = true;
} }
#ifdef VK_USE_PLATFORM_WAYLAND_KHR #ifdef VK_USE_PLATFORM_WAYLAND_KHR
if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
{ {
extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
found_surface_ext = true; found_surface_ext = true;
}
#endif //(WAYLAND)
if (!found_surface_ext)
{
LOG_ERROR(RSX, "Could not find a supported Vulkan surface extension");
return 0;
}
#endif //(WIN32)
if (g_cfg.video.debug_output)
layers.push_back("VK_LAYER_LUNARG_standard_validation");
} }
#endif #endif //(!APPLE)
if (!found_surface_ext)
{
LOG_ERROR(RSX, "Could not find a supported Vulkan surface extension");
return 0;
}
#endif
if (!fast && g_cfg.video.debug_output)
layers.push_back("VK_LAYER_LUNARG_standard_validation");
#endif
VkInstanceCreateInfo instance_info = {}; VkInstanceCreateInfo instance_info = {};
instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
instance_info.pApplicationInfo = &app; instance_info.pApplicationInfo = &app;