[ptxdist] [PATCH 1/7] glslang: version bump 1.3.246.1 -> 1.3.250.0

[ptxdist] [PATCH 1/7] glslang: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/glslang.make      | 7 +++----
 rules/host-glslang.make | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/rules/glslang.make b/rules/glslang.make
index f79d60f7d458..ac78dbe8db65 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
 #
 # Paths and names
 #
-GLSLANG_VERSION		:= 1.3.246.1
-GLSLANG_MD5		:= b55b5074e5d3e587b564d9159a1551a1
+GLSLANG_VERSION		:= 1.3.250.0
+GLSLANG_MD5		:= e95504d25ed260c439f8031cc1d498e0
 GLSLANG			:= glslang-$(GLSLANG_VERSION)
 GLSLANG_SUFFIX		:= tar.gz
 GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
@@ -43,8 +43,7 @@ GLSLANG_CONF_OPT	:= \
 	-DENABLE_PCH=ON \
 	-DENABLE_RTTI=OFF \
 	-DENABLE_SPVREMAPPER=ON \
-	-DSKIP_GLSLANG_INSTALL=OFF \
-	-DUSE_CCACHE=OFF
+	-DSKIP_GLSLANG_INSTALL=OFF
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/host-glslang.make b/rules/host-glslang.make
index dcdaa0ee27ab..22a8a26b7701 100644
--- a/rules/host-glslang.make
+++ b/rules/host-glslang.make
@@ -30,7 +30,6 @@ HOST_GLSLANG_CONF_OPT	:= \
 	-DENABLE_PCH=ON \
 	-DENABLE_RTTI=OFF \
 	-DENABLE_SPVREMAPPER=ON \
-	-DSKIP_GLSLANG_INSTALL=OFF \
-	-DUSE_CCACHE=OFF
+	-DSKIP_GLSLANG_INSTALL=OFF
 
 # vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 2/7] spirv-headers: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/spirv-headers.make | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make
index af0770cf22b7..59d7734fe67d 100644
--- a/rules/spirv-headers.make
+++ b/rules/spirv-headers.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
 #
 # Paths and names
 #
-SPIRV_HEADERS_VERSION	:= 1.3.246.1
-SPIRV_HEADERS_MD5	:= 34931d32974d05449ddbbe0b86820f2e
+SPIRV_HEADERS_VERSION	:= 1.3.250.0
+SPIRV_HEADERS_MD5	:= 86c097b6e1671344b399a5771db6ecdf
 SPIRV_HEADERS		:= spirv-headers-$(SPIRV_HEADERS_VERSION)
 SPIRV_HEADERS_SUFFIX	:= tar.gz
 SPIRV_HEADERS_URL	:= https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
@@ -31,7 +31,6 @@ SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae
 SPIRV_HEADERS_CONF_TOOL	:= cmake
 SPIRV_HEADERS_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
-	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
-	-DSPIRV_HEADERS_SKIP_INSTALL=OFF
+	-DBUILD_TESTS=OFF
 
 # vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 3/7] spirv-tools: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/spirv-tools.make | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
index fb469949ec9b..8a4d460bc50d 100644
--- a/rules/spirv-tools.make
+++ b/rules/spirv-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
 #
 # Paths and names
 #
-SPIRV_TOOLS_VERSION	:= 1.3.246.1
-SPIRV_TOOLS_MD5		:= 9039e41e8294d1a6388935ad8d03837d
+SPIRV_TOOLS_VERSION	:= 1.3.250.0
+SPIRV_TOOLS_MD5		:= 3d9dea654f65a28285df53a65cafe252
 SPIRV_TOOLS		:= spirv-tools-$(SPIRV_TOOLS_VERSION)
 SPIRV_TOOLS_SUFFIX	:= tar.gz
 SPIRV_TOOLS_URL		:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
@@ -62,8 +62,7 @@ SPIRV_TOOLS_CONF_OPT	:= \
 	-DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
 	-DSPIRV_CHECK_CONTEXT=ON \
 	-DSPIRV_COLOR_TERMINAL=ON \
-	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
-	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
+	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
 	-DSPIRV_LOG_DEBUG=OFF \
 	-DSPIRV_SKIP_EXECUTABLES=ON \
 	-DSPIRV_SKIP_TESTS=ON \
-- 
2.39.2

[ptxdist] [PATCH 4/7] vulkan-headers: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/vulkan-headers.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make
index 7b9bb2acbc38..13aaeda147fc 100644
--- a/rules/vulkan-headers.make
+++ b/rules/vulkan-headers.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers
 # Paths and names
 #
 
-VULKAN_HEADERS_VERSION	:= 1.3.246.1
-VULKAN_HEADERS_MD5	:= 0b27bf3501317564abaa796adb8bfb00
+VULKAN_HEADERS_VERSION	:= 1.3.250.0
+VULKAN_HEADERS_MD5	:= 7e249b4a6d077a710dd1d6b4bab4dca6
 VULKAN_HEADERS		:= vulkan-headers-$(VULKAN_HEADERS_VERSION)
 VULKAN_HEADERS_SUFFIX	:= tar.gz
 VULKAN_HEADERS_URL	:= https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
-- 
2.39.2

[ptxdist] [PATCH 5/7] vulkan-loader: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/vulkan-loader.make | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
index 02981278de60..d09a78778ffe 100644
--- a/rules/vulkan-loader.make
+++ b/rules/vulkan-loader.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader
 #
 # Paths and names
 #
-VULKAN_LOADER_VERSION	:= 1.3.246.1
-VULKAN_LOADER_MD5	:= ff7ef0192c49f5d16883bb32f49c4adf
+VULKAN_LOADER_VERSION	:= 1.3.250.0
+VULKAN_LOADER_MD5	:= 93be6769ffcf4cd6f8d8513eec84a0ce
 VULKAN_LOADER		:= vulkan-loader-$(VULKAN_LOADER_VERSION)
 VULKAN_LOADER_SUFFIX	:= tar.gz
 VULKAN_LOADER_URL	:= https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
@@ -32,7 +32,6 @@ VULKAN_LOADER_CONF_TOOL	:= cmake
 VULKAN_LOADER_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross \
 	-DBUILD_TESTS=OFF \
 	-DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
 	-DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \
-- 
2.39.2

