提交 15cb187c 编写于 作者: M mikejurka 提交者: GitHub

Update to match the latest Vulkan loader in Fuchsia (#3654)

上级 bf2166b6
...@@ -62,6 +62,10 @@ std::string VulkanResultToString(VkResult result) { ...@@ -62,6 +62,10 @@ std::string VulkanResultToString(VkResult result) {
return "VK_RESULT_RANGE_SIZE"; return "VK_RESULT_RANGE_SIZE";
case VK_RESULT_MAX_ENUM: case VK_RESULT_MAX_ENUM:
return "VK_RESULT_MAX_ENUM"; return "VK_RESULT_MAX_ENUM";
case VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX:
return "VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX";
case VK_ERROR_OUT_OF_POOL_MEMORY_KHR:
return "VK_ERROR_OUT_OF_POOL_MEMORY_KHR";
} }
return "Unknown Error"; return "Unknown Error";
} }
......
...@@ -30,11 +30,21 @@ static std::vector<std::string> InstanceOrDeviceLayersToEnable( ...@@ -30,11 +30,21 @@ static std::vector<std::string> InstanceOrDeviceLayersToEnable(
// NOTE: The loader is sensitive to the ordering here. Please do not rearrange // NOTE: The loader is sensitive to the ordering here. Please do not rearrange
// this list. // this list.
#if OS_FUCHSIA
// Fuchsia uses the updated Vulkan loader and validation layers which no
// longer includes the image validation layer.
const std::vector<std::string> candidates = {
"VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation",
"VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_core_validation",
"VK_LAYER_LUNARG_device_limits", "VK_LAYER_LUNARG_swapchain",
"VK_LAYER_GOOGLE_unique_objects"};
#else
const std::vector<std::string> candidates = { const std::vector<std::string> candidates = {
"VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation",
"VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_core_validation", "VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_core_validation",
"VK_LAYER_LUNARG_device_limits", "VK_LAYER_LUNARG_image", "VK_LAYER_LUNARG_device_limits", "VK_LAYER_LUNARG_image",
"VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects"}; "VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects"};
#endif
uint32_t count = 0; uint32_t count = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册