Use VUL safe_struct

.gitmodules

@@ -1,15 +1,12 @@
 [submodule "khronos/vulkan"]
 	path = source_third_party/khronos/vulkan
 	url = https://github.com/KhronosGroup/Vulkan-Headers
-[submodule "khronos/opengles"]
-	path = source_third_party/khronos/opengles
-	url = https://github.com/KhronosGroup/OpenGL-Registry
-[submodule "khronos/egl"]
-	path = source_third_party/khronos/egl
-	url = https://github.com/KhronosGroup/EGL-Registry
 [submodule "source_third_party/gtest"]
 	path = source_third_party/gtest
 	url = https://github.com/google/googletest
 [submodule "source_third_party/protopuf"]
 	path = source_third_party/protopuf
 	url = https://github.com/PragmaTwice/protopuf.git
+[submodule "source_third_party/khronos/vulkan-utilities"]
+	path = source_third_party/khronos/vulkan-utilities
+	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries/

generator/vk_codegen/source_CMakeLists.txt

@@ -53,7 +53,8 @@ target_include_directories(
 
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
-        ../../source_third_party/khronos/vulkan/include/)
+        ../../source_third_party/khronos/vulkan/include/
+        ../../source_third_party/khronos/vulkan-utilities/include/)
 
 lgl_set_build_options(${VK_LAYER})
 

layer_example/source/CMakeLists.txt

@@ -54,7 +54,8 @@ target_include_directories(
 
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
-        ../../source_third_party/khronos/vulkan/include/)
+        ../../source_third_party/khronos/vulkan/include/
+        ../../source_third_party/khronos/vulkan-utilities/include/)
 
 lgl_set_build_options(${VK_LAYER})
 

layer_gpu_support/source/CMakeLists.txt

@@ -62,7 +62,8 @@ target_include_directories(
 target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
         ../../source_third_party/
-        ../../source_third_party/khronos/vulkan/include/)
+        ../../source_third_party/khronos/vulkan/include/
+        ../../source_third_party/khronos/vulkan-utilities/include/)
 
 lgl_set_build_options(${VK_LAYER})
 

layer_gpu_support/source/layer_device_functions_image.cpp

@@ -22,6 +22,8 @@
  * IN THE SOFTWARE.
  * ----------------------------------------------------------------------------
  */
+#include <vulkan/utility/vk_safe_struct.hpp>
+#include <vulkan/utility/vk_struct_helper.hpp>
 
 #include "device.hpp"
 #include "framework/device_dispatch_table.hpp"
@@ -119,40 +121,36 @@ VKAPI_ATTR VkResult VKAPI_CALL layer_vkCreateImage<user_tag>(VkDevice device,
         }
     }
 
-    VkImageCreateInfo newCreateInfo = *pCreateInfo;
-
-    VkImageCompressionControlEXT newCompressionControl;
-    // TODO: This currently relies on const_cast to make user struct writable
-    //       We should replace this with a generic clone (issue #56)
-    auto* userCompressionControl =
-        searchNextList<VkImageCompressionControlEXT>(VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_CONTROL_EXT,
-                                                     pCreateInfo->pNext);
+    // Create modifiable structures we can patch
+    vku::safe_VkImageCreateInfo newCreateInfoSafe(pCreateInfo);
+    auto* newCreateInfo = reinterpret_cast<VkImageCreateInfo*>(&newCreateInfoSafe);
+    void* pNextBase = const_cast<void*>(newCreateInfoSafe.pNext);
 
+    // Create extra structures we allocate here, but populate elsewhere
+    VkImageCompressionControlEXT newCompressionControl = vku::InitStructHelper();
     VkImageCompressionControlEXT* compressionControl = &newCompressionControl;
+
+    auto* userCompressionControl = vku::FindStructInPNextChain<VkImageCompressionControlEXT>(pNextBase);
     if (userCompressionControl)
     {
         compressionControl = userCompressionControl;
     }
 
     bool patchNeeded = compressionControl != userCompressionControl;
