Commit e451d831 authored by Saman Sami's avatar Saman Sami Committed by Commit Bot

Remove workaround for missing function in Vulkan Swiftshader

vkGetPhysicalDeviceXlibPresentationSupportKHR is now supported.

Bug: swiftshader:129
Change-Id: Id7eaee8fd695cd1cb5875b8c524e9152bea2a461
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1656062
Auto-Submit: Saman Sami <samans@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#668526}
parent f528ae9a
...@@ -48,8 +48,7 @@ VulkanInstance::~VulkanInstance() { ...@@ -48,8 +48,7 @@ VulkanInstance::~VulkanInstance() {
bool VulkanInstance::Initialize( bool VulkanInstance::Initialize(
const std::vector<const char*>& required_extensions, const std::vector<const char*>& required_extensions,
const std::vector<const char*>& required_layers, const std::vector<const char*>& required_layers) {
bool using_swiftshader) {
DCHECK(!vk_instance_); DCHECK(!vk_instance_);
VulkanFunctionPointers* vulkan_function_pointers = VulkanFunctionPointers* vulkan_function_pointers =
...@@ -241,9 +240,7 @@ bool VulkanInstance::Initialize( ...@@ -241,9 +240,7 @@ bool VulkanInstance::Initialize(
reinterpret_cast<PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR>( reinterpret_cast<PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR>(
vkGetInstanceProcAddr( vkGetInstanceProcAddr(
vk_instance_, "vkGetPhysicalDeviceXlibPresentationSupportKHR")); vk_instance_, "vkGetPhysicalDeviceXlibPresentationSupportKHR"));
// TODO(samans): Remove |using_swiftshader| once Swiftshader supports this if (!vkGetPhysicalDeviceXlibPresentationSupportKHR)
// method. https://crbug.com/swiftshader/129
if (!vkGetPhysicalDeviceXlibPresentationSupportKHR && !using_swiftshader)
return false; return false;
#endif #endif
......
...@@ -26,12 +26,8 @@ class VULKAN_EXPORT VulkanInstance { ...@@ -26,12 +26,8 @@ class VULKAN_EXPORT VulkanInstance {
// The extensions in |required_extensions| and the layers in |required_layers| // The extensions in |required_extensions| and the layers in |required_layers|
// will be enabled in the created instance. See the "Extended Functionality" // will be enabled in the created instance. See the "Extended Functionality"
// section of vulkan specification for more information. // section of vulkan specification for more information.
// TODO(samans): Remove |using_swiftshader| once Vulkan Swiftshader is more
// developed and the workarounds that were added can be deleted.
// https://crbug.com/963988
bool Initialize(const std::vector<const char*>& required_extensions, bool Initialize(const std::vector<const char*>& required_extensions,
const std::vector<const char*>& required_layers, const std::vector<const char*>& required_layers);
bool using_swiftshader = false);
// VkApplicationInfo.apiVersion value used to initialize the instance. // VkApplicationInfo.apiVersion value used to initialize the instance.
uint32_t api_version() const { return api_version_; } uint32_t api_version() const { return api_version_; }
......
...@@ -76,7 +76,7 @@ bool VulkanImplementationX11::InitializeVulkanInstance(bool using_surface) { ...@@ -76,7 +76,7 @@ bool VulkanImplementationX11::InitializeVulkanInstance(bool using_surface) {
if (!vulkan_function_pointers->vulkan_loader_library_) if (!vulkan_function_pointers->vulkan_loader_library_)
return false; return false;
if (!vulkan_instance_.Initialize(required_extensions, {}, use_swiftshader())) if (!vulkan_instance_.Initialize(required_extensions, {}))
return false; return false;
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment