OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: Update dispatch table gen for Windows

Browse Source 
Update entry null test to deal with MSVC not supporting weak functions.

Also fix warnings for returning from void functions.

Acked-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9121>
This commit is contained in:
James Park
2021-02-03 10:28:47 -08:00
committed by Dave Airlie
parent 10244fe76e
commit 98c622a96e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vulkan/util/vk_dispatch_table_gen.py
View File

@@ -446,7 +446,12 @@ void vk_${type}_dispatch_table_from_entrypoints(
if (overwrite) { if (overwrite) {
memset(dispatch_table, 0, sizeof(*dispatch_table)); memset(dispatch_table, 0, sizeof(*dispatch_table));
for (unsigned i = 0; i < ARRAY_SIZE(${type}_compaction_table); i++) { for (unsigned i = 0; i < ARRAY_SIZE(${type}_compaction_table); i++) {
#ifdef _MSC_VER
const uintptr_t zero = 0;
if (entry[i] == NULL || memcmp(entry[i], &zero, sizeof(zero)) == 0)
#else
if (entry[i] == NULL) if (entry[i] == NULL)
#endif
continue; continue;
unsigned disp_index = ${type}_compaction_table[i]; unsigned disp_index = ${type}_compaction_table[i];
assert(disp[disp_index] == NULL); assert(disp[disp_index] == NULL);
@@ -559,7 +564,11 @@ ${e.prefixed_name('vk_tramp')}(${e.decl_params()})
{ {
<% assert e.params[0].type == 'VkPhysicalDevice' %> <% assert e.params[0].type == 'VkPhysicalDevice' %>
VK_FROM_HANDLE(vk_physical_device, vk_physical_device, ${e.params[0].name}); VK_FROM_HANDLE(vk_physical_device, vk_physical_device, ${e.params[0].name});
% if e.return_type == 'void':
vk_physical_device->dispatch_table.${e.name}(${e.call_params()});
% else:
return vk_physical_device->dispatch_table.${e.name}(${e.call_params()}); return vk_physical_device->dispatch_table.${e.name}(${e.call_params()});
% endif
} }
% if e.guard is not None: % if e.guard is not None:
#endif #endif
@@ -593,10 +602,18 @@ ${e.prefixed_name('vk_tramp')}(${e.decl_params()})
{ {
% if e.params[0].type == 'VkDevice': % if e.params[0].type == 'VkDevice':
VK_FROM_HANDLE(vk_device, vk_device, ${e.params[0].name}); VK_FROM_HANDLE(vk_device, vk_device, ${e.params[0].name});
% if e.return_type == 'void':
vk_device->dispatch_table.${e.name}(${e.call_params()});
% else:
return vk_device->dispatch_table.${e.name}(${e.call_params()}); return vk_device->dispatch_table.${e.name}(${e.call_params()});
% endif
% elif e.params[0].type in ('VkCommandBuffer', 'VkQueue'): % elif e.params[0].type in ('VkCommandBuffer', 'VkQueue'):
struct vk_object_base *vk_object = (struct vk_object_base *)${e.params[0].name}; struct vk_object_base *vk_object = (struct vk_object_base *)${e.params[0].name};
% if e.return_type == 'void':
vk_object->device->dispatch_table.${e.name}(${e.call_params()});
% else:
return vk_object->device->dispatch_table.${e.name}(${e.call_params()}); return vk_object->device->dispatch_table.${e.name}(${e.call_params()});
% endif
% else: % else:
assert(!"Unhandled device child trampoline case: ${e.params[0].type}"); assert(!"Unhandled device child trampoline case: ${e.params[0].type}");
% endif % endif