diff --git a/CMakeLists.txt b/CMakeLists.txt index b65e46dc..52f3b1a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ option(VULKANSC "Build Vulkan SC tools" ON) # The VERSION field is generated with the "--generated-version" flag in the generate_source.py script if(VULKANSC) - project(Vulkan-Tools VERSION 1.0.20) # vulkansc + project(Vulkan-Tools VERSION 1.0.21) # vulkansc else() project(Vulkan-Tools VERSION 1.4.344) # vulkan endif() diff --git a/devsim/profiles_generated.cpp b/devsim/profiles_generated.cpp index 42153b7b..baf597f9 100644 --- a/devsim/profiles_generated.cpp +++ b/devsim/profiles_generated.cpp @@ -1192,35 +1192,6 @@ static VkImageLayout StringToImageLayout(const std::string &input_value) { static uint64_t VkStringToUint64(const std::string &input_value) { static const std::unordered_map map = { - // VkBufferUsageFlagBits - {"VK_BUFFER_USAGE_TRANSFER_SRC_BIT", static_cast(VK_BUFFER_USAGE_TRANSFER_SRC_BIT)}, - {"VK_BUFFER_USAGE_TRANSFER_DST_BIT", static_cast(VK_BUFFER_USAGE_TRANSFER_DST_BIT)}, - {"VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_STORAGE_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_INDEX_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_INDEX_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_VERTEX_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT)}, - {"VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT", static_cast(VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT)}, - // VkSampleCountFlagBits - {"VK_SAMPLE_COUNT_1_BIT", static_cast(VK_SAMPLE_COUNT_1_BIT)}, - {"VK_SAMPLE_COUNT_2_BIT", static_cast(VK_SAMPLE_COUNT_2_BIT)}, - {"VK_SAMPLE_COUNT_4_BIT", static_cast(VK_SAMPLE_COUNT_4_BIT)}, - {"VK_SAMPLE_COUNT_8_BIT", static_cast(VK_SAMPLE_COUNT_8_BIT)}, - {"VK_SAMPLE_COUNT_16_BIT", static_cast(VK_SAMPLE_COUNT_16_BIT)}, - {"VK_SAMPLE_COUNT_32_BIT", static_cast(VK_SAMPLE_COUNT_32_BIT)}, - {"VK_SAMPLE_COUNT_64_BIT", static_cast(VK_SAMPLE_COUNT_64_BIT)}, - // VkQueueFlagBits - {"VK_QUEUE_GRAPHICS_BIT", static_cast(VK_QUEUE_GRAPHICS_BIT)}, - {"VK_QUEUE_COMPUTE_BIT", static_cast(VK_QUEUE_COMPUTE_BIT)}, - {"VK_QUEUE_TRANSFER_BIT", static_cast(VK_QUEUE_TRANSFER_BIT)}, - {"VK_QUEUE_PROTECTED_BIT", static_cast(VK_QUEUE_PROTECTED_BIT)}, - // VkPipelineRobustnessBufferBehavior - {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT)}, - {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED)}, - {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS)}, - {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2)}, // VkSubgroupFeatureFlagBits {"VK_SUBGROUP_FEATURE_BASIC_BIT", static_cast(VK_SUBGROUP_FEATURE_BASIC_BIT)}, {"VK_SUBGROUP_FEATURE_VOTE_BIT", static_cast(VK_SUBGROUP_FEATURE_VOTE_BIT)}, @@ -1232,6 +1203,34 @@ static uint64_t VkStringToUint64(const std::string &input_value) { {"VK_SUBGROUP_FEATURE_QUAD_BIT", static_cast(VK_SUBGROUP_FEATURE_QUAD_BIT)}, {"VK_SUBGROUP_FEATURE_ROTATE_BIT", static_cast(VK_SUBGROUP_FEATURE_ROTATE_BIT)}, {"VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT", static_cast(VK_SUBGROUP_FEATURE_ROTATE_CLUSTERED_BIT)}, + // VkImageUsageFlagBits + {"VK_IMAGE_USAGE_TRANSFER_SRC_BIT", static_cast(VK_IMAGE_USAGE_TRANSFER_SRC_BIT)}, + {"VK_IMAGE_USAGE_TRANSFER_DST_BIT", static_cast(VK_IMAGE_USAGE_TRANSFER_DST_BIT)}, + {"VK_IMAGE_USAGE_SAMPLED_BIT", static_cast(VK_IMAGE_USAGE_SAMPLED_BIT)}, + {"VK_IMAGE_USAGE_STORAGE_BIT", static_cast(VK_IMAGE_USAGE_STORAGE_BIT)}, + {"VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)}, + {"VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)}, + {"VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT)}, + {"VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)}, + {"VK_IMAGE_USAGE_HOST_TRANSFER_BIT", static_cast(VK_IMAGE_USAGE_HOST_TRANSFER_BIT)}, + {"VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR", static_cast(VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR)}, + // VkQueueFlagBits + {"VK_QUEUE_GRAPHICS_BIT", static_cast(VK_QUEUE_GRAPHICS_BIT)}, + {"VK_QUEUE_COMPUTE_BIT", static_cast(VK_QUEUE_COMPUTE_BIT)}, + {"VK_QUEUE_TRANSFER_BIT", static_cast(VK_QUEUE_TRANSFER_BIT)}, + {"VK_QUEUE_PROTECTED_BIT", static_cast(VK_QUEUE_PROTECTED_BIT)}, + // VkSampleCountFlagBits + {"VK_SAMPLE_COUNT_1_BIT", static_cast(VK_SAMPLE_COUNT_1_BIT)}, + {"VK_SAMPLE_COUNT_2_BIT", static_cast(VK_SAMPLE_COUNT_2_BIT)}, + {"VK_SAMPLE_COUNT_4_BIT", static_cast(VK_SAMPLE_COUNT_4_BIT)}, + {"VK_SAMPLE_COUNT_8_BIT", static_cast(VK_SAMPLE_COUNT_8_BIT)}, + {"VK_SAMPLE_COUNT_16_BIT", static_cast(VK_SAMPLE_COUNT_16_BIT)}, + {"VK_SAMPLE_COUNT_32_BIT", static_cast(VK_SAMPLE_COUNT_32_BIT)}, + {"VK_SAMPLE_COUNT_64_BIT", static_cast(VK_SAMPLE_COUNT_64_BIT)}, + // VkShaderFloatControlsIndependence + {"VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY", static_cast(VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY)}, + {"VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL", static_cast(VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL)}, + {"VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE", static_cast(VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE)}, // VkToolPurposeFlagBits {"VK_TOOL_PURPOSE_VALIDATION_BIT", static_cast(VK_TOOL_PURPOSE_VALIDATION_BIT)}, {"VK_TOOL_PURPOSE_PROFILING_BIT", static_cast(VK_TOOL_PURPOSE_PROFILING_BIT)}, @@ -1244,6 +1243,30 @@ static uint64_t VkStringToUint64(const std::string &input_value) { {"VK_RESOLVE_MODE_AVERAGE_BIT", static_cast(VK_RESOLVE_MODE_AVERAGE_BIT)}, {"VK_RESOLVE_MODE_MIN_BIT", static_cast(VK_RESOLVE_MODE_MIN_BIT)}, {"VK_RESOLVE_MODE_MAX_BIT", static_cast(VK_RESOLVE_MODE_MAX_BIT)}, + // VkBufferUsageFlagBits + {"VK_BUFFER_USAGE_TRANSFER_SRC_BIT", static_cast(VK_BUFFER_USAGE_TRANSFER_SRC_BIT)}, + {"VK_BUFFER_USAGE_TRANSFER_DST_BIT", static_cast(VK_BUFFER_USAGE_TRANSFER_DST_BIT)}, + {"VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_STORAGE_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_INDEX_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_INDEX_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_VERTEX_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_VERTEX_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT", static_cast(VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT)}, + {"VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT", static_cast(VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT)}, + // VkPipelineRobustnessBufferBehavior + {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT)}, + {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED)}, + {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS)}, + {"VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2", static_cast(VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2)}, + // VkPointClippingBehavior + {"VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES", static_cast(VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES)}, + {"VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY", static_cast(VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY)}, + // VkPipelineRobustnessImageBehavior + {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT)}, + {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED)}, + {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS)}, + {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2)}, // VkShaderStageFlagBits {"VK_SHADER_STAGE_VERTEX_BIT", static_cast(VK_SHADER_STAGE_VERTEX_BIT)}, {"VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT", static_cast(VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT)}, @@ -1253,29 +1276,6 @@ static uint64_t VkStringToUint64(const std::string &input_value) { {"VK_SHADER_STAGE_COMPUTE_BIT", static_cast(VK_SHADER_STAGE_COMPUTE_BIT)}, {"VK_SHADER_STAGE_ALL_GRAPHICS", static_cast(VK_SHADER_STAGE_ALL_GRAPHICS)}, {"VK_SHADER_STAGE_ALL", static_cast(VK_SHADER_STAGE_ALL)}, - // VkPointClippingBehavior - {"VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES", static_cast(VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES)}, - {"VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY", static_cast(VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY)}, - // VkImageUsageFlagBits - {"VK_IMAGE_USAGE_TRANSFER_SRC_BIT", static_cast(VK_IMAGE_USAGE_TRANSFER_SRC_BIT)}, - {"VK_IMAGE_USAGE_TRANSFER_DST_BIT", static_cast(VK_IMAGE_USAGE_TRANSFER_DST_BIT)}, - {"VK_IMAGE_USAGE_SAMPLED_BIT", static_cast(VK_IMAGE_USAGE_SAMPLED_BIT)}, - {"VK_IMAGE_USAGE_STORAGE_BIT", static_cast(VK_IMAGE_USAGE_STORAGE_BIT)}, - {"VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)}, - {"VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)}, - {"VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT)}, - {"VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT", static_cast(VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)}, - {"VK_IMAGE_USAGE_HOST_TRANSFER_BIT", static_cast(VK_IMAGE_USAGE_HOST_TRANSFER_BIT)}, - {"VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR", static_cast(VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR)}, - // VkShaderFloatControlsIndependence - {"VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY", static_cast(VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY)}, - {"VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL", static_cast(VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL)}, - {"VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE", static_cast(VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE)}, - // VkPipelineRobustnessImageBehavior - {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT)}, - {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DISABLED)}, - {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS)}, - {"VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2", static_cast(VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2)}, }; const auto it = map.find(input_value); if (it != map.end()) { diff --git a/icd/VkICD_mock_icd_vksc.json.in b/icd/VkICD_mock_icd_vksc.json.in index d0adc69e..0758cbec 100644 --- a/icd/VkICD_mock_icd_vksc.json.in +++ b/icd/VkICD_mock_icd_vksc.json.in @@ -2,6 +2,6 @@ "file_format_version": "1.0.1", "ICD": { "library_path": "@JSON_LIBRARY_PATH@", - "api_version": "1.0.20" + "api_version": "1.0.21" } } \ No newline at end of file diff --git a/scripts/known_good.json b/scripts/known_good.json index c5608146..86f9a675 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -19,7 +19,7 @@ "cmake_options": [ "-DGEN_VULKANSC_COMBINED=ON" ], - "commit": "ba3b55609702243722fea9db42941a4ebc9a50c0" + "commit": "vksc1.0.21" }, { "name": "Vulkan-Utility-Libraries", @@ -28,7 +28,7 @@ "sub_dir": "Vulkan-Utility-Libraries", "build_dir": "Vulkan-Utility-Libraries/build", "install_dir": "Vulkan-Utility-Libraries/build/install", - "commit": "50a3c053901e12559b5c1942da8d6c5f3c34eb98", + "commit": "vksc1.0.21", "deps": [ { "var_name": "VULKAN_HEADERS_INSTALL_DIR", @@ -135,7 +135,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "7ce86b2cbe9c235a41f7c748bb9f1d03148b1815", + "commit": "vksc1.0.21", "build_platforms": [ "windows", "linux",