[ptxdist] [PATCH 6/7] vulkan-tools: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...-CMAKE_FIND_ROOT_PATH-when-cross-com.patch | 34 +++++++++++++++++++
 patches/vulkan-tools-1.3.250.0/series         |  4 +++
 rules/vulkan-tools.make                       |  8 +++--
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
 create mode 100644 patches/vulkan-tools-1.3.250.0/series

diff --git a/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
new file mode 100644
index 000000000000..c13f0b026a84
--- /dev/null
+++ b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
@@ -0,0 +1,34 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Tue, 16 May 2023 10:04:03 +0200
+Subject: [PATCH] Stop overwriting CMAKE_FIND_ROOT_PATH when cross compiling
+
+PTXdist uses CMAKE_FIND_ROOT_PATH [1] to instruct CMake where to find
+package information when cross-compiling. Stop overwriting this with
+the contents of CMAKE_PREFIX_PATH [2] in the build system.
+
+[1] https://cmake.org/cmake/help/v3.25/variable/CMAKE_FIND_ROOT_PATH.html
+[2] https://cmake.org/cmake/help/v3.25/variable/CMAKE_PREFIX_PATH.html
+
+This issue was introduced with commit e99e3c640ab7 ("cmake: Add
+UPDATE_DEPS functionality"). It is similar to the same issue in
+vulkan-validationlayers.
+
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ scripts/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 5b979d43de59..3b1ddbdff685 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -113,8 +113,4 @@ if (MOLTENVK_REPO_ROOT)
+     list(APPEND CMAKE_PREFIX_PATH ${MOLTENVK_REPO_ROOT})
+ endif()
+ 
+-if (CMAKE_CROSSCOMPILING)
+-    set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+-else()
+-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+-endif()
++set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
diff --git a/patches/vulkan-tools-1.3.250.0/series b/patches/vulkan-tools-1.3.250.0/series
new file mode 100644
index 000000000000..3ed158f8be1d
--- /dev/null
+++ b/patches/vulkan-tools-1.3.250.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
+# ea2ba1941cc64bfae752632f0830f963  - git-ptx-patches magic
diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
index dfe608e4a389..fb0d2ff69b27 100644
--- a/rules/vulkan-tools.make
+++ b/rules/vulkan-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools
 #
 # Paths and names
 #
-VULKAN_TOOLS_VERSION	:= 1.3.246.1
-VULKAN_TOOLS_MD5	:= b6a7c6c46d9ca6c75ce6b9f3777b8e5f
+VULKAN_TOOLS_VERSION	:= 1.3.250.0
+VULKAN_TOOLS_MD5	:= 3443149cd1e65abdc4d81ff9f4a2d8ea
 VULKAN_TOOLS		:= vulkan-tools-$(VULKAN_TOOLS_VERSION)
 VULKAN_TOOLS_SUFFIX	:= tar.gz
 VULKAN_TOOLS_URL	:= https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
@@ -40,7 +40,9 @@ VULKAN_TOOLS_CONF_OPT	:= \
 	-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \
 	-DBUILD_WSI_XLIB_SUPPORT=OFF \
 	-DENABLE_ADDRESS_SANITIZER=OFF \
-	-DINSTALL_ICD=OFF
+	-DINSTALL_ICD=OFF \
+	-DTOOLS_CODEGEN=OFF \
+	-DUPDATE_DEPS=OFF
 
 ifdef PTXCONF_VULKAN_TOOLS_CUBE
 VULKAN_TOOLS_CONF_OPT	+= \
-- 
2.39.2

[ptxdist] [PATCH 7/7] vulkan-validationlayers: version bump 1.3.246.1 -> 1.3.250.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...r-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch | 201 ------------------
 .../vulkan-validationlayers-1.3.246.1/series  |   5 -
 ...x-find_-support-when-cross-compiling.patch |   4 +-
 .../vulkan-validationlayers-1.3.250.0/series  |   4 +
 rules/vulkan-validationlayers.make            |   4 +-
 5 files changed, 8 insertions(+), 210 deletions(-)
 delete mode 100644 patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
 delete mode 100644 patches/vulkan-validationlayers-1.3.246.1/series
 rename patches/{vulkan-validationlayers-1.3.246.1 => vulkan-validationlayers-1.3.250.0}/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch (92%)
 create mode 100644 patches/vulkan-validationlayers-1.3.250.0/series

diff --git a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch b/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
deleted file mode 100644
index 3b625e31120f..000000000000
--- a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From: Niklas Haas <git@haasn.dev>
-Date: Thu, 20 Apr 2023 11:51:49 +0200
-Subject: [PATCH] layers: Fix UB for VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT
-
-Several codepaths in the layers called into
-vkGetPhysicalDeviceImageFormatProperties2KHR without including a valid
-VkPhysicalDeviceImageDrmFormatModifierInfoEXT, despite this being a
-requirement for images with DRM format modifier tiling.
-
-For the vkBindImageMemory check, there is a hypothetical possibility of
-the driver returning VK_ERROR_OUT_OF_HOST_MEMORY when querying the
-image's DRM format. In this case, for lack of anything better to do, we
-preserve the current behavior.
-
-It might make more sense to query the DRM format modifier immediately
-after image creation and cache it inside the image state, but I didn't
-want to make that (more invasive) change myself.
-
-As an aside, we also correctly specify the specified `sharingMode` when
-querying for DRM modifier support, which the current code failed to do
-properly.
-
-Co-authored-by: Simon Ser <contact@emersion.fr>
-
-closes #5649
-closes #5687
-
-(cherry picked from commit ce2c6eff3457a331efd64da800c5ac393285cf40)
-
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
----
- layers/core_checks/device_memory_validation.cpp | 18 ++++++-
- layers/core_checks/image_validation.cpp         | 72 ++++++++++++++++---------
- 2 files changed, 62 insertions(+), 28 deletions(-)
-
-diff --git a/layers/core_checks/device_memory_validation.cpp b/layers/core_checks/device_memory_validation.cpp
-index 4a98d6f0922d..555985957dce 100644
---- a/layers/core_checks/device_memory_validation.cpp
-+++ b/layers/core_checks/device_memory_validation.cpp
-@@ -887,7 +887,7 @@ bool CoreChecks::PreCallValidateMapMemory(VkDevice device, VkDeviceMemory mem, V
-     return skip;
- }
- 
--bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR* pMemoryMapInfo, void **ppData) const {
-+bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData) const {
-     bool skip = false;
-     auto mem_info = Get<DEVICE_MEMORY_STATE>(pMemoryMapInfo->memory);
-     if (mem_info) {
-@@ -905,7 +905,7 @@ bool CoreChecks::PreCallValidateUnmapMemory(VkDevice device, VkDeviceMemory mem)
-     return skip;
- }
- 
--bool CoreChecks::PreCallValidateUnmapMemory2KHR(VkDevice device, const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo) const {
-+bool CoreChecks::PreCallValidateUnmapMemory2KHR(VkDevice device, const VkMemoryUnmapInfoKHR *pMemoryUnmapInfo) const {
-     bool skip = false;
-     auto mem_info = Get<DEVICE_MEMORY_STATE>(pMemoryUnmapInfo->memory);
-     if (mem_info && !mem_info->mapped_range.size) {
-@@ -1269,6 +1269,10 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t bindInfoCount, const VkBindIma
- 
-                 // Validate export memory handles
-                 if (mem_info->export_handle_type_flags != 0) {
-+                    auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
-+                    drm_format_modifier.sharingMode = image_state->createInfo.sharingMode;
-+                    drm_format_modifier.queueFamilyIndexCount = image_state->createInfo.queueFamilyIndexCount;
-+                    drm_format_modifier.pQueueFamilyIndices = image_state->createInfo.pQueueFamilyIndices;
-                     auto external_info = LvlInitStruct<VkPhysicalDeviceExternalImageFormatInfo>();
-                     auto image_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>(&external_info);
-                     image_info.format = image_state->createInfo.format;
-@@ -1283,6 +1287,16 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t bindInfoCount, const VkBindIma
-                     // Check export operation support
-                     auto check_export_support = [&](VkExternalMemoryHandleTypeFlagBits flag) {
-                         external_info.handleType = flag;
-+                        external_info.pNext = NULL;
-+                        if (image_state->createInfo.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
-+                            auto drm_modifier_properties = LvlInitStruct<VkImageDrmFormatModifierPropertiesEXT>();
-+                            auto result =
-+                                DispatchGetImageDrmFormatModifierPropertiesEXT(device, bind_info.image, &drm_modifier_properties);
-+                            if (result == VK_SUCCESS) {
-+                                external_info.pNext = &drm_format_modifier;
-+                                drm_format_modifier.drmFormatModifier = drm_modifier_properties.drmFormatModifier;
-+                            }
-+                        }
-                         auto result =
-                             DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
-                         if (result != VK_SUCCESS) {
-diff --git a/layers/core_checks/image_validation.cpp b/layers/core_checks/image_validation.cpp
-index c56b5dabdd27..35a84c86f8ef 100644
---- a/layers/core_checks/image_validation.cpp
-+++ b/layers/core_checks/image_validation.cpp
-@@ -176,30 +176,35 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
-         }
-     }
- 
--    VkImageFormatProperties format_limits = {};
-+    auto image_format_properties = LvlInitStruct<VkImageFormatProperties2>();
-+    auto image_format_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>();
-+    image_format_info.type = pCreateInfo->imageType;
-+    image_format_info.format = pCreateInfo->format;
-+    image_format_info.tiling = pCreateInfo->tiling;
-+    image_format_info.usage = pCreateInfo->usage;
-+    image_format_info.flags = pCreateInfo->flags;
-     VkResult result = VK_SUCCESS;
-     if (pCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
--        result = DispatchGetPhysicalDeviceImageFormatProperties(physical_device, pCreateInfo->format, pCreateInfo->imageType,
--                                                                pCreateInfo->tiling, pCreateInfo->usage, pCreateInfo->flags,
--                                                                &format_limits);
-+        if (IsExtEnabled(device_extensions.vk_khr_get_physical_device_properties2)) {
-+            result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info, &image_format_properties);
-+        } else {
-+            result = DispatchGetPhysicalDeviceImageFormatProperties(physical_device, pCreateInfo->format, pCreateInfo->imageType,
-+                                                                    pCreateInfo->tiling, pCreateInfo->usage, pCreateInfo->flags,
-+                                                                    &image_format_properties.imageFormatProperties);
-+        }
-     } else {
-         auto modifier_list = LvlFindInChain<VkImageDrmFormatModifierListCreateInfoEXT>(pCreateInfo->pNext);
-         auto explicit_modifier = LvlFindInChain<VkImageDrmFormatModifierExplicitCreateInfoEXT>(pCreateInfo->pNext);
-+        auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
-+        image_format_info.pNext = &drm_format_modifier;
-+        drm_format_modifier.sharingMode = pCreateInfo->sharingMode;
-+        drm_format_modifier.queueFamilyIndexCount = pCreateInfo->queueFamilyIndexCount;
-+        drm_format_modifier.pQueueFamilyIndices = pCreateInfo->pQueueFamilyIndices;
-         if (modifier_list) {
-             for (uint32_t i = 0; i < modifier_list->drmFormatModifierCount; i++) {
--                auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
-                 drm_format_modifier.drmFormatModifier = modifier_list->pDrmFormatModifiers[i];
--                auto image_format_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>(&drm_format_modifier);
--                image_format_info.type = pCreateInfo->imageType;
--                image_format_info.format = pCreateInfo->format;
--                image_format_info.tiling = pCreateInfo->tiling;
--                image_format_info.usage = pCreateInfo->usage;
--                image_format_info.flags = pCreateInfo->flags;
--                auto image_format_properties = LvlInitStruct<VkImageFormatProperties2>();
--
-                 result =
-                     DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info, &image_format_properties);
--                format_limits = image_format_properties.imageFormatProperties;
- 
-                 /* The application gives a list of modifier and the driver
-                  * selects one. If one is wrong, stop there.
-@@ -207,18 +212,8 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
-                 if (result != VK_SUCCESS) break;
-             }
-         } else if (explicit_modifier) {
--            auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
-             drm_format_modifier.drmFormatModifier = explicit_modifier->drmFormatModifier;
--            auto image_format_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>(&drm_format_modifier);
--            image_format_info.type = pCreateInfo->imageType;
--            image_format_info.format = pCreateInfo->format;
--            image_format_info.tiling = pCreateInfo->tiling;
--            image_format_info.usage = pCreateInfo->usage;
--            image_format_info.flags = pCreateInfo->flags;
--            auto image_format_properties = LvlInitStruct<VkImageFormatProperties2>();
--
-             result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info, &image_format_properties);
--            format_limits = image_format_properties.imageFormatProperties;
-         }
-     }
- 
-@@ -238,6 +233,7 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
-         }
- #endif  // VK_USE_PLATFORM_ANDROID_KHR
-     } else {
-+        const auto format_limits = image_format_properties.imageFormatProperties;
-         if (pCreateInfo->mipLevels > format_limits.maxMipLevels) {
-             skip |= LogError(device, "VUID-VkImageCreateInfo-mipLevels-02255",
-                              "vkCreateImage(): Image mip levels=%d exceed image format maxMipLevels=%d for format %s.",
-@@ -468,8 +464,32 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
- 
-         auto external_image_properties = LvlInitStruct<VkExternalImageFormatProperties>();
-         auto image_properties = LvlInitStruct<VkImageFormatProperties2>(&external_image_properties);
--        result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
--        const auto compatible_types = external_image_properties.externalMemoryProperties.compatibleHandleTypes;
-+        VkExternalMemoryHandleTypeFlags compatible_types = 0;
-+        if (pCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
-+            result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
-+            compatible_types = external_image_properties.externalMemoryProperties.compatibleHandleTypes;
-+        } else {
-+            auto modifier_list = LvlFindInChain<VkImageDrmFormatModifierListCreateInfoEXT>(pCreateInfo->pNext);
-+            auto explicit_modifier = LvlFindInChain<VkImageDrmFormatModifierExplicitCreateInfoEXT>(pCreateInfo->pNext);
-+            auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
-+            external_image_info.pNext = &drm_format_modifier;
-+            drm_format_modifier.sharingMode = pCreateInfo->sharingMode;
-+            drm_format_modifier.queueFamilyIndexCount = pCreateInfo->queueFamilyIndexCount;
-+            drm_format_modifier.pQueueFamilyIndices = pCreateInfo->pQueueFamilyIndices;
-+            if (modifier_list) {
-+                for (uint32_t i = 0; i < modifier_list->drmFormatModifierCount; i++) {
-+                    drm_format_modifier.drmFormatModifier = modifier_list->pDrmFormatModifiers[i];
-+                    result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
-+                    compatible_types |= external_image_properties.externalMemoryProperties.compatibleHandleTypes;
-+                    if (result != VK_SUCCESS)
-+                        break;
-+                }
-+            } else if (explicit_modifier) {
-+                drm_format_modifier.drmFormatModifier = explicit_modifier->drmFormatModifier;
-+                result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
-+                compatible_types = external_image_properties.externalMemoryProperties.compatibleHandleTypes;
-+            }
-+        }
- 
-         if (result != VK_SUCCESS) {
-             skip |= LogError(
diff --git a/patches/vulkan-validationlayers-1.3.246.1/series b/patches/vulkan-validationlayers-1.3.246.1/series
deleted file mode 100644
index 33102174e7c3..000000000000
--- a/patches/vulkan-validationlayers-1.3.246.1/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
-0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
-# e0d6af34fb6700edc57f14684c9a4c44  - git-ptx-patches magic
diff --git a/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch b/patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
similarity index 92%
rename from patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
rename to patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
index c3e3338b0009..4716894cdd34 100644
--- a/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
+++ b/patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
@@ -17,10 +17,10 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index f3536cc2a05e..a71de73111a2 100644
+index 94c8528c83a4..b8aebdd6eca6 100644
 --- a/scripts/CMakeLists.txt
 +++ b/scripts/CMakeLists.txt
-@@ -127,8 +127,4 @@ if (MIMALLOC_INSTALL_DIR)
+@@ -123,8 +123,4 @@ if (MIMALLOC_INSTALL_DIR)
      list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR})
  endif()
  
diff --git a/patches/vulkan-validationlayers-1.3.250.0/series b/patches/vulkan-validationlayers-1.3.250.0/series
new file mode 100644
index 000000000000..ac294ce4fb8b
--- /dev/null
+++ b/patches/vulkan-validationlayers-1.3.250.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
+# 6d856a1a207d0d3f7e4c957af59f9af8  - git-ptx-patches magic
diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
index a497ca942c37..1d9361a745fa 100644
--- a/rules/vulkan-validationlayers.make
+++ b/rules/vulkan-validationlayers.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
 #
 # Paths and names
 #
-VULKAN_VALIDATIONLAYERS_VERSION	:= 1.3.246.1
-VULKAN_VALIDATIONLAYERS_MD5	:= beba63c5c96fadd027ee3c3bd230b19e
+VULKAN_VALIDATIONLAYERS_VERSION	:= 1.3.250.0
+VULKAN_VALIDATIONLAYERS_MD5	:= 6452bc13fe2b6cb2b69641f572cb0b7a
 VULKAN_VALIDATIONLAYERS		:= vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
 VULKAN_VALIDATIONLAYERS_SUFFIX	:= tar.gz
 VULKAN_VALIDATIONLAYERS_URL	:= https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
-- 
2.39.2

Re: [ptxdist] [APPLIED] glslang: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as 0ad8fb8d79c089142fc5a0c24dc73e797fbad9b2.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:21 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/glslang.make b/rules/glslang.make
> index f79d60f7d458..ac78dbe8db65 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
>  #
>  # Paths and names
>  #
> -GLSLANG_VERSION		:= 1.3.246.1
> -GLSLANG_MD5		:= b55b5074e5d3e587b564d9159a1551a1
> +GLSLANG_VERSION		:= 1.3.250.0
> +GLSLANG_MD5		:= e95504d25ed260c439f8031cc1d498e0
>  GLSLANG			:= glslang-$(GLSLANG_VERSION)
>  GLSLANG_SUFFIX		:= tar.gz
>  GLSLANG_URL		:= https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> @@ -43,8 +43,7 @@ GLSLANG_CONF_OPT	:= \
>  	-DENABLE_PCH=ON \
>  	-DENABLE_RTTI=OFF \
>  	-DENABLE_SPVREMAPPER=ON \
> -	-DSKIP_GLSLANG_INSTALL=OFF \
> -	-DUSE_CCACHE=OFF
> +	-DSKIP_GLSLANG_INSTALL=OFF
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> diff --git a/rules/host-glslang.make b/rules/host-glslang.make
> index dcdaa0ee27ab..22a8a26b7701 100644
> --- a/rules/host-glslang.make
> +++ b/rules/host-glslang.make
> @@ -30,7 +30,6 @@ HOST_GLSLANG_CONF_OPT	:= \
>  	-DENABLE_PCH=ON \
>  	-DENABLE_RTTI=OFF \
>  	-DENABLE_SPVREMAPPER=ON \
> -	-DSKIP_GLSLANG_INSTALL=OFF \
> -	-DUSE_CCACHE=OFF
> +	-DSKIP_GLSLANG_INSTALL=OFF
>  
>  # vim: syntax=make

Re: [ptxdist] [APPLIED] spirv-headers: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as 18f230f6b617707a3db5e7246d4f817d262934f4.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:22 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make
> index af0770cf22b7..59d7734fe67d 100644
> --- a/rules/spirv-headers.make
> +++ b/rules/spirv-headers.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
>  #
>  # Paths and names
>  #
> -SPIRV_HEADERS_VERSION	:= 1.3.246.1
> -SPIRV_HEADERS_MD5	:= 34931d32974d05449ddbbe0b86820f2e
> +SPIRV_HEADERS_VERSION	:= 1.3.250.0
> +SPIRV_HEADERS_MD5	:= 86c097b6e1671344b399a5771db6ecdf
>  SPIRV_HEADERS		:= spirv-headers-$(SPIRV_HEADERS_VERSION)
>  SPIRV_HEADERS_SUFFIX	:= tar.gz
>  SPIRV_HEADERS_URL	:= https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
> @@ -31,7 +31,6 @@ SPIRV_HEADERS_LICENSE_FILES := file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae
>  SPIRV_HEADERS_CONF_TOOL	:= cmake
>  SPIRV_HEADERS_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
> -	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> -	-DSPIRV_HEADERS_SKIP_INSTALL=OFF
> +	-DBUILD_TESTS=OFF
>  
>  # vim: syntax=make

Re: [ptxdist] [APPLIED] spirv-tools: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as 60ffe14cac50114e635bc24713b74f3649bf4105.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:23 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-3-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
> index fb469949ec9b..8a4d460bc50d 100644
> --- a/rules/spirv-tools.make
> +++ b/rules/spirv-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
>  #
>  # Paths and names
>  #
> -SPIRV_TOOLS_VERSION	:= 1.3.246.1
> -SPIRV_TOOLS_MD5		:= 9039e41e8294d1a6388935ad8d03837d
> +SPIRV_TOOLS_VERSION	:= 1.3.250.0
> +SPIRV_TOOLS_MD5		:= 3d9dea654f65a28285df53a65cafe252
>  SPIRV_TOOLS		:= spirv-tools-$(SPIRV_TOOLS_VERSION)
>  SPIRV_TOOLS_SUFFIX	:= tar.gz
>  SPIRV_TOOLS_URL		:= https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
> @@ -62,8 +62,7 @@ SPIRV_TOOLS_CONF_OPT	:= \
>  	-DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
>  	-DSPIRV_CHECK_CONTEXT=ON \
>  	-DSPIRV_COLOR_TERMINAL=ON \
> -	-DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
> -	-DSPIRV_HEADERS_SKIP_INSTALL=ON \
> +	-DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
>  	-DSPIRV_LOG_DEBUG=OFF \
>  	-DSPIRV_SKIP_EXECUTABLES=ON \
>  	-DSPIRV_SKIP_TESTS=ON \

Re: [ptxdist] [APPLIED] vulkan-headers: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as eab85e8b34ec1f1f7b1e9bdb596822c3827b949d.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:23 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-4-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make
> index 7b9bb2acbc38..13aaeda147fc 100644
> --- a/rules/vulkan-headers.make
> +++ b/rules/vulkan-headers.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers
>  # Paths and names
>  #
>  
> -VULKAN_HEADERS_VERSION	:= 1.3.246.1
> -VULKAN_HEADERS_MD5	:= 0b27bf3501317564abaa796adb8bfb00
> +VULKAN_HEADERS_VERSION	:= 1.3.250.0
> +VULKAN_HEADERS_MD5	:= 7e249b4a6d077a710dd1d6b4bab4dca6
>  VULKAN_HEADERS		:= vulkan-headers-$(VULKAN_HEADERS_VERSION)
>  VULKAN_HEADERS_SUFFIX	:= tar.gz
>  VULKAN_HEADERS_URL	:= https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)

Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as 56f9f18e7d8f3ed7983ef0e11a4a456db496554f.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:24 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-5-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
> index 02981278de60..d09a78778ffe 100644
> --- a/rules/vulkan-loader.make
> +++ b/rules/vulkan-loader.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader
>  #
>  # Paths and names
>  #
> -VULKAN_LOADER_VERSION	:= 1.3.246.1
> -VULKAN_LOADER_MD5	:= ff7ef0192c49f5d16883bb32f49c4adf
> +VULKAN_LOADER_VERSION	:= 1.3.250.0
> +VULKAN_LOADER_MD5	:= 93be6769ffcf4cd6f8d8513eec84a0ce
>  VULKAN_LOADER		:= vulkan-loader-$(VULKAN_LOADER_VERSION)
>  VULKAN_LOADER_SUFFIX	:= tar.gz
>  VULKAN_LOADER_URL	:= https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
> @@ -32,7 +32,6 @@ VULKAN_LOADER_CONF_TOOL	:= cmake
>  VULKAN_LOADER_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-DCMAKE_BUILD_TYPE=Release \
> -	-DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross \
>  	-DBUILD_TESTS=OFF \
>  	-DBUILD_WSI_DIRECTFB_SUPPORT=OFF \
>  	-DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \

Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as 56957d643ab7e9cfed9a4d6c496cf9b8a9c21b37.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:25 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-6-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
> new file mode 100644
> index 000000000000..c13f0b026a84
> --- /dev/null
> +++ b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
> @@ -0,0 +1,34 @@
> +From: Philipp Zabel <p.zabel@pengutronix.de>
> +Date: Tue, 16 May 2023 10:04:03 +0200
> +Subject: [PATCH] Stop overwriting CMAKE_FIND_ROOT_PATH when cross compiling
> +
> +PTXdist uses CMAKE_FIND_ROOT_PATH [1] to instruct CMake where to find
> +package information when cross-compiling. Stop overwriting this with
> +the contents of CMAKE_PREFIX_PATH [2] in the build system.
> +
> +[1] https://cmake.org/cmake/help/v3.25/variable/CMAKE_FIND_ROOT_PATH.html
> +[2] https://cmake.org/cmake/help/v3.25/variable/CMAKE_PREFIX_PATH.html
> +
> +This issue was introduced with commit e99e3c640ab7 ("cmake: Add
> +UPDATE_DEPS functionality"). It is similar to the same issue in
> +vulkan-validationlayers.
> +
> +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> +---
> + scripts/CMakeLists.txt | 6 +-----
> + 1 file changed, 1 insertion(+), 5 deletions(-)
> +
> +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
> +index 5b979d43de59..3b1ddbdff685 100644
> +--- a/scripts/CMakeLists.txt
> ++++ b/scripts/CMakeLists.txt
> +@@ -113,8 +113,4 @@ if (MOLTENVK_REPO_ROOT)
> +     list(APPEND CMAKE_PREFIX_PATH ${MOLTENVK_REPO_ROOT})
> + endif()
> + 
> +-if (CMAKE_CROSSCOMPILING)
> +-    set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
> +-else()
> +-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
> +-endif()
> ++set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
> diff --git a/patches/vulkan-tools-1.3.250.0/series b/patches/vulkan-tools-1.3.250.0/series
> new file mode 100644
> index 000000000000..3ed158f8be1d
> --- /dev/null
> +++ b/patches/vulkan-tools-1.3.250.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch
> +# ea2ba1941cc64bfae752632f0830f963  - git-ptx-patches magic
> diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
> index dfe608e4a389..fb0d2ff69b27 100644
> --- a/rules/vulkan-tools.make
> +++ b/rules/vulkan-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools
>  #
>  # Paths and names
>  #
> -VULKAN_TOOLS_VERSION	:= 1.3.246.1
> -VULKAN_TOOLS_MD5	:= b6a7c6c46d9ca6c75ce6b9f3777b8e5f
> +VULKAN_TOOLS_VERSION	:= 1.3.250.0
> +VULKAN_TOOLS_MD5	:= 3443149cd1e65abdc4d81ff9f4a2d8ea
>  VULKAN_TOOLS		:= vulkan-tools-$(VULKAN_TOOLS_VERSION)
>  VULKAN_TOOLS_SUFFIX	:= tar.gz
>  VULKAN_TOOLS_URL	:= https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
> @@ -40,7 +40,9 @@ VULKAN_TOOLS_CONF_OPT	:= \
>  	-DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \
>  	-DBUILD_WSI_XLIB_SUPPORT=OFF \
>  	-DENABLE_ADDRESS_SANITIZER=OFF \
> -	-DINSTALL_ICD=OFF
> +	-DINSTALL_ICD=OFF \
> +	-DTOOLS_CODEGEN=OFF \
> +	-DUPDATE_DEPS=OFF
>  
>  ifdef PTXCONF_VULKAN_TOOLS_CUBE
>  VULKAN_TOOLS_CONF_OPT	+= \

Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.3.246.1 -> 1.3.250.0

[Michael Olbrich]

Thanks, applied as 51d702042185bec37022215b7ded0272c1673555.

Michael

[sent from post-receive hook]

On Tue, 06 Jun 2023 09:00:26 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230602135903.694427-7-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch b/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
> deleted file mode 100644
> index 3b625e31120f..000000000000
> --- a/patches/vulkan-validationlayers-1.3.246.1/0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
> +++ /dev/null
> @@ -1,201 +0,0 @@
> -From: Niklas Haas <git@haasn.dev>
> -Date: Thu, 20 Apr 2023 11:51:49 +0200
> -Subject: [PATCH] layers: Fix UB for VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT
> -
> -Several codepaths in the layers called into
> -vkGetPhysicalDeviceImageFormatProperties2KHR without including a valid
> -VkPhysicalDeviceImageDrmFormatModifierInfoEXT, despite this being a
> -requirement for images with DRM format modifier tiling.
> -
> -For the vkBindImageMemory check, there is a hypothetical possibility of
> -the driver returning VK_ERROR_OUT_OF_HOST_MEMORY when querying the
> -image's DRM format. In this case, for lack of anything better to do, we
> -preserve the current behavior.
> -
> -It might make more sense to query the DRM format modifier immediately
> -after image creation and cache it inside the image state, but I didn't
> -want to make that (more invasive) change myself.
> -
> -As an aside, we also correctly specify the specified `sharingMode` when
> -querying for DRM modifier support, which the current code failed to do
> -properly.
> -
> -Co-authored-by: Simon Ser <contact@emersion.fr>
> -
> -closes #5649
> -closes #5687
> -
> -(cherry picked from commit ce2c6eff3457a331efd64da800c5ac393285cf40)
> -
> -Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ----
> - layers/core_checks/device_memory_validation.cpp | 18 ++++++-
> - layers/core_checks/image_validation.cpp         | 72 ++++++++++++++++---------
> - 2 files changed, 62 insertions(+), 28 deletions(-)
> -
> -diff --git a/layers/core_checks/device_memory_validation.cpp b/layers/core_checks/device_memory_validation.cpp
> -index 4a98d6f0922d..555985957dce 100644
> ---- a/layers/core_checks/device_memory_validation.cpp
> -+++ b/layers/core_checks/device_memory_validation.cpp
> -@@ -887,7 +887,7 @@ bool CoreChecks::PreCallValidateMapMemory(VkDevice device, VkDeviceMemory mem, V
> -     return skip;
> - }
> - 
> --bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR* pMemoryMapInfo, void **ppData) const {
> -+bool CoreChecks::PreCallValidateMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData) const {
> -     bool skip = false;
> -     auto mem_info = Get<DEVICE_MEMORY_STATE>(pMemoryMapInfo->memory);
> -     if (mem_info) {
> -@@ -905,7 +905,7 @@ bool CoreChecks::PreCallValidateUnmapMemory(VkDevice device, VkDeviceMemory mem)
> -     return skip;
> - }
> - 
> --bool CoreChecks::PreCallValidateUnmapMemory2KHR(VkDevice device, const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo) const {
> -+bool CoreChecks::PreCallValidateUnmapMemory2KHR(VkDevice device, const VkMemoryUnmapInfoKHR *pMemoryUnmapInfo) const {
> -     bool skip = false;
> -     auto mem_info = Get<DEVICE_MEMORY_STATE>(pMemoryUnmapInfo->memory);
> -     if (mem_info && !mem_info->mapped_range.size) {
> -@@ -1269,6 +1269,10 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t bindInfoCount, const VkBindIma
> - 
> -                 // Validate export memory handles
> -                 if (mem_info->export_handle_type_flags != 0) {
> -+                    auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
> -+                    drm_format_modifier.sharingMode = image_state->createInfo.sharingMode;
> -+                    drm_format_modifier.queueFamilyIndexCount = image_state->createInfo.queueFamilyIndexCount;
> -+                    drm_format_modifier.pQueueFamilyIndices = image_state->createInfo.pQueueFamilyIndices;
> -                     auto external_info = LvlInitStruct<VkPhysicalDeviceExternalImageFormatInfo>();
> -                     auto image_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>(&external_info);
> -                     image_info.format = image_state->createInfo.format;
> -@@ -1283,6 +1287,16 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t bindInfoCount, const VkBindIma
> -                     // Check export operation support
> -                     auto check_export_support = [&](VkExternalMemoryHandleTypeFlagBits flag) {
> -                         external_info.handleType = flag;
> -+                        external_info.pNext = NULL;
> -+                        if (image_state->createInfo.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
> -+                            auto drm_modifier_properties = LvlInitStruct<VkImageDrmFormatModifierPropertiesEXT>();
> -+                            auto result =
> -+                                DispatchGetImageDrmFormatModifierPropertiesEXT(device, bind_info.image, &drm_modifier_properties);
> -+                            if (result == VK_SUCCESS) {
> -+                                external_info.pNext = &drm_format_modifier;
> -+                                drm_format_modifier.drmFormatModifier = drm_modifier_properties.drmFormatModifier;
> -+                            }
> -+                        }
> -                         auto result =
> -                             DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
> -                         if (result != VK_SUCCESS) {
> -diff --git a/layers/core_checks/image_validation.cpp b/layers/core_checks/image_validation.cpp
> -index c56b5dabdd27..35a84c86f8ef 100644
> ---- a/layers/core_checks/image_validation.cpp
> -+++ b/layers/core_checks/image_validation.cpp
> -@@ -176,30 +176,35 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
> -         }
> -     }
> - 
> --    VkImageFormatProperties format_limits = {};
> -+    auto image_format_properties = LvlInitStruct<VkImageFormatProperties2>();
> -+    auto image_format_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>();
> -+    image_format_info.type = pCreateInfo->imageType;
> -+    image_format_info.format = pCreateInfo->format;
> -+    image_format_info.tiling = pCreateInfo->tiling;
> -+    image_format_info.usage = pCreateInfo->usage;
> -+    image_format_info.flags = pCreateInfo->flags;
> -     VkResult result = VK_SUCCESS;
> -     if (pCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
> --        result = DispatchGetPhysicalDeviceImageFormatProperties(physical_device, pCreateInfo->format, pCreateInfo->imageType,
> --                                                                pCreateInfo->tiling, pCreateInfo->usage, pCreateInfo->flags,
> --                                                                &format_limits);
> -+        if (IsExtEnabled(device_extensions.vk_khr_get_physical_device_properties2)) {
> -+            result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info, &image_format_properties);
> -+        } else {
> -+            result = DispatchGetPhysicalDeviceImageFormatProperties(physical_device, pCreateInfo->format, pCreateInfo->imageType,
> -+                                                                    pCreateInfo->tiling, pCreateInfo->usage, pCreateInfo->flags,
> -+                                                                    &image_format_properties.imageFormatProperties);
> -+        }
> -     } else {
> -         auto modifier_list = LvlFindInChain<VkImageDrmFormatModifierListCreateInfoEXT>(pCreateInfo->pNext);
> -         auto explicit_modifier = LvlFindInChain<VkImageDrmFormatModifierExplicitCreateInfoEXT>(pCreateInfo->pNext);
> -+        auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
> -+        image_format_info.pNext = &drm_format_modifier;
> -+        drm_format_modifier.sharingMode = pCreateInfo->sharingMode;
> -+        drm_format_modifier.queueFamilyIndexCount = pCreateInfo->queueFamilyIndexCount;
> -+        drm_format_modifier.pQueueFamilyIndices = pCreateInfo->pQueueFamilyIndices;
> -         if (modifier_list) {
> -             for (uint32_t i = 0; i < modifier_list->drmFormatModifierCount; i++) {
> --                auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
> -                 drm_format_modifier.drmFormatModifier = modifier_list->pDrmFormatModifiers[i];
> --                auto image_format_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>(&drm_format_modifier);
> --                image_format_info.type = pCreateInfo->imageType;
> --                image_format_info.format = pCreateInfo->format;
> --                image_format_info.tiling = pCreateInfo->tiling;
> --                image_format_info.usage = pCreateInfo->usage;
> --                image_format_info.flags = pCreateInfo->flags;
> --                auto image_format_properties = LvlInitStruct<VkImageFormatProperties2>();
> --
> -                 result =
> -                     DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info, &image_format_properties);
> --                format_limits = image_format_properties.imageFormatProperties;
> - 
> -                 /* The application gives a list of modifier and the driver
> -                  * selects one. If one is wrong, stop there.
> -@@ -207,18 +212,8 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
> -                 if (result != VK_SUCCESS) break;
> -             }
> -         } else if (explicit_modifier) {
> --            auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
> -             drm_format_modifier.drmFormatModifier = explicit_modifier->drmFormatModifier;
> --            auto image_format_info = LvlInitStruct<VkPhysicalDeviceImageFormatInfo2>(&drm_format_modifier);
> --            image_format_info.type = pCreateInfo->imageType;
> --            image_format_info.format = pCreateInfo->format;
> --            image_format_info.tiling = pCreateInfo->tiling;
> --            image_format_info.usage = pCreateInfo->usage;
> --            image_format_info.flags = pCreateInfo->flags;
> --            auto image_format_properties = LvlInitStruct<VkImageFormatProperties2>();
> --
> -             result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_format_info, &image_format_properties);
> --            format_limits = image_format_properties.imageFormatProperties;
> -         }
> -     }
> - 
> -@@ -238,6 +233,7 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
> -         }
> - #endif  // VK_USE_PLATFORM_ANDROID_KHR
> -     } else {
> -+        const auto format_limits = image_format_properties.imageFormatProperties;
> -         if (pCreateInfo->mipLevels > format_limits.maxMipLevels) {
> -             skip |= LogError(device, "VUID-VkImageCreateInfo-mipLevels-02255",
> -                              "vkCreateImage(): Image mip levels=%d exceed image format maxMipLevels=%d for format %s.",
> -@@ -468,8 +464,32 @@ bool CoreChecks::PreCallValidateCreateImage(VkDevice device, const VkImageCreate
> - 
> -         auto external_image_properties = LvlInitStruct<VkExternalImageFormatProperties>();
> -         auto image_properties = LvlInitStruct<VkImageFormatProperties2>(&external_image_properties);
> --        result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
> --        const auto compatible_types = external_image_properties.externalMemoryProperties.compatibleHandleTypes;
> -+        VkExternalMemoryHandleTypeFlags compatible_types = 0;
> -+        if (pCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
> -+            result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
> -+            compatible_types = external_image_properties.externalMemoryProperties.compatibleHandleTypes;
> -+        } else {
> -+            auto modifier_list = LvlFindInChain<VkImageDrmFormatModifierListCreateInfoEXT>(pCreateInfo->pNext);
> -+            auto explicit_modifier = LvlFindInChain<VkImageDrmFormatModifierExplicitCreateInfoEXT>(pCreateInfo->pNext);
> -+            auto drm_format_modifier = LvlInitStruct<VkPhysicalDeviceImageDrmFormatModifierInfoEXT>();
> -+            external_image_info.pNext = &drm_format_modifier;
> -+            drm_format_modifier.sharingMode = pCreateInfo->sharingMode;
> -+            drm_format_modifier.queueFamilyIndexCount = pCreateInfo->queueFamilyIndexCount;
> -+            drm_format_modifier.pQueueFamilyIndices = pCreateInfo->pQueueFamilyIndices;
> -+            if (modifier_list) {
> -+                for (uint32_t i = 0; i < modifier_list->drmFormatModifierCount; i++) {
> -+                    drm_format_modifier.drmFormatModifier = modifier_list->pDrmFormatModifiers[i];
> -+                    result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
> -+                    compatible_types |= external_image_properties.externalMemoryProperties.compatibleHandleTypes;
> -+                    if (result != VK_SUCCESS)
> -+                        break;
> -+                }
> -+            } else if (explicit_modifier) {
> -+                drm_format_modifier.drmFormatModifier = explicit_modifier->drmFormatModifier;
> -+                result = DispatchGetPhysicalDeviceImageFormatProperties2(physical_device, &image_info, &image_properties);
> -+                compatible_types = external_image_properties.externalMemoryProperties.compatibleHandleTypes;
> -+            }
> -+        }
> - 
> -         if (result != VK_SUCCESS) {
> -             skip |= LogError(
> diff --git a/patches/vulkan-validationlayers-1.3.246.1/series b/patches/vulkan-validationlayers-1.3.246.1/series
> deleted file mode 100644
> index 33102174e7c3..000000000000
> --- a/patches/vulkan-validationlayers-1.3.246.1/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> -0002-layers-Fix-UB-for-VK_IMAGE_TILING_DRM_FORMAT_MODIFIE.patch
> -# e0d6af34fb6700edc57f14684c9a4c44  - git-ptx-patches magic
> diff --git a/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch b/patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> similarity index 92%
> rename from patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> rename to patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> index c3e3338b0009..4716894cdd34 100644
> --- a/patches/vulkan-validationlayers-1.3.246.1/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> +++ b/patches/vulkan-validationlayers-1.3.250.0/0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> @@ -17,10 +17,10 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
>   1 file changed, 1 insertion(+), 5 deletions(-)
>  
>  diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
> -index f3536cc2a05e..a71de73111a2 100644
> +index 94c8528c83a4..b8aebdd6eca6 100644
>  --- a/scripts/CMakeLists.txt
>  +++ b/scripts/CMakeLists.txt
> -@@ -127,8 +127,4 @@ if (MIMALLOC_INSTALL_DIR)
> +@@ -123,8 +123,4 @@ if (MIMALLOC_INSTALL_DIR)
>       list(APPEND CMAKE_PREFIX_PATH ${MIMALLOC_INSTALL_DIR})
>   endif()
>   
> diff --git a/patches/vulkan-validationlayers-1.3.250.0/series b/patches/vulkan-validationlayers-1.3.250.0/series
> new file mode 100644
> index 000000000000..ac294ce4fb8b
> --- /dev/null
> +++ b/patches/vulkan-validationlayers-1.3.250.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Revert-cmake-Fix-find_-support-when-cross-compiling.patch
> +# 6d856a1a207d0d3f7e4c957af59f9af8  - git-ptx-patches magic
> diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
> index a497ca942c37..1d9361a745fa 100644
> --- a/rules/vulkan-validationlayers.make
> +++ b/rules/vulkan-validationlayers.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
>  #
>  # Paths and names
>  #
> -VULKAN_VALIDATIONLAYERS_VERSION	:= 1.3.246.1
> -VULKAN_VALIDATIONLAYERS_MD5	:= beba63c5c96fadd027ee3c3bd230b19e
> +VULKAN_VALIDATIONLAYERS_VERSION	:= 1.3.250.0
> +VULKAN_VALIDATIONLAYERS_MD5	:= 6452bc13fe2b6cb2b69641f572cb0b7a
>  VULKAN_VALIDATIONLAYERS		:= vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
>  VULKAN_VALIDATIONLAYERS_SUFFIX	:= tar.gz
>  VULKAN_VALIDATIONLAYERS_URL	:= https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)