diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generate_vulkan_wrapper.py | 6 | ||||
| -rw-r--r-- | scripts/known_good.json | 4 | ||||
| -rw-r--r-- | scripts/mock_icd_generator.py | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 9243d9af..da573f2a 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -632,6 +632,11 @@ VK_KHR_pipeline_executable_properties = Extension(name='VK_KHR_pipeline_executab Command(name='vkGetPipelineExecutableInternalRepresentationsKHR', dispatch='VkDevice'), ]) +VK_KHR_map_memory2 = Extension(name='VK_KHR_map_memory2', version=1, guard=None, commands=[ + Command(name='vkMapMemory2KHR', dispatch='VkDevice'), + Command(name='vkUnmapMemory2KHR', dispatch='VkDevice'), +]) + VK_KHR_shader_integer_dot_product = Extension(name='VK_KHR_shader_integer_dot_product', version=1, guard=None, commands=[ ]) @@ -1769,6 +1774,7 @@ extensions = [ VK_KHR_buffer_device_address, VK_KHR_deferred_host_operations, VK_KHR_pipeline_executable_properties, + VK_KHR_map_memory2, VK_KHR_shader_integer_dot_product, VK_KHR_pipeline_library, VK_KHR_shader_non_semantic_info, diff --git a/scripts/known_good.json b/scripts/known_good.json index f56c769f..9aeb26ee 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.3.243" + "commit": "v1.3.244" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit": "v1.3.243", + "commit": "v1.3.244", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index b6c460b5..eeef3829 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -1031,6 +1031,9 @@ CUSTOM_C_INTERCEPTS = { *ppData = map_addr; return VK_SUCCESS; ''', +'vkMapMemory2KHR': ''' + return MapMemory(device, pMemoryMapInfo->memory, pMemoryMapInfo->offset, pMemoryMapInfo->size, pMemoryMapInfo->flags, ppData); +''', 'vkUnmapMemory': ''' unique_lock_t lock(global_lock); for (auto map_addr : mapped_memory_map[memory]) { @@ -1038,6 +1041,10 @@ CUSTOM_C_INTERCEPTS = { } mapped_memory_map.erase(memory); ''', +'vkUnmapMemory2KHR': ''' + UnmapMemory(device, pMemoryUnmapInfo->memory); + return VK_SUCCESS; +''', 'vkGetImageSubresourceLayout': ''' // Need safe values. Callers are computing memory offsets from pLayout, with no return code to flag failure. *pLayout = VkSubresourceLayout(); // Default constructor zero values. |