commit 349abccec8f7ebd1259de11965d58790a76b0ba4
author Alexis Hetu <sugoi@google.com> Tue Feb 23 17:03:13 2021 -0500
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Feb 24 18:20:42 2021 +0000
tree 1934b5ae3bb82728b896fcad0e56d938587afa3a
parent 8a42f7d9ad4ab3bbf09e00fb3305a2ef8834d0eb

Conditionally enable the XCB WSI extension

This cl marks VK_KHR_xcb_surface as unsupported if we haven't
successfully loaded XCB. Also, an assert was added to make sure
vkCreateXcbSurfaceKHR is called with a valid connection.

Bug: b/139491466
Change-Id: Id4ed46102cd5c2535e38bf65dedbeea1cd252e6e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/53229
Tested-by: Alexis Hétu <sugoi@google.com>
Commit-Queue: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Vulkan/libVulkan.cpp

diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index b231778..33879b3 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -320,7 +320,7 @@
 	{ { VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION } },
 #endif
 #ifdef VK_USE_PLATFORM_XCB_KHR
-	{ { VK_KHR_XCB_SURFACE_EXTENSION_NAME, VK_KHR_XCB_SURFACE_SPEC_VERSION } },
+	{ { VK_KHR_XCB_SURFACE_EXTENSION_NAME, VK_KHR_XCB_SURFACE_SPEC_VERSION }, vk::XcbSurfaceKHR::hasLibXCB() },
 #endif
 #ifdef VK_USE_PLATFORM_XLIB_KHR
 	{ { VK_KHR_XLIB_SURFACE_EXTENSION_NAME, VK_KHR_XLIB_SURFACE_SPEC_VERSION }, static_cast<bool>(libX11) },
@@ -3657,6 +3657,9 @@
 	TRACE("(VkInstance instance = %p, VkXcbSurfaceCreateInfoKHR* pCreateInfo = %p, VkAllocationCallbacks* pAllocator = %p, VkSurface* pSurface = %p)",
 	      instance, pCreateInfo, pAllocator, pSurface);
 
+	// VUID-VkXcbSurfaceCreateInfoKHR-connection-01310 : connection must point to a valid X11 xcb_connection_t
+	ASSERT(pCreateInfo->connection);
+
 	return vk::XcbSurfaceKHR::Create(pAllocator, pCreateInfo, pSurface);
 }
 

src/WSI/XcbSurfaceKHR.cpp

diff --git a/src/WSI/XcbSurfaceKHR.cpp b/src/WSI/XcbSurfaceKHR.cpp
index bc98a03..fa03b36 100644
--- a/src/WSI/XcbSurfaceKHR.cpp
+++ b/src/WSI/XcbSurfaceKHR.cpp
@@ -109,6 +109,11 @@
 
 namespace vk {
 
+bool XcbSurfaceKHR::hasLibXCB()
+{
+	return libXcb;
+}
+
 XcbSurfaceKHR::XcbSurfaceKHR(const VkXcbSurfaceCreateInfoKHR *pCreateInfo, void *mem)
     : connection(pCreateInfo->connection)
     , window(pCreateInfo->window)

src/WSI/XcbSurfaceKHR.hpp

diff --git a/src/WSI/XcbSurfaceKHR.hpp b/src/WSI/XcbSurfaceKHR.hpp
index 19f3356..4d4e218 100644
--- a/src/WSI/XcbSurfaceKHR.hpp
+++ b/src/WSI/XcbSurfaceKHR.hpp
@@ -40,6 +40,8 @@
 	virtual void detachImage(PresentImage *image) override;
 	VkResult present(PresentImage *image) override;
 
+	static bool hasLibXCB();
+
 private:
 	xcb_connection_t *connection;
 	xcb_window_t window;