-
     if (forceDisable)
     {
-        compressionControl->sType = VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_CONTROL_EXT;
         compressionControl->flags = VK_IMAGE_COMPRESSION_DISABLED_EXT;
         compressionControl->compressionControlPlaneCount = 0;
         compressionControl->pFixedRateFlags = nullptr;
     }
     else if (forceDefault)
     {
-        compressionControl->sType = VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_CONTROL_EXT;
         compressionControl->flags = VK_IMAGE_COMPRESSION_DEFAULT_EXT;
         compressionControl->compressionControlPlaneCount = 0;
         compressionControl->pFixedRateFlags = nullptr;
     }
     else if (selectedLevel)
     {
-        compressionControl->sType = VK_STRUCTURE_TYPE_IMAGE_COMPRESSION_CONTROL_EXT;
         compressionControl->flags = VK_IMAGE_COMPRESSION_FIXED_RATE_EXPLICIT_EXT;
         compressionControl->compressionControlPlaneCount = 1;
         compressionControl->pFixedRateFlags = reinterpret_cast<VkImageCompressionFixedRateFlagsEXT*>(&selectedLevel);
@@ -162,12 +160,11 @@ VKAPI_ATTR VkResult VKAPI_CALL layer_vkCreateImage<user_tag>(VkDevice device,
         patchNeeded = false;
     }
 
-    // If this is new, patch it in to the pNext chain
+    // Add a config if not already configured by the application
     if (patchNeeded)
     {
-        compressionControl->pNext = newCreateInfo.pNext;
-        newCreateInfo.pNext = reinterpret_cast<const void*>(compressionControl);
+        vku::AddToPnext(newCreateInfoSafe, *compressionControl);
     }
 
-    return layer->driver.vkCreateImage(device, &newCreateInfo, pAllocator, pImage);
+    return layer->driver.vkCreateImage(device, newCreateInfo, pAllocator, pImage);
 }

layer_gpu_timeline/source/CMakeLists.txt

@@ -66,6 +66,7 @@ target_include_directories(
     ${VK_LAYER} SYSTEM PRIVATE
         ../../source_third_party/
         ../../source_third_party/khronos/vulkan/include/
+        ../../source_third_party/khronos/vulkan-utilities/include/
         ../../source_third_party/protopuf/include/)
 
 lgl_set_build_options(${VK_LAYER})

source_common/comms/CMakeLists.txt

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -33,12 +33,13 @@ add_library(
 target_include_directories(
     ${LIB_BINARY} PRIVATE
         ../
-        ../../source_third_party/khronos/vulkan/include/)
+        ../../source_third_party/khronos/vulkan/include/
+        ../../source_third_party/khronos/vulkan-utilities/include/)
 
 lgl_set_build_options(${LIB_BINARY})
 
 if(${LGL_UNITTEST})
     add_subdirectory(test)
 endif()
 
-add_clang_tools()
+add_clang_tools()

source_common/comms/test/CMakeLists.txt

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -34,6 +34,7 @@ target_include_directories(
         ../../
         ../../../source_third_party/
         ../../../source_third_party/khronos/vulkan/include
+        ../../source_third_party/khronos/vulkan-utilities/include/
         ${gtest_SOURCE_DIR}/include)
 
 target_link_libraries(
@@ -76,4 +77,4 @@ install(
     TARGETS ${TEST_BINARY}
     DESTINATION bin)
 
-add_clang_tools()
+add_clang_tools()

source_common/framework/CMakeLists.txt

@@ -26,9 +26,14 @@ set(LIB_BINARY lib_layer_framework)
 add_library(
     ${LIB_BINARY} STATIC
         device_functions.cpp
-        device_query.cpp
         instance_functions.cpp
-        manual_functions.cpp)
+        manual_functions.cpp
+        ../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_core.cpp
+        ../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_ext.cpp
+        ../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_khr.cpp
+        ../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_manual.cpp
+        ../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_utils.cpp
+        ../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_vendor.cpp)
 
 target_include_directories(
     ${LIB_BINARY} PRIVATE
@@ -41,8 +46,9 @@ target_include_directories(
     ${LIB_BINARY} SYSTEM PRIVATE
         ../
         ../../source_third_party/
-        ../../source_third_party/khronos/vulkan/include/)
+        ../../source_third_party/khronos/vulkan/include/
+        ../../source_third_party/khronos/vulkan-utilities/include/)
 
 lgl_set_build_options(${LIB_BINARY})
 
-add_clang_tools()
+add_clang_tools()