build: Update to header 1.2.178
- Update known-good
- Generate source
Change-Id: Iecb34b6221526dc5c6153c736fce894488989066
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index fd1d450..3c81b98 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-v1.2.177
+v1.2.178
diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp
index f4253ea..03b8dd9 100644
--- a/common/vulkan_wrapper.cpp
+++ b/common/vulkan_wrapper.cpp
@@ -830,6 +830,11 @@
PFN_vkCmdBeginQueryIndexedEXT vkCmdBeginQueryIndexedEXT;
PFN_vkCmdEndQueryIndexedEXT vkCmdEndQueryIndexedEXT;
PFN_vkCmdDrawIndirectByteCountEXT vkCmdDrawIndirectByteCountEXT;
+PFN_vkCreateCuModuleNVX vkCreateCuModuleNVX;
+PFN_vkCreateCuFunctionNVX vkCreateCuFunctionNVX;
+PFN_vkDestroyCuModuleNVX vkDestroyCuModuleNVX;
+PFN_vkDestroyCuFunctionNVX vkDestroyCuFunctionNVX;
+PFN_vkCmdCuLaunchKernelNVX vkCmdCuLaunchKernelNVX;
PFN_vkGetImageViewHandleNVX vkGetImageViewHandleNVX;
PFN_vkGetImageViewAddressNVX vkGetImageViewAddressNVX;
PFN_vkCmdDrawIndirectCountAMD vkCmdDrawIndirectCountAMD;
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index 0f3e398..92c01cf 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -3653,6 +3653,52 @@
}
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCuModuleNVX(
+ VkDevice device,
+ const VkCuModuleCreateInfoNVX* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCuModuleNVX* pModule)
+{
+ unique_lock_t lock(global_lock);
+ *pModule = (VkCuModuleNVX)global_unique_handle++;
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCuFunctionNVX(
+ VkDevice device,
+ const VkCuFunctionCreateInfoNVX* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCuFunctionNVX* pFunction)
+{
+ unique_lock_t lock(global_lock);
+ *pFunction = (VkCuFunctionNVX)global_unique_handle++;
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCuModuleNVX(
+ VkDevice device,
+ VkCuModuleNVX module,
+ const VkAllocationCallbacks* pAllocator)
+{
+//Destroy object
+}
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCuFunctionNVX(
+ VkDevice device,
+ VkCuFunctionNVX function,
+ const VkAllocationCallbacks* pAllocator)
+{
+//Destroy object
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdCuLaunchKernelNVX(
+ VkCommandBuffer commandBuffer,
+ const VkCuLaunchInfoNVX* pLaunchInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+
static VKAPI_ATTR uint32_t VKAPI_CALL GetImageViewHandleNVX(
VkDevice device,
const VkImageViewHandleInfoNVX* pInfo)
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h
index 0fe83b8..6681c68 100644
--- a/icd/generated/mock_icd.h
+++ b/icd/generated/mock_icd.h
@@ -98,10 +98,10 @@
{"VK_EXT_debug_marker", 4},
{"VK_KHR_video_queue", 1},
{"VK_KHR_video_decode_queue", 1},
- {"VK_KHR_video_encode_queue", 2},
{"VK_AMD_gcn_shader", 1},
{"VK_NV_dedicated_allocation", 1},
{"VK_EXT_transform_feedback", 1},
+ {"VK_NVX_binary_import", 1},
{"VK_NVX_image_view_handle", 2},
{"VK_AMD_draw_indirect_count", 2},
{"VK_AMD_negative_viewport_height", 1},
@@ -273,6 +273,7 @@
{"VK_KHR_shader_non_semantic_info", 1},
{"VK_EXT_private_data", 1},
{"VK_EXT_pipeline_creation_cache_control", 3},
+ {"VK_KHR_video_encode_queue", 2},
{"VK_NV_device_diagnostics_config", 1},
{"VK_QCOM_render_pass_store_ops", 2},
{"VK_KHR_synchronization2", 1},
@@ -2204,6 +2205,33 @@
uint32_t vertexStride);
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCuModuleNVX(
+ VkDevice device,
+ const VkCuModuleCreateInfoNVX* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCuModuleNVX* pModule);
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCuFunctionNVX(
+ VkDevice device,
+ const VkCuFunctionCreateInfoNVX* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCuFunctionNVX* pFunction);
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCuModuleNVX(
+ VkDevice device,
+ VkCuModuleNVX module,
+ const VkAllocationCallbacks* pAllocator);
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCuFunctionNVX(
+ VkDevice device,
+ VkCuFunctionNVX function,
+ const VkAllocationCallbacks* pAllocator);
+
+static VKAPI_ATTR void VKAPI_CALL CmdCuLaunchKernelNVX(
+ VkCommandBuffer commandBuffer,
+ const VkCuLaunchInfoNVX* pLaunchInfo);
+
+
static VKAPI_ATTR uint32_t VKAPI_CALL GetImageViewHandleNVX(
VkDevice device,
const VkImageViewHandleInfoNVX* pInfo);
@@ -3651,6 +3679,11 @@
{"vkCmdBeginQueryIndexedEXT", (void*)CmdBeginQueryIndexedEXT},
{"vkCmdEndQueryIndexedEXT", (void*)CmdEndQueryIndexedEXT},
{"vkCmdDrawIndirectByteCountEXT", (void*)CmdDrawIndirectByteCountEXT},
+ {"vkCreateCuModuleNVX", (void*)CreateCuModuleNVX},
+ {"vkCreateCuFunctionNVX", (void*)CreateCuFunctionNVX},
+ {"vkDestroyCuModuleNVX", (void*)DestroyCuModuleNVX},
+ {"vkDestroyCuFunctionNVX", (void*)DestroyCuFunctionNVX},
+ {"vkCmdCuLaunchKernelNVX", (void*)CmdCuLaunchKernelNVX},
{"vkGetImageViewHandleNVX", (void*)GetImageViewHandleNVX},
{"vkGetImageViewAddressNVX", (void*)GetImageViewAddressNVX},
{"vkCmdDrawIndirectCountAMD", (void*)CmdDrawIndirectCountAMD},
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index de70dd4..279fbd3 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -2680,6 +2680,33 @@
typedef VkPipelineRasterizationStateStreamCreateInfoEXT Type;
};
+// Map type VkCuModuleCreateInfoNVX to id VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX
+template <> struct LvlTypeMap<VkCuModuleCreateInfoNVX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX> {
+ typedef VkCuModuleCreateInfoNVX Type;
+};
+
+// Map type VkCuFunctionCreateInfoNVX to id VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX
+template <> struct LvlTypeMap<VkCuFunctionCreateInfoNVX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX> {
+ typedef VkCuFunctionCreateInfoNVX Type;
+};
+
+// Map type VkCuLaunchInfoNVX to id VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX
+template <> struct LvlTypeMap<VkCuLaunchInfoNVX> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX> {
+ typedef VkCuLaunchInfoNVX Type;
+};
+
// Map type VkImageViewHandleInfoNVX to id VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX
template <> struct LvlTypeMap<VkImageViewHandleInfoNVX> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX;
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index 7be526e..22eeb1c 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -634,6 +634,14 @@
Command(name='vkCmdDrawIndirectByteCountEXT', dispatch='VkCommandBuffer'),
])
+VK_NVX_binary_import = Extension(name='VK_NVX_binary_import', version=1, guard=None, commands=[
+ Command(name='vkCreateCuModuleNVX', dispatch='VkDevice'),
+ Command(name='vkCreateCuFunctionNVX', dispatch='VkDevice'),
+ Command(name='vkDestroyCuModuleNVX', dispatch='VkDevice'),
+ Command(name='vkDestroyCuFunctionNVX', dispatch='VkDevice'),
+ Command(name='vkCmdCuLaunchKernelNVX', dispatch='VkCommandBuffer'),
+])
+
VK_NVX_image_view_handle = Extension(name='VK_NVX_image_view_handle', version=2, guard=None, commands=[
Command(name='vkGetImageViewHandleNVX', dispatch='VkDevice'),
Command(name='vkGetImageViewAddressNVX', dispatch='VkDevice'),
@@ -1391,6 +1399,7 @@
VK_AMD_gcn_shader,
VK_NV_dedicated_allocation,
VK_EXT_transform_feedback,
+ VK_NVX_binary_import,
VK_NVX_image_view_handle,
VK_AMD_draw_indirect_count,
VK_AMD_negative_viewport_height,
diff --git a/scripts/known_good.json b/scripts/known_good.json
index a428c81..cefd926 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.177"
+ "commit" : "v1.2.178"
},
{
"name" : "MoltenVK",
@@ -30,7 +30,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.2.177",
+ "commit" : "v1.2.178",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",
diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp
index b3569a7..b834fca 100644
--- a/vulkaninfo/generated/vulkaninfo.hpp
+++ b/vulkaninfo/generated/vulkaninfo.hpp
@@ -94,6 +94,7 @@
case (13): return "DRIVER_ID_MESA_LLVMPIPE";
case (14): return "DRIVER_ID_MOLTENVK";
case (15): return "DRIVER_ID_COREAVI_PROPRIETARY";
+ case (16): return "DRIVER_ID_JUICE_PROPRIETARY";
default: return "UNKNOWN_VkDriverId";
}
}
@@ -575,11 +576,11 @@
if (0x2000 & value) strings.push_back("FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG");
if (0x2000000 & value) strings.push_back("FORMAT_FEATURE_VIDEO_DECODE_OUTPUT_BIT_KHR");
if (0x4000000 & value) strings.push_back("FORMAT_FEATURE_VIDEO_DECODE_DPB_BIT_KHR");
- if (0x8000000 & value) strings.push_back("FORMAT_FEATURE_VIDEO_ENCODE_INPUT_BIT_KHR");
- if (0x10000000 & value) strings.push_back("FORMAT_FEATURE_VIDEO_ENCODE_DPB_BIT_KHR");
if (0x20000000 & value) strings.push_back("FORMAT_FEATURE_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR");
if (0x1000000 & value) strings.push_back("FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT");
if (0x40000000 & value) strings.push_back("FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR");
+ if (0x8000000 & value) strings.push_back("FORMAT_FEATURE_VIDEO_ENCODE_INPUT_BIT_KHR");
+ if (0x10000000 & value) strings.push_back("FORMAT_FEATURE_VIDEO_ENCODE_DPB_BIT_KHR");
return strings;
}
void DumpVkFormatFeatureFlags(Printer &p, std::string name, VkFormatFeatureFlags value, int width = 0) {
@@ -614,11 +615,11 @@
if (0x400 & value) strings.push_back("IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR");
if (0x800 & value) strings.push_back("IMAGE_USAGE_VIDEO_DECODE_SRC_BIT_KHR");
if (0x1000 & value) strings.push_back("IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR");
+ if (0x100 & value) strings.push_back("IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV");
+ if (0x200 & value) strings.push_back("IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT");
if (0x2000 & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_DST_BIT_KHR");
if (0x4000 & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR");
if (0x8000 & value) strings.push_back("IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR");
- if (0x100 & value) strings.push_back("IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV");
- if (0x200 & value) strings.push_back("IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT");
return strings;
}
void DumpVkImageUsageFlags(Printer &p, std::string name, VkImageUsageFlags value, int width = 0) {
