aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShannon McPherson <shannon@lunarg.com>2021-03-02 15:45:13 -0700
committerShannon McPherson <shannon@lunarg.com>2021-03-02 15:48:46 -0700
commit461b33cfa2726ed65fdf3308d0303ae18a879c49 (patch)
tree741cf6f3a3bcc775c82ba5c6d8533c14626b4195
parent15c461698e9a8ee43fcd097aa263e4d8c410785b (diff)
downloadusermoji-461b33cfa2726ed65fdf3308d0303ae18a879c49.tar.xz
build: Update known-good files for 1.2.171 header
Changes: - Updated `known_good.json` - Generated new source files Change-Id: Id1d05f65733d366d729b7f9016a3613e7a795ec9
-rw-r--r--build-android/vulkan-headers_revision_android2
-rw-r--r--icd/generated/mock_icd.cpp23
-rw-r--r--icd/generated/mock_icd.h21
-rw-r--r--icd/generated/vk_typemap_helper.h11
-rw-r--r--scripts/known_good.json4
5 files changed, 58 insertions, 3 deletions
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index 00fc2368..4ee301c6 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-v1.2.170
+4fe5828a0295a3c29a266e446ac6a6b51d768e48
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index f644318c..6ab75838 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -4805,6 +4805,29 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceDirectFBPresentationSuppo
#endif /* VK_USE_PLATFORM_DIRECTFB_EXT */
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateScreenSurfaceQNX(
+ VkInstance instance,
+ const VkScreenSurfaceCreateInfoQNX* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkSurfaceKHR* pSurface)
+{
+ unique_lock_t lock(global_lock);
+ *pSurface = (VkSurfaceKHR)global_unique_handle++;
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceScreenPresentationSupportQNX(
+ VkPhysicalDevice physicalDevice,
+ uint32_t queueFamilyIndex,
+ struct _screen_window* window)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+#endif /* VK_USE_PLATFORM_SCREEN_QNX */
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
VkDevice device,
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h
index 2c75dd6a..5fd3ba1c 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/mock_icd.h
@@ -82,6 +82,7 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
{"VK_EXT_validation_features", 4},
{"VK_EXT_headless_surface", 1},
{"VK_EXT_directfb_surface", 1},
+ {"VK_QNX_screen_surface", 1},
};
// Map of device extension name to version
static const std::unordered_map<std::string, uint32_t> device_extension_map = {
@@ -2946,6 +2947,20 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceDirectFBPresentationSuppo
#endif /* VK_USE_PLATFORM_DIRECTFB_EXT */
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateScreenSurfaceQNX(
+ VkInstance instance,
+ const VkScreenSurfaceCreateInfoQNX* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkSurfaceKHR* pSurface);
+
+static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceScreenPresentationSupportQNX(
+ VkPhysicalDevice physicalDevice,
+ uint32_t queueFamilyIndex,
+ struct _screen_window* window);
+#endif /* VK_USE_PLATFORM_SCREEN_QNX */
+
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
VkDevice device,
@@ -3588,6 +3603,12 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
#ifdef VK_USE_PLATFORM_DIRECTFB_EXT
{"vkGetPhysicalDeviceDirectFBPresentationSupportEXT", (void*)GetPhysicalDeviceDirectFBPresentationSupportEXT},
#endif
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ {"vkCreateScreenSurfaceQNX", (void*)CreateScreenSurfaceQNX},
+#endif
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+ {"vkGetPhysicalDeviceScreenPresentationSupportQNX", (void*)GetPhysicalDeviceScreenPresentationSupportQNX},
+#endif
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},
{"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR},
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index e5915d7b..b49cf872 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -4275,6 +4275,17 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_
typedef VkMutableDescriptorTypeCreateInfoVALVE Type;
};
+#ifdef VK_USE_PLATFORM_SCREEN_QNX
+// Map type VkScreenSurfaceCreateInfoQNX to id VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX
+template <> struct LvlTypeMap<VkScreenSurfaceCreateInfoQNX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX> {
+ typedef VkScreenSurfaceCreateInfoQNX Type;
+};
+
+#endif // VK_USE_PLATFORM_SCREEN_QNX
// Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR
template <> struct LvlTypeMap<VkAccelerationStructureGeometryTrianglesDataKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR;
diff --git a/scripts/known_good.json b/scripts/known_good.json
index b5d0594d..cfb6c9ee 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -6,7 +6,7 @@
"sub_dir" : "Vulkan-Headers",
"build_dir" : "Vulkan-Headers/build",
"install_dir" : "Vulkan-Headers/build/install",
- "commit" : "v1.2.170"
+ "commit" : "4fe5828a0295a3c29a266e446ac6a6b51d768e48"
},
{
"name" : "MoltenVK",
@@ -30,7 +30,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.2.170",
+ "commit" : "v1.2.171",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",