Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
cmake_minimum_required(VERSION 3.22.1)

# The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
project(Vulkan-Tools VERSION 1.4.342)
project(Vulkan-Tools VERSION 1.4.343)

# This variable enables downstream users to customize the target API
# variant (e.g. Vulkan SC)
Expand Down
2 changes: 1 addition & 1 deletion icd/VkICD_mock_icd.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"file_format_version": "1.0.1",
"ICD": {
"library_path": "@JSON_LIBRARY_PATH@",
"api_version": "1.4.342"
"api_version": "1.4.343"
}
}
17 changes: 17 additions & 0 deletions icd/generated/function_declarations.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
#ifdef VK_USE_PLATFORM_OHOS
{"VK_OHOS_surface", VK_OHOS_SURFACE_SPEC_VERSION},
#endif
#ifdef VK_USE_PLATFORM_UBM_SEC
{"VK_SEC_ubm_surface", VK_SEC_UBM_SURFACE_SPEC_VERSION},
#endif
};
// Map of device extension name to version
static const std::unordered_map<std::string, uint32_t> device_extension_map = {
Expand Down Expand Up @@ -2960,7 +2963,15 @@ static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT(VkCommandBuffer comma

static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV(VkCommandBuffer commandBuffer,
const VkComputeOccupancyPriorityParametersNV* pParameters);
#ifdef VK_USE_PLATFORM_UBM_SEC

static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, const VkUbmSurfaceCreateInfoSEC* pCreateInfo,
const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);

static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
struct ubm_device* ubm_device);
#endif /* VK_USE_PLATFORM_UBM_SEC */
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device,
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
Expand Down Expand Up @@ -3955,6 +3966,12 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
{"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT},
{"vkCmdBeginCustomResolveEXT", (void*)CmdBeginCustomResolveEXT},
{"vkCmdSetComputeOccupancyPriorityNV", (void*)CmdSetComputeOccupancyPriorityNV},
#ifdef VK_USE_PLATFORM_UBM_SEC
{"vkCreateUbmSurfaceSEC", (void*)CreateUbmSurfaceSEC},
#endif
#ifdef VK_USE_PLATFORM_UBM_SEC
{"vkGetPhysicalDeviceUbmPresentationSupportSEC", (void*)GetPhysicalDeviceUbmPresentationSupportSEC},
#endif
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},
{"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR},
Expand Down
14 changes: 14 additions & 0 deletions icd/generated/function_definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -4456,6 +4456,20 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV(VkCommandBuff
const VkComputeOccupancyPriorityParametersNV* pParameters) {
// Not a CREATE or DESTROY function
}
#ifdef VK_USE_PLATFORM_UBM_SEC
static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, const VkUbmSurfaceCreateInfoSEC* 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 GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
struct ubm_device* ubm_device) {
// Not a CREATE or DESTROY function
return VK_SUCCESS;
}
#endif /* VK_USE_PLATFORM_UBM_SEC */
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device,
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
Expand Down
13 changes: 13 additions & 0 deletions icd/generated/vk_typemap_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -13012,6 +13012,19 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_PARTITIONED
typedef VkPhysicalDeviceShaderSubgroupPartitionedFeaturesEXT Type;
};

#ifdef VK_USE_PLATFORM_UBM_SEC
// Map type VkUbmSurfaceCreateInfoSEC to id VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC
template <>
struct LvlTypeMap<VkUbmSurfaceCreateInfoSEC> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC;
};

template <>
struct LvlSTypeMap<VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC> {
typedef VkUbmSurfaceCreateInfoSEC Type;
};

#endif // VK_USE_PLATFORM_UBM_SEC
// Map type VkAccelerationStructureGeometryTrianglesDataKHR to id
// VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR
template <>
Expand Down
4 changes: 2 additions & 2 deletions scripts/known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
"commit": "v1.4.342"
"commit": "v1.4.343"
},
{
"name": "MoltenVK",
Expand Down Expand Up @@ -56,7 +56,7 @@
"cmake_options": [
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
],
"commit": "v1.4.342",
"commit": "v1.4.343",
"build_platforms": [
"windows",
"linux",
Expand Down
8 changes: 7 additions & 1 deletion vulkaninfo/generated/vulkaninfo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1750,6 +1750,12 @@ std::string VkFormatString(VkFormat value) {
return "FORMAT_ASTC_6x6x6_SFLOAT_BLOCK_EXT";
case (VK_FORMAT_R8_BOOL_ARM):
return "FORMAT_R8_BOOL_ARM";
case (VK_FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM):
return "FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM";
case (VK_FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E4M3_ARM):
return "FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E4M3_ARM";
case (VK_FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E5M2_ARM):
return "FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E5M2_ARM";
case (VK_FORMAT_R16G16_SFIXED5_NV):
return "FORMAT_R16G16_SFIXED5_NV";
case (VK_FORMAT_R10X6_UINT_PACK16_ARM):
Expand Down Expand Up @@ -12302,7 +12308,7 @@ auto format_ranges = std::array{
FormatRange{0, VK_IMG_FORMAT_PVRTC_EXTENSION_NAME, static_cast<VkFormat>(1000054000), static_cast<VkFormat>(1000054007)},
FormatRange{0, VK_EXT_TEXTURE_COMPRESSION_ASTC_3D_EXTENSION_NAME, static_cast<VkFormat>(1000288000),
static_cast<VkFormat>(1000288029)},
FormatRange{0, VK_ARM_TENSORS_EXTENSION_NAME, static_cast<VkFormat>(1000460000), static_cast<VkFormat>(1000460000)},
FormatRange{0, VK_ARM_TENSORS_EXTENSION_NAME, static_cast<VkFormat>(1000460000), static_cast<VkFormat>(1000460003)},
FormatRange{0, VK_NV_OPTICAL_FLOW_EXTENSION_NAME, static_cast<VkFormat>(1000464000), static_cast<VkFormat>(1000464000)},
FormatRange{0, VK_ARM_FORMAT_PACK_EXTENSION_NAME, static_cast<VkFormat>(1000609000), static_cast<VkFormat>(1000609013)},
};
Expand Down
Loading