glave: Rename XGL to vulkan
diff --git a/tools/glave/scripts/vk_generate.py b/tools/glave/scripts/vk_generate.py
index 570a203..386a7cc 100755
--- a/tools/glave/scripts/vk_generate.py
+++ b/tools/glave/scripts/vk_generate.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# XGL
+# Vulkan
#
# Copyright (C) 2014 LunarG, Inc.
#
@@ -25,18 +25,18 @@
import os, sys
-# add main repo directory so xgl.py can be imported. This needs to be a complete path.
+# add main repo directory so vulkan.py can be imported. This needs to be a complete path.
glv_scripts_path = os.path.dirname(os.path.abspath(__file__))
main_path = os.path.abspath(glv_scripts_path + "/../../../")
sys.path.append(main_path)
-import xgl
+import vulkan
class Subcommand(object):
def __init__(self, argv):
self.argv = argv
- self.headers = xgl.headers
- self.protos = xgl.protos
+ self.headers = vulkan.headers
+ self.protos = vulkan.protos
def run(self):
print(self.generate())
@@ -63,7 +63,7 @@
return """/* THIS FILE IS GENERATED. DO NOT EDIT. */
/*
- * XGL
+ * Vulkan
*
* Copyright (C) 2014 LunarG, Inc.
*
@@ -96,31 +96,35 @@
pass
# Return set of printf '%' qualifier, input to that qualifier, and any dereference
- def _get_printf_params(self, xgl_type, name, output_param):
+ def _get_printf_params(self, vk_type, name, output_param):
deref = ""
# TODO : Need ENUM and STRUCT checks here
- if "_TYPE" in xgl_type: # TODO : This should be generic ENUM check
- return ("%s", "string_%s(%s)" % (xgl_type.replace('const ', '').strip('*'), name), deref)
- if "char*" == xgl_type:
+ if "VK_IMAGE_LAYOUT" in vk_type:
+ return ("%s", "string_%s(%s)" % (vk_type.replace('const ', '').strip('*'), name), deref)
+ if "VK_CLEAR_COLOR" in vk_type:
+ return ("%p", "(void*)&%s" % name, deref)
+ if "_type" in vk_type.lower(): # TODO : This should be generic ENUM check
+ return ("%s", "string_%s(%s)" % (vk_type.replace('const ', '').strip('*'), name), deref)
+ if "char*" == vk_type:
return ("%s", name, "*")
- if "uint64_t" in xgl_type:
- if '*' in xgl_type:
+ if "uint64_t" in vk_type:
+ if '*' in vk_type:
return ("%lu", "(%s == NULL) ? 0 : *(%s)" % (name, name), "*")
return ("%lu", name, deref)
- if "size_t" in xgl_type:
- if '*' in xgl_type:
+ if "size_t" in vk_type:
+ if '*' in vk_type:
return ("%zu", "(%s == NULL) ? 0 : *(%s)" % (name, name), "*")
return ("%zu", name, deref)
- if "float" in xgl_type:
- if '[' in xgl_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
+ if "float" in vk_type:
+ if '[' in vk_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
return ("[%f, %f, %f, %f]", "%s[0], %s[1], %s[2], %s[3]" % (name, name, name, name), deref)
return ("%f", name, deref)
- if "bool" in xgl_type or 'xcb_randr_crtc_t' in xgl_type:
+ if "bool" in vk_type or 'xcb_randr_crtc_t' in vk_type:
return ("%u", name, deref)
- if True in [t in xgl_type for t in ["int", "FLAGS", "MASK", "xcb_window_t"]]:
- if '[' in xgl_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
+ if True in [t in vk_type.lower() for t in ["int", "flags", "mask", "xcb_window_t"]]:
+ if '[' in vk_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
return ("[%i, %i, %i, %i]", "%s[0], %s[1], %s[2], %s[3]" % (name, name, name, name), deref)
- if '*' in xgl_type:
+ if '*' in vk_type:
return ("%i", "(%s == NULL) ? 0 : *(%s)" % (name, name), "*")
return ("%i", name, deref)
if output_param:
@@ -134,13 +138,13 @@
func_ptrs.append('extern INIT_ONCE gInitOnce;')
for proto in self.protos:
if True not in [skip_str in proto.name for skip_str in ['Dbg', 'Wsi']]: #Dbg' not in proto.name and 'Wsi' not in proto.name:
- func_ptrs.append('#define __HOOKED_xgl%s hooked_xgl%s' % (proto.name, proto.name))
+ func_ptrs.append('#define __HOOKED_vk%s hooked_vk%s' % (proto.name, proto.name))
func_ptrs.append('\n#elif defined(PLATFORM_LINUX)')
func_ptrs.append('extern pthread_once_t gInitOnce;')
for proto in self.protos:
if True not in [skip_str in proto.name for skip_str in ['Dbg', 'Wsi']]:
- func_ptrs.append('#define __HOOKED_xgl%s xgl%s' % (proto.name, proto.name))
+ func_ptrs.append('#define __HOOKED_vk%s vk%s' % (proto.name, proto.name))
func_ptrs.append('#endif\n')
return "\n".join(func_ptrs)
@@ -150,12 +154,12 @@
func_ptrs.append('#ifdef WIN32')
for proto in self.protos:
if func_class in proto.name:
- func_ptrs.append('#define __HOOKED_xgl%s hooked_xgl%s' % (proto.name, proto.name))
+ func_ptrs.append('#define __HOOKED_vk%s hooked_vk%s' % (proto.name, proto.name))
func_ptrs.append('#elif defined(__linux__)')
for proto in self.protos:
if func_class in proto.name:
- func_ptrs.append('#define __HOOKED_xgl%s xgl%s' % (proto.name, proto.name))
+ func_ptrs.append('#define __HOOKED_vk%s vk%s' % (proto.name, proto.name))
func_ptrs.append('#endif\n')
return "\n".join(func_ptrs)
@@ -165,7 +169,7 @@
func_protos.append('// Hooked function prototypes\n')
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
- func_protos.append('GLVTRACER_EXPORT %s;' % proto.c_func(prefix="__HOOKED_xgl", attr="XGLAPI"))
+ func_protos.append('GLVTRACER_EXPORT %s;' % proto.c_func(prefix="__HOOKED_vk", attr="VKAPI"))
return "\n".join(func_protos)
@@ -174,7 +178,7 @@
func_protos.append('// Hooked function prototypes\n')
for proto in self.protos:
if func_class in proto.name:
- func_protos.append('GLVTRACER_EXPORT %s;' % proto.c_func(prefix="__HOOKED_xgl", attr="XGLAPI"))
+ func_protos.append('GLVTRACER_EXPORT %s;' % proto.c_func(prefix="__HOOKED_vk", attr="VKAPI"))
return "\n".join(func_protos)
@@ -184,9 +188,9 @@
func_ptr_assign.append('')
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
- func_ptr_assign.append('extern %s( XGLAPI * real_xgl%s)(' % (proto.ret, proto.name))
+ func_ptr_assign.append('extern %s( VKAPI * real_vk%s)(' % (proto.ret, proto.name))
for p in proto.params:
- if 'color' == p.name and 'XGL_CLEAR_COLOR' != p.ty:
+ if 'color' == p.name:
func_ptr_assign.append(' %s %s[4],' % (p.ty.replace('[4]', ''), p.name))
else:
func_ptr_assign.append(' %s %s,' % (p.ty, p.name))
@@ -197,13 +201,13 @@
func_ptr_assign = []
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
- func_ptr_assign.append('%s( XGLAPI * real_xgl%s)(' % (proto.ret, proto.name))
+ func_ptr_assign.append('%s( VKAPI * real_vk%s)(' % (proto.ret, proto.name))
for p in proto.params:
- if 'color' == p.name and 'XGL_CLEAR_COLOR' != p.ty:
+ if 'color' == p.name:
func_ptr_assign.append(' %s %s[4],' % (p.ty.replace('[4]', ''), p.name))
else:
func_ptr_assign.append(' %s %s,' % (p.ty, p.name))
- func_ptr_assign[-1] = func_ptr_assign[-1].replace(',', ') = xgl%s;\n' % (proto.name))
+ func_ptr_assign[-1] = func_ptr_assign[-1].replace(',', ') = vk%s;\n' % (proto.name))
return "\n".join(func_ptr_assign)
@@ -211,110 +215,110 @@
func_ptr_assign = []
for proto in self.protos:
if func_class in proto.name:
- func_ptr_assign.append('static %s( XGLAPI * real_xgl%s)(' % (proto.ret, proto.name))
+ func_ptr_assign.append('static %s( VKAPI * real_vk%s)(' % (proto.ret, proto.name))
for p in proto.params:
func_ptr_assign.append(' %s %s,' % (p.ty, p.name))
- func_ptr_assign[-1] = func_ptr_assign[-1].replace(',', ') = xgl%s;\n' % (proto.name))
+ func_ptr_assign[-1] = func_ptr_assign[-1].replace(',', ') = vk%s;\n' % (proto.name))
return "\n".join(func_ptr_assign)
def _generate_attach_hooks(self):
hooks_txt = []
- hooks_txt.append('// declared as extern in glvtrace_xgl_helpers.h')
+ hooks_txt.append('// declared as extern in glvtrace_vk_helpers.h')
hooks_txt.append('BOOL isHooked = FALSE;\n')
hooks_txt.append('void AttachHooks()\n{\n BOOL hookSuccess = TRUE;\n#if defined(WIN32)')
hooks_txt.append(' Mhook_BeginMultiOperation(FALSE);')
# TODO : Verify if CreateInstance is appropriate to key off of here
- hooks_txt.append(' if (real_xglCreateInstance != NULL)')
+ hooks_txt.append(' if (real_vkCreateInstance != NULL)')
hooks_txt.append(' {\n isHooked = TRUE;')
hook_operator = '='
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
- hooks_txt.append(' hookSuccess %s Mhook_SetHook((PVOID*)&real_xgl%s, hooked_xgl%s);' % (hook_operator, proto.name, proto.name))
+ hooks_txt.append(' hookSuccess %s Mhook_SetHook((PVOID*)&real_vk%s, hooked_vk%s);' % (hook_operator, proto.name, proto.name))
hook_operator = '&='
hooks_txt.append(' }\n')
hooks_txt.append(' if (!hookSuccess)\n {')
- hooks_txt.append(' glv_LogError("Failed to hook XGL.");\n }\n')
+ hooks_txt.append(' glv_LogError("Failed to hook Vulkan.");\n }\n')
hooks_txt.append(' Mhook_EndMultiOperation();\n')
hooks_txt.append('#elif defined(__linux__)')
- hooks_txt.append(' if (real_xglCreateInstance == xglCreateInstance)')
- hooks_txt.append(' hookSuccess = glv_platform_get_next_lib_sym((PVOID*)&real_xglCreateInstance,"xglCreateInstance");')
+ hooks_txt.append(' if (real_vkCreateInstance == vkCreateInstance)')
+ hooks_txt.append(' hookSuccess = glv_platform_get_next_lib_sym((PVOID*)&real_vkCreateInstance,"vkCreateInstance");')
hooks_txt.append(' isHooked = TRUE;')
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name and 'CreateInstance' not in proto.name:
- hooks_txt.append(' hookSuccess %s glv_platform_get_next_lib_sym((PVOID*)&real_xgl%s, "xgl%s");' % (hook_operator, proto.name, proto.name))
+ hooks_txt.append(' hookSuccess %s glv_platform_get_next_lib_sym((PVOID*)&real_vk%s, "vk%s");' % (hook_operator, proto.name, proto.name))
hooks_txt.append(' if (!hookSuccess)\n {')
- hooks_txt.append(' glv_LogError("Failed to hook XGL.");\n }\n')
+ hooks_txt.append(' glv_LogError("Failed to hook Vulkan.");\n }\n')
hooks_txt.append('#endif\n}\n')
return "\n".join(hooks_txt)
def _generate_attach_hooks_ext(self, func_class='Wsi'):
- func_ext_dict = {'Wsi': '_xglwsix11ext', 'Dbg': '_xgldbg'}
+ func_ext_dict = {'Wsi': '_vkwsix11ext', 'Dbg': '_vkdbg'}
first_proto_dict = {'Wsi': 'WsiX11AssociateConnection', 'Dbg': 'DbgSetValidationLevel'}
hooks_txt = []
hooks_txt.append('void AttachHooks%s()\n{\n BOOL hookSuccess = TRUE;\n#if defined(WIN32)' % func_ext_dict[func_class])
hooks_txt.append(' Mhook_BeginMultiOperation(FALSE);')
- hooks_txt.append(' if (real_xgl%s != NULL)' % first_proto_dict[func_class])
+ hooks_txt.append(' if (real_vk%s != NULL)' % first_proto_dict[func_class])
hooks_txt.append(' {')
hook_operator = '='
for proto in self.protos:
if func_class in proto.name:
- hooks_txt.append(' hookSuccess %s Mhook_SetHook((PVOID*)&real_xgl%s, hooked_xgl%s);' % (hook_operator, proto.name, proto.name))
+ hooks_txt.append(' hookSuccess %s Mhook_SetHook((PVOID*)&real_vk%s, hooked_vk%s);' % (hook_operator, proto.name, proto.name))
hook_operator = '&='
hooks_txt.append(' }\n')
hooks_txt.append(' if (!hookSuccess)\n {')
- hooks_txt.append(' glv_LogError("Failed to hook XGL ext %s.");\n }\n' % func_class)
+ hooks_txt.append(' glv_LogError("Failed to hook Vulkan ext %s.");\n }\n' % func_class)
hooks_txt.append(' Mhook_EndMultiOperation();\n')
hooks_txt.append('#elif defined(__linux__)')
- hooks_txt.append(' hookSuccess = glv_platform_get_next_lib_sym((PVOID*)&real_xgl%s, "xgl%s");' % (first_proto_dict[func_class], first_proto_dict[func_class]))
+ hooks_txt.append(' hookSuccess = glv_platform_get_next_lib_sym((PVOID*)&real_vk%s, "vk%s");' % (first_proto_dict[func_class], first_proto_dict[func_class]))
for proto in self.protos:
if func_class in proto.name and first_proto_dict[func_class] not in proto.name:
- hooks_txt.append(' hookSuccess %s glv_platform_get_next_lib_sym((PVOID*)&real_xgl%s, "xgl%s");' % (hook_operator, proto.name, proto.name))
+ hooks_txt.append(' hookSuccess %s glv_platform_get_next_lib_sym((PVOID*)&real_vk%s, "vk%s");' % (hook_operator, proto.name, proto.name))
hooks_txt.append(' if (!hookSuccess)\n {')
- hooks_txt.append(' glv_LogError("Failed to hook XGL ext %s.");\n }\n' % func_class)
+ hooks_txt.append(' glv_LogError("Failed to hook Vulkan ext %s.");\n }\n' % func_class)
hooks_txt.append('#endif\n}\n')
return "\n".join(hooks_txt)
def _generate_detach_hooks(self):
hooks_txt = []
hooks_txt.append('void DetachHooks()\n{\n#ifdef __linux__\n return;\n#elif defined(WIN32)')
- hooks_txt.append(' BOOL unhookSuccess = TRUE;\n if (real_xglGetGpuInfo != NULL)\n {')
+ hooks_txt.append(' BOOL unhookSuccess = TRUE;\n if (real_vkGetGpuInfo != NULL)\n {')
hook_operator = '='
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
- hooks_txt.append(' unhookSuccess %s Mhook_Unhook((PVOID*)&real_xgl%s);' % (hook_operator, proto.name))
+ hooks_txt.append(' unhookSuccess %s Mhook_Unhook((PVOID*)&real_vk%s);' % (hook_operator, proto.name))
hook_operator = '&='
hooks_txt.append(' }\n isHooked = FALSE;')
hooks_txt.append(' if (!unhookSuccess)\n {')
- hooks_txt.append(' glv_LogError("Failed to unhook XGL.");\n }')
+ hooks_txt.append(' glv_LogError("Failed to unhook Vulkan.");\n }')
hooks_txt.append('#endif\n}')
hooks_txt.append('#ifdef WIN32\nINIT_ONCE gInitOnce = INIT_ONCE_STATIC_INIT;\n#elif defined(PLATFORM_LINUX)\npthread_once_t gInitOnce = PTHREAD_ONCE_INIT;\n#endif\n')
return "\n".join(hooks_txt)
def _generate_detach_hooks_ext(self, func_class='Wsi'):
- func_ext_dict = {'Wsi': '_xglwsix11ext', 'Dbg': '_xgldbg'}
+ func_ext_dict = {'Wsi': '_vkwsix11ext', 'Dbg': '_vkdbg'}
first_proto_dict = {'Wsi': 'WsiX11AssociateConnection', 'Dbg': 'DbgSetValidationLevel'}
hooks_txt = []
hooks_txt.append('void DetachHooks%s()\n{\n#ifdef WIN32' % func_ext_dict[func_class])
- hooks_txt.append(' BOOL unhookSuccess = TRUE;\n if (real_xgl%s != NULL)\n {' % first_proto_dict[func_class])
+ hooks_txt.append(' BOOL unhookSuccess = TRUE;\n if (real_vk%s != NULL)\n {' % first_proto_dict[func_class])
hook_operator = '='
for proto in self.protos:
if func_class in proto.name:
- hooks_txt.append(' unhookSuccess %s Mhook_Unhook((PVOID*)&real_xgl%s);' % (hook_operator, proto.name))
+ hooks_txt.append(' unhookSuccess %s Mhook_Unhook((PVOID*)&real_vk%s);' % (hook_operator, proto.name))
hook_operator = '&='
hooks_txt.append(' }')
hooks_txt.append(' if (!unhookSuccess)\n {')
- hooks_txt.append(' glv_LogError("Failed to unhook XGL ext %s.");\n }' % func_class)
+ hooks_txt.append(' glv_LogError("Failed to unhook Vulkan ext %s.");\n }' % func_class)
hooks_txt.append('#elif defined(__linux__)\n return;\n#endif\n}\n')
return "\n".join(hooks_txt)
def _generate_init_funcs(self):
init_tracer = []
- init_tracer.append('void send_xgl_api_version_packet()\n{')
- init_tracer.append(' struct_xglApiVersion* pPacket;')
+ init_tracer.append('void send_vk_api_version_packet()\n{')
+ init_tracer.append(' struct_vkApiVersion* pPacket;')
init_tracer.append(' glv_trace_packet_header* pHeader;')
- init_tracer.append(' pHeader = glv_create_trace_packet(GLV_TID_XGL, GLV_TPI_XGL_xglApiVersion, sizeof(struct_xglApiVersion), 0);')
- init_tracer.append(' pPacket = interpret_body_as_xglApiVersion(pHeader, FALSE);')
- init_tracer.append(' pPacket->version = XGL_API_VERSION;')
+ init_tracer.append(' pHeader = glv_create_trace_packet(GLV_TID_VULKAN, GLV_TPI_VK_vkApiVersion, sizeof(struct_vkApiVersion), 0);')
+ init_tracer.append(' pPacket = interpret_body_as_vkApiVersion(pHeader, FALSE);')
+ init_tracer.append(' pPacket->version = VK_API_VERSION;')
init_tracer.append(' FINISH_TRACE_PACKET();\n}\n')
init_tracer.append('extern GLV_CRITICAL_SECTION g_memInfoLock;')
@@ -322,12 +326,12 @@
init_tracer.append(' char *ipAddr = glv_get_global_var("GLVLIB_TRACE_IPADDR");')
init_tracer.append(' if (ipAddr == NULL)')
init_tracer.append(' ipAddr = "127.0.0.1";')
- init_tracer.append(' gMessageStream = glv_MessageStream_create(FALSE, ipAddr, GLV_BASE_PORT + GLV_TID_XGL);')
+ init_tracer.append(' gMessageStream = glv_MessageStream_create(FALSE, ipAddr, GLV_BASE_PORT + GLV_TID_VULKAN);')
init_tracer.append(' glv_trace_set_trace_file(glv_FileLike_create_msg(gMessageStream));')
init_tracer.append('// glv_tracelog_set_log_file(glv_FileLike_create_file(fopen("glv_log_traceside.txt","w")));')
- init_tracer.append(' glv_tracelog_set_tracer_id(GLV_TID_XGL);')
+ init_tracer.append(' glv_tracelog_set_tracer_id(GLV_TID_VULKAN);')
init_tracer.append(' glv_create_critical_section(&g_memInfoLock);')
- init_tracer.append(' send_xgl_api_version_packet();\n}\n')
+ init_tracer.append(' send_vk_api_version_packet();\n}\n')
return "\n".join(init_tracer)
# Take a list of params and return a list of dicts w/ ptr param details
@@ -336,11 +340,11 @@
# TODO : This is a slightly nicer way to handle custom cases than initial code, however
# this can still be further generalized to eliminate more custom code
# big case to handle is when ptrs to structs have embedded data that needs to be accounted for in packet
- custom_ptr_dict = {'XGL_DEVICE_CREATE_INFO': {'add_txt': 'add_XGL_DEVICE_CREATE_INFO_to_packet(pHeader, (XGL_DEVICE_CREATE_INFO**) &(pPacket->pCreateInfo), pCreateInfo)',
+ custom_ptr_dict = {'VK_DEVICE_CREATE_INFO': {'add_txt': 'add_VK_DEVICE_CREATE_INFO_to_packet(pHeader, (VK_DEVICE_CREATE_INFO**) &(pPacket->pCreateInfo), pCreateInfo)',
'finalize_txt': ''},
- 'XGL_INSTANCE_CREATE_INFO': {'add_txt': 'add_XGL_INSTANCE_CREATE_INFO_to_packet(pHeader, (XGL_INSTANCE_CREATE_INFO**)&(pPacket->pCreateInfo), pCreateInfo)',
+ 'VK_APPLICATION_INFO': {'add_txt': 'add_VK_APPLICATION_INFO_to_packet(pHeader, (VK_APPLICATION_INFO**)&(pPacket->pAppInfo), pAppInfo)',
'finalize_txt': ''},
- 'XGL_PHYSICAL_GPU': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pGpus), *pGpuCount*sizeof(XGL_PHYSICAL_GPU), pGpus)',
+ 'VK_PHYSICAL_GPU': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pGpus), *pGpuCount*sizeof(VK_PHYSICAL_GPU), pGpus)',
'finalize_txt': 'default'},
'pDataSize': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pDataSize), sizeof(size_t), &_dataSize)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pDataSize))'},
@@ -352,25 +356,27 @@
'finalize_txt': 'default'},
'pDescriptorSets': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pDescriptorSets), customSize, pDescriptorSets)',
'finalize_txt': 'default'},
- 'XGL_SHADER_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_SHADER_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pCode), ((pCreateInfo != NULL) ? pCreateInfo->codeSize : 0), pCreateInfo->pCode)',
+ 'pUpdateChain': {'add_txt': 'add_update_descriptors_to_trace_packet(pHeader, (void**)&(pPacket->pUpdateChain), pUpdateChain)',
+ 'finalize_txt': 'default'},
+ 'VK_SHADER_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_SHADER_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pCode), ((pCreateInfo != NULL) ? pCreateInfo->codeSize : 0), pCreateInfo->pCode)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pCode));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
- 'XGL_FRAMEBUFFER_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_FRAMEBUFFER_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorAttachments), colorCount * sizeof(XGL_COLOR_ATTACHMENT_BIND_INFO), pCreateInfo->pColorAttachments);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pDepthStencilAttachment), dsSize, pCreateInfo->pDepthStencilAttachment)',
+ 'VK_FRAMEBUFFER_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_FRAMEBUFFER_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorAttachments), colorCount * sizeof(VK_COLOR_ATTACHMENT_BIND_INFO), pCreateInfo->pColorAttachments);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pDepthStencilAttachment), dsSize, pCreateInfo->pDepthStencilAttachment)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pColorAttachments));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pDepthStencilAttachment));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
- 'XGL_RENDER_PASS_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_RENDER_PASS_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadOps), colorCount * sizeof(XGL_ATTACHMENT_LOAD_OP), pCreateInfo->pColorLoadOps);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorStoreOps), colorCount * sizeof(XGL_ATTACHMENT_STORE_OP), pCreateInfo->pColorStoreOps);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadClearValues), colorCount * sizeof(XGL_CLEAR_COLOR), pCreateInfo->pColorLoadClearValues)',
+ 'VK_RENDER_PASS_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_RENDER_PASS_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadOps), colorCount * sizeof(VK_ATTACHMENT_LOAD_OP), pCreateInfo->pColorLoadOps);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorStoreOps), colorCount * sizeof(VK_ATTACHMENT_STORE_OP), pCreateInfo->pColorStoreOps);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadClearValues), colorCount * sizeof(VK_CLEAR_COLOR), pCreateInfo->pColorLoadClearValues)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadOps));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pColorStoreOps));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pColorLoadClearValues));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
- 'XGL_CMD_BUFFER_BEGIN_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pBeginInfo), sizeof(XGL_CMD_BUFFER_BEGIN_INFO), pBeginInfo);\n add_begin_cmdbuf_to_trace_packet(pHeader, (void**)&(pPacket->pBeginInfo->pNext), pBeginInfo->pNext)',
+ 'VK_CMD_BUFFER_BEGIN_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pBeginInfo), sizeof(VK_CMD_BUFFER_BEGIN_INFO), pBeginInfo);\n add_begin_cmdbuf_to_trace_packet(pHeader, (void**)&(pPacket->pBeginInfo->pNext), pBeginInfo->pNext)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pBeginInfo))'},
- 'XGL_DYNAMIC_VP_STATE_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_DYNAMIC_VP_STATE_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pViewports), vpsCount * sizeof(XGL_VIEWPORT), pCreateInfo->pViewports);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pScissors), vpsCount * sizeof(XGL_RECT), pCreateInfo->pScissors)',
+ 'VK_DYNAMIC_VP_STATE_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_DYNAMIC_VP_STATE_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pViewports), vpsCount * sizeof(VK_VIEWPORT), pCreateInfo->pViewports);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pScissors), vpsCount * sizeof(VK_RECT), pCreateInfo->pScissors)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pViewports));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pScissors));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
- 'XGL_MEMORY_ALLOC_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pAllocInfo), sizeof(XGL_MEMORY_ALLOC_INFO), pAllocInfo);\n add_alloc_memory_to_trace_packet(pHeader, (void**)&(pPacket->pAllocInfo->pNext), pAllocInfo->pNext)',
+ 'VK_MEMORY_ALLOC_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pAllocInfo), sizeof(VK_MEMORY_ALLOC_INFO), pAllocInfo);\n add_alloc_memory_to_trace_packet(pHeader, (void**)&(pPacket->pAllocInfo->pNext), pAllocInfo->pNext)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pAllocInfo))'},
- 'XGL_GRAPHICS_PIPELINE_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO), pCreateInfo);\n add_pipeline_state_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pNext), pCreateInfo->pNext)',
+ 'VK_GRAPHICS_PIPELINE_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_GRAPHICS_PIPELINE_CREATE_INFO), pCreateInfo);\n add_pipeline_state_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pNext), pCreateInfo->pNext)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
- 'XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO': {'add_txt': 'if (pCreateInfo)\n add_create_ds_layout_to_trace_packet(pHeader, &(pPacket->pCreateInfo), pCreateInfo)',
- 'finalize_txt': '// pCreateInfo finalized in add_create_ds_layout_to_trace_packet'},
- 'XGL_DESCRIPTOR_POOL_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_DESCRIPTOR_POOL_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pTypeCount), rgCount * sizeof(XGL_DESCRIPTOR_TYPE_COUNT), pCreateInfo->pTypeCount)',
+ 'VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pSetLayoutInfoList), sizeof(VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO), pSetLayoutInfoList);\n if (pSetLayoutInfoList)\n add_create_ds_layout_to_trace_packet(pHeader, (void**)&(pPacket->pSetLayoutInfoList->pNext), pSetLayoutInfoList->pNext)',
+ 'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pSetLayoutInfoList))'},
+ 'VK_DESCRIPTOR_REGION_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_DESCRIPTOR_REGION_CREATE_INFO), pCreateInfo);\n glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pTypeCount), rgCount * sizeof(VK_DESCRIPTOR_TYPE_COUNT), pCreateInfo->pTypeCount)',
'finalize_txt': 'glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo->pTypeCount));\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
- 'XGL_COMPUTE_PIPELINE_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(XGL_COMPUTE_PIPELINE_CREATE_INFO), pCreateInfo);\n add_pipeline_state_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pNext), pCreateInfo->pNext);\n add_pipeline_shader_to_trace_packet(pHeader, (XGL_PIPELINE_SHADER*)&pPacket->pCreateInfo->cs, &pCreateInfo->cs)',
+ 'VK_COMPUTE_PIPELINE_CREATE_INFO': {'add_txt': 'glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo), sizeof(VK_COMPUTE_PIPELINE_CREATE_INFO), pCreateInfo);\n add_pipeline_state_to_trace_packet(pHeader, (void**)&(pPacket->pCreateInfo->pNext), pCreateInfo->pNext);\n add_pipeline_shader_to_trace_packet(pHeader, (VK_PIPELINE_SHADER*)&pPacket->pCreateInfo->cs, &pCreateInfo->cs)',
'finalize_txt': 'finalize_pipeline_shader_address(pHeader, &pPacket->pCreateInfo->cs);\n glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pCreateInfo))'},
}
for p in params:
@@ -399,11 +405,17 @@
def _get_packet_size(self, params):
ps = [] # List of elements to be added together to account for packet size for given params
skip_list = [] # store params that are already accounted for so we don't count them twice
+ # Dict of specific params with unique custom sizes
+ custom_size_dict = {'pSetBindPoints': '(VK_SHADER_STAGE_COMPUTE * sizeof(uint32_t))', # Accounting for largest possible array
+ }
for p in params:
#First handle custom cases
- if p.name in ['pCreateInfo', 'pBeginInfo', 'pAllocInfo']:
+ if p.name in ['pCreateInfo', 'pUpdateChain', 'pSetLayoutInfoList', 'pBeginInfo', 'pAllocInfo']:
ps.append('get_struct_chain_size((void*)%s)' % p.name)
skip_list.append(p.name)
+ elif p.name in custom_size_dict:
+ ps.append(custom_size_dict[p.name])
+ skip_list.append(p.name)
# Skip any params already handled
if p.name in skip_list:
continue
@@ -434,7 +446,7 @@
elif 'pDataSize' in p.name:
ps.append('((pDataSize != NULL) ? sizeof(size_t) : 0)')
elif 'IMAGE_SUBRESOURCE' in p.ty and 'pSubresource' == p.name:
- ps.append('((pSubresource != NULL) ? sizeof(XGL_IMAGE_SUBRESOURCE) : 0)')
+ ps.append('((pSubresource != NULL) ? sizeof(VK_IMAGE_SUBRESOURCE) : 0)')
else:
ps.append('sizeof(%s)' % (p.ty.strip('*').replace('const ', '')))
return ps
@@ -456,14 +468,14 @@
'CmdPipelineBarrier', 'CmdWaitEvents']
for proto in self.protos:
if proto.name in manually_written_hooked_funcs:
- func_body.append( '// __HOOKED_xgl%s is manually written. Look in glvtrace_xgl_trace.c\n' % proto.name)
+ func_body.append( '// __HOOKED_vk%s is manually written. Look in glvtrace_vk_trace.c\n' % proto.name)
elif 'Dbg' not in proto.name and 'Wsi' not in proto.name:
raw_packet_update_list = [] # non-ptr elements placed directly into packet
ptr_packet_update_list = [] # ptr elements to be updated into packet
return_txt = ''
packet_size = []
in_data_size = False # flag when we need to capture local input size variable for in/out size
- func_body.append('GLVTRACER_EXPORT %s XGLAPI __HOOKED_xgl%s(' % (proto.ret, proto.name))
+ func_body.append('GLVTRACER_EXPORT %s VKAPI __HOOKED_vk%s(' % (proto.ret, proto.name))
for p in proto.params: # TODO : For all of the ptr types, check them for NULL and return 0 if NULL
if '[' in p.ty: # Correctly declare static arrays in function parameters
func_body.append(' %s %s[%s],' % (p.ty[:p.ty.find('[')], p.name, p.ty[p.ty.find('[')+1:p.ty.find(']')]))
@@ -489,74 +501,48 @@
return_txt = 'result = '
if in_data_size:
func_body.append(' size_t _dataSize;')
- func_body.append(' struct_xgl%s* pPacket = NULL;' % proto.name)
+ func_body.append(' struct_vk%s* pPacket = NULL;' % proto.name)
# functions that have non-standard sequence of packet creation and calling real function
# NOTE: Anytime we call the function before CREATE_TRACE_PACKET, need to add custom code for correctly tracking API call time
if proto.name in ['CreateFramebuffer', 'CreateRenderPass', 'CreateDynamicViewportState',
- 'CreateDescriptorPool', 'UpdateDescriptors']:
+ 'CreateDescriptorRegion']:
# these are regular case as far as sequence of tracing but have some custom size element
if 'CreateFramebuffer' == proto.name:
- func_body.append(' int dsSize = (pCreateInfo != NULL && pCreateInfo->pDepthStencilAttachment != NULL) ? sizeof(XGL_DEPTH_STENCIL_BIND_INFO) : 0;')
+ func_body.append(' int dsSize = (pCreateInfo != NULL && pCreateInfo->pDepthStencilAttachment != NULL) ? sizeof(VK_DEPTH_STENCIL_BIND_INFO) : 0;')
func_body.append(' uint32_t colorCount = (pCreateInfo != NULL && pCreateInfo->pColorAttachments != NULL) ? pCreateInfo->colorAttachmentCount : 0;')
- func_body.append(' CREATE_TRACE_PACKET(xglCreateFramebuffer, get_struct_chain_size((void*)pCreateInfo) + sizeof(XGL_FRAMEBUFFER));')
+ func_body.append(' CREATE_TRACE_PACKET(vkCreateFramebuffer, get_struct_chain_size((void*)pCreateInfo) + sizeof(VK_FRAMEBUFFER));')
elif 'CreateRenderPass' == proto.name:
func_body.append(' uint32_t colorCount = (pCreateInfo != NULL && (pCreateInfo->pColorLoadOps != NULL || pCreateInfo->pColorStoreOps != NULL || pCreateInfo->pColorLoadClearValues != NULL)) ? pCreateInfo->colorAttachmentCount : 0;')
- func_body.append(' size_t customSize;')
- func_body.append(' customSize = colorCount * ((pCreateInfo->pColorFormats != NULL) ? sizeof(XGL_FORMAT) : 0);')
- func_body.append(' customSize += colorCount * ((pCreateInfo->pColorLayouts != NULL) ? sizeof(XGL_IMAGE_LAYOUT) : 0);')
- func_body.append(' customSize += colorCount * ((pCreateInfo->pColorLoadOps != NULL) ? sizeof(XGL_ATTACHMENT_LOAD_OP) : 0);')
- func_body.append(' customSize += colorCount * ((pCreateInfo->pColorStoreOps != NULL) ? sizeof(XGL_ATTACHMENT_STORE_OP) : 0);')
- func_body.append(' customSize += colorCount * ((pCreateInfo->pColorLoadClearValues != NULL) ? sizeof(XGL_CLEAR_COLOR) : 0);')
- func_body.append(' CREATE_TRACE_PACKET(xglCreateRenderPass, sizeof(XGL_RENDER_PASS_CREATE_INFO) + sizeof(XGL_RENDER_PASS) + customSize);')
- elif 'BeginCommandBuffer' == proto.name:
- func_body.append(' customSize = calculate_begin_cmdbuf_size(pBeginInfo->pNext);')
- func_body.append(' CREATE_TRACE_PACKET(xglBeginCommandBuffer, sizeof(XGL_CMD_BUFFER_BEGIN_INFO) + customSize);')
+ func_body.append(' CREATE_TRACE_PACKET(vkCreateRenderPass, get_struct_chain_size((void*)pCreateInfo) + sizeof(VK_RENDER_PASS));')
elif 'CreateDynamicViewportState' == proto.name:
func_body.append(' uint32_t vpsCount = (pCreateInfo != NULL && pCreateInfo->pViewports != NULL) ? pCreateInfo->viewportAndScissorCount : 0;')
- func_body.append(' CREATE_TRACE_PACKET(xglCreateDynamicViewportState, get_struct_chain_size((void*)pCreateInfo) + sizeof(XGL_DYNAMIC_VP_STATE_OBJECT));')
- elif 'CreateDescriptorPool' == proto.name:
+ func_body.append(' CREATE_TRACE_PACKET(vkCreateDynamicViewportState, get_struct_chain_size((void*)pCreateInfo) + sizeof(VK_DYNAMIC_VP_STATE_OBJECT));')
+ elif 'CreateDescriptorRegion' == proto.name:
func_body.append(' uint32_t rgCount = (pCreateInfo != NULL && pCreateInfo->pTypeCount != NULL) ? pCreateInfo->count : 0;')
- func_body.append(' CREATE_TRACE_PACKET(xglCreateDescriptorPool, get_struct_chain_size((void*)pCreateInfo) + sizeof(XGL_DESCRIPTOR_POOL));')
- elif 'UpdateDescriptors' == proto.name:
- func_body.append(' uint32_t i;')
- func_body.append(' size_t customSize=0;')
- func_body.append(' for (i = 0; i < updateCount; i++)')
- func_body.append(' {')
- func_body.append(' customSize += get_struct_chain_size(ppUpdateArray[i]);')
- func_body.append(' customSize += sizeof(intptr_t);')
- func_body.append(' }')
- func_body.append(' CREATE_TRACE_PACKET(xglUpdateDescriptors, customSize);')
- func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
+ func_body.append(' CREATE_TRACE_PACKET(vkCreateDescriptorRegion, get_struct_chain_size((void*)pCreateInfo) + sizeof(VK_DESCRIPTOR_REGION));')
+ func_body.append(' %sreal_vk%s;' % (return_txt, proto.c_call()))
else:
if (0 == len(packet_size)):
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, 0);' % (proto.name))
+ func_body.append(' CREATE_TRACE_PACKET(vk%s, 0);' % (proto.name))
else:
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, %s);' % (proto.name, ' + '.join(packet_size)))
- func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
+ func_body.append(' CREATE_TRACE_PACKET(vk%s, %s);' % (proto.name, ' + '.join(packet_size)))
+ func_body.append(' %sreal_vk%s;' % (return_txt, proto.c_call()))
if in_data_size:
func_body.append(' _dataSize = (pDataSize == NULL || pData == NULL) ? 0 : *pDataSize;')
- func_body.append(' pPacket = interpret_body_as_xgl%s(pHeader);' % proto.name)
+ func_body.append(' pPacket = interpret_body_as_vk%s(pHeader);' % proto.name)
func_body.append('\n'.join(raw_packet_update_list))
- if 'UpdateDescriptors' == proto.name:
- func_body.append(' // add buffer which is an array of pointers')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->ppUpdateArray), updateCount * sizeof(intptr_t), ppUpdateArray);')
- func_body.append(' // add all the sub buffers with descriptor updates')
- func_body.append(' add_update_descriptors_to_trace_packet(pHeader, updateCount, (void ***) &pPacket->ppUpdateArray, ppUpdateArray);')
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->ppUpdateArray));')
- func_body.append(' FINISH_TRACE_PACKET();')
- else:
- for pp_dict in ptr_packet_update_list: #buff_ptr_indices:
- func_body.append(' %s;' % (pp_dict['add_txt']))
- if 'void' not in proto.ret or '*' in proto.ret:
- func_body.append(' pPacket->result = result;')
- for pp_dict in ptr_packet_update_list:
- if ('DEVICE_CREATE_INFO' not in proto.params[pp_dict['index']].ty) and ('INSTANCE_CREATE_INFO' not in proto.params[pp_dict['index']].ty) and ('ppUpdateArray' != proto.params[pp_dict['index']].name):
- func_body.append(' %s;' % (pp_dict['finalize_txt']))
- func_body.append(' FINISH_TRACE_PACKET();')
- if 'AllocMemory' in proto.name:
- func_body.append(' add_new_handle_to_mem_info(*pMem, pAllocInfo->allocationSize, NULL);')
- elif 'FreeMemory' in proto.name:
- func_body.append(' rm_handle_from_mem_info(mem);')
+ for pp_dict in ptr_packet_update_list: #buff_ptr_indices:
+ func_body.append(' %s;' % (pp_dict['add_txt']))
+ if 'void' not in proto.ret or '*' in proto.ret:
+ func_body.append(' pPacket->result = result;')
+ for pp_dict in ptr_packet_update_list:
+ if ('DEVICE_CREATE_INFO' not in proto.params[pp_dict['index']].ty) and ('APPLICATION_INFO' not in proto.params[pp_dict['index']].ty) and ('pUpdateChain' != proto.params[pp_dict['index']].name):
+ func_body.append(' %s;' % (pp_dict['finalize_txt']))
+ func_body.append(' FINISH_TRACE_PACKET();')
+ if 'AllocMemory' in proto.name:
+ func_body.append(' add_new_handle_to_mem_info(*pMem, pAllocInfo->allocationSize, NULL);')
+ elif 'FreeMemory' in proto.name:
+ func_body.append(' rm_handle_from_mem_info(mem);')
if 'void' not in proto.ret or '*' in proto.ret:
func_body.append(' return result;')
func_body.append('}\n')
@@ -571,7 +557,7 @@
return_txt = ''
packet_size = ''
buff_ptr_indices = []
- func_body.append('GLVTRACER_EXPORT %s XGLAPI __HOOKED_xgl%s(' % (proto.ret, proto.name))
+ func_body.append('GLVTRACER_EXPORT %s VKAPI __HOOKED_vk%s(' % (proto.ret, proto.name))
for p in proto.params: # TODO : For all of the ptr types, check them for NULL and return 0 is NULL
func_body.append(' %s %s,' % (p.ty, p.name))
if 'Size' in p.name:
@@ -595,16 +581,16 @@
if 'void' not in proto.ret or '*' in proto.ret:
func_body.append(' %s result;' % proto.ret)
return_txt = 'result = '
- func_body.append(' struct_xgl%s* pPacket = NULL;' % proto.name)
+ func_body.append(' struct_vk%s* pPacket = NULL;' % proto.name)
if proto.name in thread_once_funcs:
func_body.append(' glv_platform_thread_once(&gInitOnce, InitTracer);')
- func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name)
+ func_body.append(' SEND_ENTRYPOINT_ID(vk%s);' % proto.name)
if 'DbgRegisterMsgCallback' in proto.name:
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, sizeof(char));' % proto.name)
+ func_body.append(' CREATE_TRACE_PACKET(vk%s, sizeof(char));' % proto.name)
else:
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, %s);' % (proto.name, packet_size))
- func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
- func_body.append(' pPacket = interpret_body_as_xgl%s(pHeader);' % proto.name)
+ func_body.append(' CREATE_TRACE_PACKET(vk%s, %s);' % (proto.name, packet_size))
+ func_body.append(' %sreal_vk%s;' % (return_txt, proto.c_call()))
+ func_body.append(' pPacket = interpret_body_as_vk%s(pHeader);' % proto.name)
func_body.append(packet_update_txt.strip('\n'))
for idx in buff_ptr_indices:
if 'char' in proto.params[idx].ty:
@@ -632,35 +618,35 @@
def _generate_packet_id_enum(self):
pid_enum = []
- pid_enum.append('enum GLV_TRACE_PACKET_ID_XGL')
+ pid_enum.append('enum GLV_TRACE_PACKET_ID_VK')
pid_enum.append('{')
first_func = True
for proto in self.protos:
if first_func:
first_func = False
- pid_enum.append(' GLV_TPI_XGL_xglApiVersion = GLV_TPI_BEGIN_API_HERE,')
- pid_enum.append(' GLV_TPI_XGL_xgl%s,' % proto.name)
+ pid_enum.append(' GLV_TPI_VK_vkApiVersion = GLV_TPI_BEGIN_API_HERE,')
+ pid_enum.append(' GLV_TPI_VK_vk%s,' % proto.name)
else:
- pid_enum.append(' GLV_TPI_XGL_xgl%s,' % proto.name)
+ pid_enum.append(' GLV_TPI_VK_vk%s,' % proto.name)
pid_enum.append('};\n')
return "\n".join(pid_enum)
def _generate_stringify_func(self):
func_body = []
- func_body.append('static const char *stringify_xgl_packet_id(const enum GLV_TRACE_PACKET_ID_XGL id, const glv_trace_packet_header* pHeader)')
+ func_body.append('static const char *stringify_vk_packet_id(const enum GLV_TRACE_PACKET_ID_VK id, const glv_trace_packet_header* pHeader)')
func_body.append('{')
func_body.append(' static char str[1024];')
func_body.append(' switch(id) {')
- func_body.append(' case GLV_TPI_XGL_xglApiVersion:')
+ func_body.append(' case GLV_TPI_VK_vkApiVersion:')
func_body.append(' {')
- func_body.append(' struct_xglApiVersion* pPacket = (struct_xglApiVersion*)(pHeader->pBody);')
- func_body.append(' snprintf(str, 1024, "xglApiVersion = 0x%x", pPacket->version);')
+ func_body.append(' struct_vkApiVersion* pPacket = (struct_vkApiVersion*)(pHeader->pBody);')
+ func_body.append(' snprintf(str, 1024, "vkApiVersion = 0x%x", pPacket->version);')
func_body.append(' return str;')
func_body.append(' }')
for proto in self.protos:
- func_body.append(' case GLV_TPI_XGL_xgl%s:' % proto.name)
+ func_body.append(' case GLV_TPI_VK_vk%s:' % proto.name)
func_body.append(' {')
- func_str = 'xgl%s(' % proto.name
+ func_str = 'vk%s(' % proto.name
print_vals = ''
create_func = False
if 'Create' in proto.name or 'Alloc' in proto.name or 'MapMemory' in proto.name:
@@ -676,13 +662,10 @@
if last_param == True:
func_str += '%s%s = %s)' % (ptr, p.name, pft)
print_vals += ', %s' % (pfi)
- elif 'XGL_CLEAR_COLOR' == p.ty:
- func_str += '%s%s = %s, ' % (ptr, p.name, pft)
- print_vals += ', (void *) &pPacket->%s' % (p.name)
else:
func_str += '%s%s = %s, ' % (ptr, p.name, pft)
print_vals += ', %s' % (pfi)
- func_body.append(' struct_xgl%s* pPacket = (struct_xgl%s*)(pHeader->pBody);' % (proto.name, proto.name))
+ func_body.append(' struct_vk%s* pPacket = (struct_vk%s*)(pHeader->pBody);' % (proto.name, proto.name))
func_body.append(' snprintf(str, 1024, "%s"%s);' % (func_str, print_vals))
func_body.append(' return str;')
func_body.append(' }')
@@ -694,7 +677,7 @@
def _generate_interp_func(self):
interp_func_body = []
- interp_func_body.append('static glv_trace_packet_header* interpret_trace_packet_xgl(glv_trace_packet_header* pHeader)')
+ interp_func_body.append('static glv_trace_packet_header* interpret_trace_packet_vk(glv_trace_packet_header* pHeader)')
interp_func_body.append('{')
interp_func_body.append(' if (pHeader == NULL)')
interp_func_body.append(' {')
@@ -702,14 +685,14 @@
interp_func_body.append(' }')
interp_func_body.append(' switch (pHeader->packet_id)')
interp_func_body.append(' {')
- interp_func_body.append(' case GLV_TPI_XGL_xglApiVersion:\n {')
- interp_func_body.append(' return interpret_body_as_xglApiVersion(pHeader, TRUE)->header;\n }')
+ interp_func_body.append(' case GLV_TPI_VK_vkApiVersion:\n {')
+ interp_func_body.append(' return interpret_body_as_vkApiVersion(pHeader, TRUE)->header;\n }')
for proto in self.protos:
- interp_func_body.append(' case GLV_TPI_XGL_xgl%s:\n {' % proto.name)
+ interp_func_body.append(' case GLV_TPI_VK_vk%s:\n {' % proto.name)
header_prefix = 'h'
if 'Wsi' in proto.name or 'Dbg' in proto.name:
header_prefix = 'pH'
- interp_func_body.append(' return interpret_body_as_xgl%s(pHeader)->%seader;\n }' % (proto.name, header_prefix))
+ interp_func_body.append(' return interpret_body_as_vk%s(pHeader)->%seader;\n }' % (proto.name, header_prefix))
interp_func_body.append(' default:')
interp_func_body.append(' return NULL;')
interp_func_body.append(' }')
@@ -720,22 +703,22 @@
def _generate_struct_util_funcs(self):
pid_enum = []
pid_enum.append('//=============================================================================')
- pid_enum.append('static void add_XGL_APPLICATION_INFO_to_packet(glv_trace_packet_header* pHeader, XGL_APPLICATION_INFO** ppStruct, const XGL_APPLICATION_INFO *pInStruct)')
+ pid_enum.append('static void add_VK_APPLICATION_INFO_to_packet(glv_trace_packet_header* pHeader, VK_APPLICATION_INFO** ppStruct, const VK_APPLICATION_INFO *pInStruct)')
pid_enum.append('{')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)ppStruct, sizeof(XGL_APPLICATION_INFO), pInStruct);')
+ pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)ppStruct, sizeof(VK_APPLICATION_INFO), pInStruct);')
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&((*ppStruct)->pAppName), strlen(pInStruct->pAppName) + 1, pInStruct->pAppName);')
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&((*ppStruct)->pEngineName), strlen(pInStruct->pEngineName) + 1, pInStruct->pEngineName);')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&((*ppStruct)->pAppName));')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&((*ppStruct)->pEngineName));')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&*ppStruct);')
pid_enum.append('};\n')
- pid_enum.append('static void add_XGL_INSTANCE_CREATE_INFO_to_packet(glv_trace_packet_header* pHeader, XGL_INSTANCE_CREATE_INFO** ppStruct, const XGL_INSTANCE_CREATE_INFO *pInStruct)')
+ pid_enum.append('//=============================================================================\n')
+ pid_enum.append('static void add_VK_DEVICE_CREATE_INFO_to_packet(glv_trace_packet_header* pHeader, VK_DEVICE_CREATE_INFO** ppStruct, const VK_DEVICE_CREATE_INFO *pInStruct)')
pid_enum.append('{')
- pid_enum.append(' uint32_t i = 0;')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)ppStruct, sizeof(XGL_INSTANCE_CREATE_INFO), pInStruct);')
- pid_enum.append(' add_XGL_APPLICATION_INFO_to_packet(pHeader, (XGL_APPLICATION_INFO**) &((*ppStruct)->pAppInfo), pInStruct->pAppInfo);')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&((*ppStruct)->pAllocCb), sizeof(XGL_ALLOC_CALLBACKS), pInStruct->pAllocCb);')
- pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&((*ppStruct)->pAllocCb));')
+ pid_enum.append(' uint32_t i;')
+ pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)ppStruct, sizeof(VK_DEVICE_CREATE_INFO), pInStruct);')
+ pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(*ppStruct)->pRequestedQueues, pInStruct->queueRecordCount*sizeof(VK_DEVICE_QUEUE_CREATE_INFO), pInStruct->pRequestedQueues);')
+ pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&(*ppStruct)->pRequestedQueues);')
pid_enum.append(' if (pInStruct->extensionCount > 0) ')
pid_enum.append(' {')
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppStruct)->ppEnabledExtensionNames), pInStruct->extensionCount * sizeof(char *), pInStruct->ppEnabledExtensionNames);')
@@ -746,33 +729,14 @@
pid_enum.append(' }')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void **)&(*ppStruct)->ppEnabledExtensionNames);')
pid_enum.append(' }')
- pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&*ppStruct);')
- pid_enum.append('};\n')
- pid_enum.append('//=============================================================================\n')
- pid_enum.append('static void add_XGL_DEVICE_CREATE_INFO_to_packet(glv_trace_packet_header* pHeader, XGL_DEVICE_CREATE_INFO** ppStruct, const XGL_DEVICE_CREATE_INFO *pInStruct)')
- pid_enum.append('{')
- pid_enum.append(' uint32_t i;')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)ppStruct, sizeof(XGL_DEVICE_CREATE_INFO), pInStruct);')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(*ppStruct)->pRequestedQueues, pInStruct->queueRecordCount*sizeof(XGL_DEVICE_QUEUE_CREATE_INFO), pInStruct->pRequestedQueues);')
- pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)&(*ppStruct)->pRequestedQueues);')
- pid_enum.append(' if (pInStruct->extensionCount > 0)')
- pid_enum.append(' {')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppStruct)->ppEnabledExtensionNames), pInStruct->extensionCount * sizeof(char *), pInStruct->ppEnabledExtensionNames);')
- pid_enum.append(' for (i = 0; i < pInStruct->extensionCount; i++)')
- pid_enum.append(' {')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&((*ppStruct)->ppEnabledExtensionNames[i])), strlen(pInStruct->ppEnabledExtensionNames[i]) + 1, pInStruct->ppEnabledExtensionNames[i]);')
- pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)(&((*ppStruct)->ppEnabledExtensionNames[i])));')
- pid_enum.append(' }')
- pid_enum.append(' glv_finalize_buffer_address(pHeader, (void **)&(*ppStruct)->ppEnabledExtensionNames);')
- pid_enum.append(' }')
- pid_enum.append(' XGL_LAYER_CREATE_INFO *pNext = ( XGL_LAYER_CREATE_INFO *) pInStruct->pNext;')
+ pid_enum.append(' VK_LAYER_CREATE_INFO *pNext = ( VK_LAYER_CREATE_INFO *) pInStruct->pNext;')
pid_enum.append(' while (pNext != NULL)')
pid_enum.append(' {')
- pid_enum.append(' if ((pNext->sType == XGL_STRUCTURE_TYPE_LAYER_CREATE_INFO) && pNext->layerCount > 0)')
+ pid_enum.append(' if ((pNext->sType == VK_STRUCTURE_TYPE_LAYER_CREATE_INFO) && pNext->layerCount > 0)')
pid_enum.append(' {')
- pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&((*ppStruct)->pNext)), sizeof(XGL_LAYER_CREATE_INFO), pNext);')
+ pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&((*ppStruct)->pNext)), sizeof(VK_LAYER_CREATE_INFO), pNext);')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)(&((*ppStruct)->pNext)));')
- pid_enum.append(' XGL_LAYER_CREATE_INFO **ppOutStruct = (XGL_LAYER_CREATE_INFO **) &((*ppStruct)->pNext);')
+ pid_enum.append(' VK_LAYER_CREATE_INFO **ppOutStruct = (VK_LAYER_CREATE_INFO **) &((*ppStruct)->pNext);')
pid_enum.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(&(*ppOutStruct)->ppActiveLayerNames), pNext->layerCount * sizeof(char *), pNext->ppActiveLayerNames);')
pid_enum.append(' for (i = 0; i < pNext->layerCount; i++)')
pid_enum.append(' {')
@@ -781,31 +745,31 @@
pid_enum.append(' }')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void **)&(*ppOutStruct)->ppActiveLayerNames);')
pid_enum.append(' }')
- pid_enum.append(' pNext = ( XGL_LAYER_CREATE_INFO *) pNext->pNext;')
+ pid_enum.append(' pNext = ( VK_LAYER_CREATE_INFO *) pNext->pNext;')
pid_enum.append(' }')
pid_enum.append(' glv_finalize_buffer_address(pHeader, (void**)ppStruct);')
pid_enum.append('}\n')
- pid_enum.append('static XGL_DEVICE_CREATE_INFO* interpret_XGL_DEVICE_CREATE_INFO(glv_trace_packet_header* pHeader, intptr_t ptr_variable)')
+ pid_enum.append('static VK_DEVICE_CREATE_INFO* interpret_VK_DEVICE_CREATE_INFO(glv_trace_packet_header* pHeader, intptr_t ptr_variable)')
pid_enum.append('{')
- pid_enum.append(' XGL_DEVICE_CREATE_INFO* pXGL_DEVICE_CREATE_INFO = (XGL_DEVICE_CREATE_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)ptr_variable);\n')
- pid_enum.append(' if (pXGL_DEVICE_CREATE_INFO != NULL)')
+ pid_enum.append(' VK_DEVICE_CREATE_INFO* pVK_DEVICE_CREATE_INFO = (VK_DEVICE_CREATE_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)ptr_variable);\n')
+ pid_enum.append(' if (pVK_DEVICE_CREATE_INFO != NULL)')
pid_enum.append(' {')
pid_enum.append(' uint32_t i;')
pid_enum.append(' const char** pNames;')
- pid_enum.append(' pXGL_DEVICE_CREATE_INFO->pRequestedQueues = (const XGL_DEVICE_QUEUE_CREATE_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->pRequestedQueues);\n')
- pid_enum.append(' if (pXGL_DEVICE_CREATE_INFO->extensionCount > 0)')
+ pid_enum.append(' pVK_DEVICE_CREATE_INFO->pRequestedQueues = (const VK_DEVICE_QUEUE_CREATE_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVK_DEVICE_CREATE_INFO->pRequestedQueues);\n')
+ pid_enum.append(' if (pVK_DEVICE_CREATE_INFO->extensionCount > 0)')
pid_enum.append(' {')
- pid_enum.append(' pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames = (const char *const*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames);')
- pid_enum.append(' pNames = (const char**)pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames;')
- pid_enum.append(' for (i = 0; i < pXGL_DEVICE_CREATE_INFO->extensionCount; i++)')
+ pid_enum.append(' pVK_DEVICE_CREATE_INFO->ppEnabledExtensionNames = (const char *const*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVK_DEVICE_CREATE_INFO->ppEnabledExtensionNames);')
+ pid_enum.append(' pNames = (const char**)pVK_DEVICE_CREATE_INFO->ppEnabledExtensionNames;')
+ pid_enum.append(' for (i = 0; i < pVK_DEVICE_CREATE_INFO->extensionCount; i++)')
pid_enum.append(' {')
- pid_enum.append(' pNames[i] = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pXGL_DEVICE_CREATE_INFO->ppEnabledExtensionNames[i]));')
+ pid_enum.append(' pNames[i] = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pVK_DEVICE_CREATE_INFO->ppEnabledExtensionNames[i]));')
pid_enum.append(' }')
pid_enum.append(' }')
- pid_enum.append(' XGL_LAYER_CREATE_INFO *pNext = ( XGL_LAYER_CREATE_INFO *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pXGL_DEVICE_CREATE_INFO->pNext);')
+ pid_enum.append(' VK_LAYER_CREATE_INFO *pNext = ( VK_LAYER_CREATE_INFO *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVK_DEVICE_CREATE_INFO->pNext);')
pid_enum.append(' while (pNext != NULL)')
pid_enum.append(' {')
- pid_enum.append(' if ((pNext->sType == XGL_STRUCTURE_TYPE_LAYER_CREATE_INFO) && pNext->layerCount > 0)')
+ pid_enum.append(' if ((pNext->sType == VK_STRUCTURE_TYPE_LAYER_CREATE_INFO) && pNext->layerCount > 0)')
pid_enum.append(' {')
pid_enum.append(' pNext->ppActiveLayerNames = (const char**) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pNext->ppActiveLayerNames));')
pid_enum.append(' pNames = (const char**)pNext->ppActiveLayerNames;')
@@ -814,12 +778,12 @@
pid_enum.append(' pNames[i] = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pNext->ppActiveLayerNames[i]));')
pid_enum.append(' }')
pid_enum.append(' }')
- pid_enum.append(' pNext = ( XGL_LAYER_CREATE_INFO *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);')
+ pid_enum.append(' pNext = ( VK_LAYER_CREATE_INFO *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);')
pid_enum.append(' }')
pid_enum.append(' }\n')
- pid_enum.append(' return pXGL_DEVICE_CREATE_INFO;')
+ pid_enum.append(' return pVK_DEVICE_CREATE_INFO;')
pid_enum.append('}\n')
- pid_enum.append('static void interpret_pipeline_shader(glv_trace_packet_header* pHeader, XGL_PIPELINE_SHADER* pShader)')
+ pid_enum.append('static void interpret_pipeline_shader(glv_trace_packet_header* pHeader, VK_PIPELINE_SHADER* pShader)')
pid_enum.append('{')
pid_enum.append(' if (pShader != NULL)')
pid_enum.append(' {')
@@ -827,10 +791,10 @@
pid_enum.append(' if (pShader->linkConstBufferCount > 0)')
pid_enum.append(' {')
pid_enum.append(' uint32_t i;')
- pid_enum.append(' pShader->pLinkConstBufferInfo = (const XGL_LINK_CONST_BUFFER*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pShader->pLinkConstBufferInfo);')
+ pid_enum.append(' pShader->pLinkConstBufferInfo = (const VK_LINK_CONST_BUFFER*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pShader->pLinkConstBufferInfo);')
pid_enum.append(' for (i = 0; i < pShader->linkConstBufferCount; i++)')
pid_enum.append(' {')
- pid_enum.append(' XGL_LINK_CONST_BUFFER* pBuffer = (XGL_LINK_CONST_BUFFER*)pShader->pLinkConstBufferInfo;')
+ pid_enum.append(' VK_LINK_CONST_BUFFER* pBuffer = (VK_LINK_CONST_BUFFER*)pShader->pLinkConstBufferInfo;')
pid_enum.append(' pBuffer[i].pBufferData = (const void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pShader->pLinkConstBufferInfo[i].pBufferData);')
pid_enum.append(' }')
pid_enum.append(' }')
@@ -844,64 +808,50 @@
def _generate_interp_funcs(self):
# Custom txt for given function and parameter. First check if param is NULL, then insert txt if not
# TODO : This code is now too large and complex, need to make codegen smarter for pointers embedded in struct params to handle those cases automatically
- custom_case_dict = { 'CreateInstance' : {'param': 'pCreateInfo', 'txt': ['XGL_INSTANCE_CREATE_INFO *pInfo = (XGL_INSTANCE_CREATE_INFO *) pPacket->pCreateInfo;\n',
- 'XGL_APPLICATION_INFO **ppAppInfo = (XGL_APPLICATION_INFO**) &pInfo->pAppInfo;\n',
- '*ppAppInfo = (XGL_APPLICATION_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t) pInfo->pAppInfo);\n',
- '(*ppAppInfo)->pAppName = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(*ppAppInfo)->pAppName);\n',
- '(*ppAppInfo)->pEngineName = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(*ppAppInfo)->pEngineName);',
- 'if (pInfo->extensionCount > 0)\n',
- '{',
- ' pInfo->ppEnabledExtensionNames = (const char *const*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pInfo->ppEnabledExtensionNames);\n',
- ' const char **pNames = (const char**)pInfo->ppEnabledExtensionNames;\n',
- ' uint32_t i;\n'
- ' for (i = 0; i < pInfo->extensionCount; i++)\n',
- ' {\n',
- ' pNames[i] = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)(pInfo->ppEnabledExtensionNames[i]));\n',
- ' }\n',
- '}']},
- 'CreateShader' : {'param': 'pCreateInfo', 'txt': ['XGL_SHADER_CREATE_INFO* pInfo = (XGL_SHADER_CREATE_INFO*)pPacket->pCreateInfo;\n',
+ custom_case_dict = { 'CreateInstance' : {'param': 'pAppInfo', 'txt': ['VK_APPLICATION_INFO* pInfo = (VK_APPLICATION_INFO*)pPacket->pAppInfo;\n',
+ 'pInfo->pAppName = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAppInfo->pAppName);\n',
+ 'pInfo->pEngineName = (const char*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAppInfo->pEngineName);']},
+ 'CreateShader' : {'param': 'pCreateInfo', 'txt': ['VK_SHADER_CREATE_INFO* pInfo = (VK_SHADER_CREATE_INFO*)pPacket->pCreateInfo;\n',
'pInfo->pCode = glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pCode);']},
- 'CreateDynamicViewportState' : {'param': 'pCreateInfo', 'txt': ['XGL_DYNAMIC_VP_STATE_CREATE_INFO* pInfo = (XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pPacket->pCreateInfo;\n',
- 'pInfo->pViewports = (XGL_VIEWPORT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pViewports);\n',
- 'pInfo->pScissors = (XGL_RECT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pScissors);']},
- 'CreateFramebuffer' : {'param': 'pCreateInfo', 'txt': ['XGL_FRAMEBUFFER_CREATE_INFO* pInfo = (XGL_FRAMEBUFFER_CREATE_INFO*)pPacket->pCreateInfo;\n',
- 'pInfo->pColorAttachments = (XGL_COLOR_ATTACHMENT_BIND_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorAttachments);\n',
- 'pInfo->pDepthStencilAttachment = (XGL_DEPTH_STENCIL_BIND_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pDepthStencilAttachment);\n']},
- 'CreateRenderPass' : {'param': 'pCreateInfo', 'txt': ['XGL_RENDER_PASS_CREATE_INFO* pInfo = (XGL_RENDER_PASS_CREATE_INFO*)pPacket->pCreateInfo;\n',
- 'pInfo->pColorFormats = (XGL_FORMAT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorFormats);\n',
- 'pInfo->pColorLayouts = (XGL_IMAGE_LAYOUT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorLayouts);\n',
- 'pInfo->pColorLoadOps = (XGL_ATTACHMENT_LOAD_OP*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorLoadOps);\n',
- 'pInfo->pColorStoreOps = (XGL_ATTACHMENT_STORE_OP*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorStoreOps);\n',
- 'pInfo->pColorLoadClearValues = (XGL_CLEAR_COLOR*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorLoadClearValues);\n']},
- 'CreateDescriptorPool' : {'param': 'pCreateInfo', 'txt': ['XGL_DESCRIPTOR_POOL_CREATE_INFO* pInfo = (XGL_DESCRIPTOR_POOL_CREATE_INFO*)pPacket->pCreateInfo;\n',
- 'pInfo->pTypeCount = (XGL_DESCRIPTOR_TYPE_COUNT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pTypeCount);\n']},
- 'CmdWaitEvents' : {'param': 'pWaitInfo', 'txt': ['XGL_EVENT_WAIT_INFO* pInfo = (XGL_EVENT_WAIT_INFO*)pPacket->pWaitInfo;\n',
- 'pInfo->pEvents = (XGL_EVENT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pWaitInfo->pEvents);\n',
+ 'CreateDynamicViewportState' : {'param': 'pCreateInfo', 'txt': ['VK_DYNAMIC_VP_STATE_CREATE_INFO* pInfo = (VK_DYNAMIC_VP_STATE_CREATE_INFO*)pPacket->pCreateInfo;\n',
+ 'pInfo->pViewports = (VK_VIEWPORT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pViewports);\n',
+ 'pInfo->pScissors = (VK_RECT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pScissors);']},
+ 'CreateFramebuffer' : {'param': 'pCreateInfo', 'txt': ['VK_FRAMEBUFFER_CREATE_INFO* pInfo = (VK_FRAMEBUFFER_CREATE_INFO*)pPacket->pCreateInfo;\n',
+ 'pInfo->pColorAttachments = (VK_COLOR_ATTACHMENT_BIND_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorAttachments);\n',
+ 'pInfo->pDepthStencilAttachment = (VK_DEPTH_STENCIL_BIND_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pDepthStencilAttachment);\n']},
+ 'CreateRenderPass' : {'param': 'pCreateInfo', 'txt': ['VK_RENDER_PASS_CREATE_INFO* pInfo = (VK_RENDER_PASS_CREATE_INFO*)pPacket->pCreateInfo;\n',
+ 'pInfo->pColorLoadOps = (VK_ATTACHMENT_LOAD_OP*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorLoadOps);\n',
+ 'pInfo->pColorStoreOps = (VK_ATTACHMENT_STORE_OP*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorStoreOps);\n',
+ 'pInfo->pColorLoadClearValues = (VK_CLEAR_COLOR*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pColorLoadClearValues);\n']},
+ 'CreateDescriptorRegion' : {'param': 'pCreateInfo', 'txt': ['VK_DESCRIPTOR_REGION_CREATE_INFO* pInfo = (VK_DESCRIPTOR_REGION_CREATE_INFO*)pPacket->pCreateInfo;\n',
+ 'pInfo->pTypeCount = (VK_DESCRIPTOR_TYPE_COUNT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pTypeCount);\n']},
+ 'CmdWaitEvents' : {'param': 'pWaitInfo', 'txt': ['VK_EVENT_WAIT_INFO* pInfo = (VK_EVENT_WAIT_INFO*)pPacket->pWaitInfo;\n',
+ 'pInfo->pEvents = (VK_EVENT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pWaitInfo->pEvents);\n',
'pInfo->ppMemBarriers = (const void**) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pWaitInfo->ppMemBarriers);\n',
'uint32_t i;\n',
'for (i = 0; i < pInfo->memBarrierCount; i++) {\n',
' void** ppLocalMemBarriers = (void**)&pInfo->ppMemBarriers[i];\n',
' *ppLocalMemBarriers = (void*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pInfo->ppMemBarriers[i]);\n',
'}']},
- 'CmdPipelineBarrier' : {'param': 'pBarrier', 'txt': ['XGL_PIPELINE_BARRIER* pBarrier = (XGL_PIPELINE_BARRIER*)pPacket->pBarrier;\n',
- 'pBarrier->pEvents = (XGL_PIPE_EVENT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBarrier->pEvents);\n',
+ 'CmdPipelineBarrier' : {'param': 'pBarrier', 'txt': ['VK_PIPELINE_BARRIER* pBarrier = (VK_PIPELINE_BARRIER*)pPacket->pBarrier;\n',
+ 'pBarrier->pEvents = (VK_PIPE_EVENT*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBarrier->pEvents);\n',
'pBarrier->ppMemBarriers = (const void**) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBarrier->ppMemBarriers);\n',
'uint32_t i;\n',
'for (i = 0; i < pBarrier->memBarrierCount; i++) {\n',
' void** ppLocalMemBarriers = (void**)&pBarrier->ppMemBarriers[i];\n',
' *ppLocalMemBarriers = (void*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pBarrier->ppMemBarriers[i]);\n',
'}']},
- 'CreateDescriptorSetLayout' : {'param': 'pCreateInfo', 'txt': ['if (pPacket->pCreateInfo->sType == XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO) {\n',
- ' XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pNext = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pPacket->pCreateInfo;\n',
- ' do\n', ' {\n',
- ' // need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
- ' void** ppNextVoidPtr = (void**)&(pNext->pNext);\n',
- ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ 'CreateDescriptorSetLayout' : {'param': 'pSetLayoutInfoList', 'txt': ['if (pPacket->pSetLayoutInfoList->sType == VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO) {\n',
+ ' // need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
+ ' void** ppNextVoidPtr = (void**)&(pPacket->pSetLayoutInfoList->pNext);\n',
+ ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pSetLayoutInfoList->pNext);\n',
+ ' VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pNext = (VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pPacket->pSetLayoutInfoList->pNext;\n',
+ ' while (NULL != pNext)\n', ' {\n',
' switch(pNext->sType)\n', ' {\n',
- ' case XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO:\n',
' {\n' ,
- ' XGL_DESCRIPTOR_SET_LAYOUT_BINDING** ppBinding = (XGL_DESCRIPTOR_SET_LAYOUT_BINDING**)&pNext->pBinding;\n',
- ' *ppBinding = (XGL_DESCRIPTOR_SET_LAYOUT_BINDING*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pBinding);\n',
+ ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
+ ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
' default:\n',
@@ -911,24 +861,24 @@
' pNext->pNext = NULL;\n',
' }\n',
' }\n',
- ' pNext = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pNext->pNext;\n',
- ' } while (NULL != pNext);\n',
+ ' pNext = (VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pNext->pNext;\n',
+ ' }\n',
'} else {\n',
' // This is unexpected.\n',
- ' glv_LogError("CreateDescriptorSetLayout must have LayoutInfoList stype of XGL_STRCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO\\n");\n',
+ ' glv_LogError("CreateDescriptorSetLayout must have LayoutInfoList stype of VK_STRCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO\\n");\n',
' pPacket->header = NULL;\n',
'}']},
- 'BeginCommandBuffer' : {'param': 'pBeginInfo', 'txt': ['if (pPacket->pBeginInfo->sType == XGL_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO) {\n',
+ 'BeginCommandBuffer' : {'param': 'pBeginInfo', 'txt': ['if (pPacket->pBeginInfo->sType == VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO) {\n',
' // need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
- ' XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO** ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO**)&(pPacket->pBeginInfo->pNext);\n',
- ' *ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBeginInfo->pNext);\n',
- ' XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO* pNext = *ppNext;\n',
+ ' VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO** ppNext = (VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO**)&(pPacket->pBeginInfo->pNext);\n',
+ ' *ppNext = (VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pBeginInfo->pNext);\n',
+ ' VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO* pNext = *ppNext;\n',
' while (NULL != pNext)\n', ' {\n',
' switch(pNext->sType)\n', ' {\n',
- ' case XGL_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO:\n',
' {\n',
- ' ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO**) &pNext->pNext;\n',
- ' *ppNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ ' ppNext = (VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO**) &pNext->pNext;\n',
+ ' *ppNext = (VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
' default:\n',
@@ -938,24 +888,24 @@
' pNext->pNext = NULL;\n',
' }\n',
' }\n',
- ' pNext = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)pNext->pNext;\n',
+ ' pNext = (VK_CMD_BUFFER_GRAPHICS_BEGIN_INFO*)pNext->pNext;\n',
' }\n',
'} else {\n',
' // This is unexpected.\n',
- ' glv_LogError("BeginCommandBuffer must have BeginInfo stype of XGL_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO.\\n");\n',
+ ' glv_LogError("BeginCommandBuffer must have BeginInfo stype of VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO.\\n");\n',
' pPacket->header = NULL;\n',
'}']},
- 'AllocMemory' : {'param': 'pAllocInfo', 'txt': ['if (pPacket->pAllocInfo->sType == XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO) {\n',
- ' XGL_MEMORY_ALLOC_INFO** ppNext = (XGL_MEMORY_ALLOC_INFO**) &(pPacket->pAllocInfo->pNext);\n',
- ' *ppNext = (XGL_MEMORY_ALLOC_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAllocInfo->pNext);\n',
- ' XGL_MEMORY_ALLOC_INFO* pNext = (XGL_MEMORY_ALLOC_INFO*) *ppNext;\n',
+ 'AllocMemory' : {'param': 'pAllocInfo', 'txt': ['if (pPacket->pAllocInfo->sType == VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO) {\n',
+ ' VK_MEMORY_ALLOC_INFO** ppNext = (VK_MEMORY_ALLOC_INFO**) &(pPacket->pAllocInfo->pNext);\n',
+ ' *ppNext = (VK_MEMORY_ALLOC_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pAllocInfo->pNext);\n',
+ ' VK_MEMORY_ALLOC_INFO* pNext = (VK_MEMORY_ALLOC_INFO*) *ppNext;\n',
' while (NULL != pNext)\n', ' {\n',
' switch(pNext->sType)\n', ' {\n',
- ' case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO:\n',
' {\n',
- ' ppNext = (XGL_MEMORY_ALLOC_INFO **) &(pNext->pNext);\n',
- ' *ppNext = (XGL_MEMORY_ALLOC_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
+ ' ppNext = (VK_MEMORY_ALLOC_INFO **) &(pNext->pNext);\n',
+ ' *ppNext = (VK_MEMORY_ALLOC_INFO*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
' default:\n',
@@ -965,113 +915,120 @@
' pNext->pNext = NULL;\n',
' }\n',
' }\n',
- ' pNext = (XGL_MEMORY_ALLOC_INFO*)pNext->pNext;\n',
+ ' pNext = (VK_MEMORY_ALLOC_INFO*)pNext->pNext;\n',
' }\n',
'} else {\n',
' // This is unexpected.\n',
- ' glv_LogError("AllocMemory must have AllocInfo stype of XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO.\\n");\n',
+ ' glv_LogError("AllocMemory must have AllocInfo stype of VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO.\\n");\n',
' pPacket->header = NULL;\n',
'}']},
- 'UpdateDescriptors' : {'param': 'ppUpdateArray', 'txt': ['size_t i;\n',
- 'for (i = 0; i < pPacket->updateCount; i++)\n', '{\n',
- ' XGL_UPDATE_SAMPLERS** ppUpItem = (XGL_UPDATE_SAMPLERS**) &pPacket->ppUpdateArray[i];\n',
- ' *ppUpItem = (XGL_UPDATE_SAMPLERS *) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t) pPacket->ppUpdateArray[i]);\n',
- ' XGL_UPDATE_SAMPLERS* pNext = *ppUpItem;\n',
+ 'UpdateDescriptors' : {'param': 'pUpdateChain', 'txt': ['VK_UPDATE_SAMPLERS* pNext = (VK_UPDATE_SAMPLERS*)pPacket->pUpdateChain;\n',
+ 'while ((NULL != pNext) && (VK_NULL_HANDLE != pNext))\n', '{\n',
' switch(pNext->sType)\n', ' {\n',
- ' case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:\n',
+ ' case VK_STRUCTURE_TYPE_UPDATE_AS_COPY:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:\n',
+ ' case VK_STRUCTURE_TYPE_UPDATE_SAMPLERS:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_UPDATE_SAMPLERS* pUS = (XGL_UPDATE_SAMPLERS*)pNext;\n',
+ ' VK_UPDATE_SAMPLERS* pUS = (VK_UPDATE_SAMPLERS*)pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' pUS->pSamplers = (XGL_SAMPLER*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUS->pSamplers);\n',
+ ' pUS->pSamplers = (VK_SAMPLER*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUS->pSamplers);\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:\n',
+ ' case VK_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_UPDATE_SAMPLER_TEXTURES* pUST = (XGL_UPDATE_SAMPLER_TEXTURES*)pNext;\n',
+ ' VK_UPDATE_SAMPLER_TEXTURES* pUST = (VK_UPDATE_SAMPLER_TEXTURES*)pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' pUST->pSamplerImageViews = (XGL_SAMPLER_IMAGE_VIEW_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUST->pSamplerImageViews);\n',
+ ' pUST->pSamplerImageViews = (VK_SAMPLER_IMAGE_VIEW_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUST->pSamplerImageViews);\n',
' uint32_t i;\n',
' for (i = 0; i < pUST->count; i++) {\n',
- ' XGL_IMAGE_VIEW_ATTACH_INFO** ppLocalImageView = (XGL_IMAGE_VIEW_ATTACH_INFO**)&pUST->pSamplerImageViews[i].pImageView;\n',
- ' *ppLocalImageView = (XGL_IMAGE_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUST->pSamplerImageViews[i].pImageView);\n',
+ ' VK_IMAGE_VIEW_ATTACH_INFO** ppLocalImageView = (VK_IMAGE_VIEW_ATTACH_INFO**)&pUST->pSamplerImageViews[i].pImageView;\n',
+ ' *ppLocalImageView = (VK_IMAGE_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUST->pSamplerImageViews[i].pImageView);\n',
' }\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:\n',
+ ' case VK_STRUCTURE_TYPE_UPDATE_IMAGES:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_UPDATE_IMAGES* pUI = (XGL_UPDATE_IMAGES*)pNext;\n',
+ ' VK_UPDATE_IMAGES* pUI = (VK_UPDATE_IMAGES*)pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' XGL_IMAGE_VIEW_ATTACH_INFO** ppLocalImageView = (XGL_IMAGE_VIEW_ATTACH_INFO**)&pUI->pImageViews;\n',
- ' *ppLocalImageView = (XGL_IMAGE_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUI->pImageViews);\n',
+ ' VK_IMAGE_VIEW_ATTACH_INFO** ppLocalImageView = (VK_IMAGE_VIEW_ATTACH_INFO**)&pUI->pImageViews;\n',
+ ' *ppLocalImageView = (VK_IMAGE_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUI->pImageViews);\n',
+ ' uint32_t i;\n',
+ ' for (i = 0; i < pUI->count; i++) {\n',
+ ' VK_IMAGE_VIEW_ATTACH_INFO** ppLocalImageViews = (VK_IMAGE_VIEW_ATTACH_INFO**)&pUI->pImageViews[i];\n',
+ ' *ppLocalImageViews = (VK_IMAGE_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUI->pImageViews[i]);\n',
+ ' }\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:\n',
+ ' case VK_STRUCTURE_TYPE_UPDATE_BUFFERS:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_UPDATE_BUFFERS* pUB = (XGL_UPDATE_BUFFERS*)pNext;\n',
+ ' VK_UPDATE_BUFFERS* pUB = (VK_UPDATE_BUFFERS*)pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' XGL_BUFFER_VIEW_ATTACH_INFO** ppLocalBufferView = (XGL_BUFFER_VIEW_ATTACH_INFO**)&pUB->pBufferViews;\n',
- ' *ppLocalBufferView = (XGL_BUFFER_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUB->pBufferViews);\n',
+ ' VK_BUFFER_VIEW_ATTACH_INFO** ppLocalBufferView = (VK_BUFFER_VIEW_ATTACH_INFO**)&pUB->pBufferViews;\n',
+ ' *ppLocalBufferView = (VK_BUFFER_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUB->pBufferViews);\n',
+ ' uint32_t i;\n',
+ ' for (i = 0; i < pUB->count; i++) {\n',
+ ' VK_BUFFER_VIEW_ATTACH_INFO** ppLocalBufferViews = (VK_BUFFER_VIEW_ATTACH_INFO**)&pUB->pBufferViews[i];\n',
+ ' *ppLocalBufferViews = (VK_BUFFER_VIEW_ATTACH_INFO*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pUB->pBufferViews[i]);\n',
+ ' }\n',
' break;\n',
' }\n',
' default:\n',
' {\n',
- ' glv_LogError("Encountered an unexpected type in update descriptors ppUpdateArray.\\n");\n',
+ ' glv_LogError("Encountered an unexpected type in update descriptors pUpdateChain.\\n");\n',
' pPacket->header = NULL;\n',
' pNext->pNext = NULL;\n',
' }\n',
' }\n',
- ' pNext = (XGL_UPDATE_SAMPLERS*)pNext->pNext;\n',
+ ' pNext = (VK_UPDATE_SAMPLERS*)pNext->pNext;\n',
'}']},
- 'CreateGraphicsPipeline' : {'param': 'pCreateInfo', 'txt': ['if (pPacket->pCreateInfo->sType == XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO) {\n',
+ 'CreateGraphicsPipeline' : {'param': 'pCreateInfo', 'txt': ['if (pPacket->pCreateInfo->sType == VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO) {\n',
' // need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
' void** ppNextVoidPtr = (void**)&pPacket->pCreateInfo->pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pNext);\n',
- ' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;\n',
- ' while ((NULL != pNext) && (XGL_NULL_HANDLE != pNext))\n', '{\n',
+ ' VK_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (VK_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;\n',
+ ' while ((NULL != pNext) && (VK_NULL_HANDLE != pNext))\n', '{\n',
' switch(pNext->sType)\n', ' {\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_PIPELINE_CB_STATE_CREATE_INFO *pCb = (XGL_PIPELINE_CB_STATE_CREATE_INFO *) pNext;\n',
+ ' VK_PIPELINE_CB_STATE_CREATE_INFO *pCb = (VK_PIPELINE_CB_STATE_CREATE_INFO *) pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' pCb->pAttachments = (XGL_PIPELINE_CB_ATTACHMENT_STATE*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pCb->pAttachments);\n',
+ ' pCb->pAttachments = (VK_PIPELINE_CB_ATTACHMENT_STATE*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pCb->pAttachments);\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
' interpret_pipeline_shader(pHeader, &pNext->shader);\n',
' break;\n',
' }\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO:\n',
+ ' case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO:\n',
' {\n',
' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *pVi = (XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *) pNext;\n',
+ ' VK_PIPELINE_VERTEX_INPUT_CREATE_INFO *pVi = (VK_PIPELINE_VERTEX_INPUT_CREATE_INFO *) pNext;\n',
' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' pVi->pVertexBindingDescriptions = (XGL_VERTEX_INPUT_BINDING_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexBindingDescriptions);\n',
- ' pVi->pVertexAttributeDescriptions = (XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexAttributeDescriptions);\n',
+ ' pVi->pVertexBindingDescriptions = (VK_VERTEX_INPUT_BINDING_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexBindingDescriptions);\n',
+ ' pVi->pVertexAttributeDescriptions = (VK_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexAttributeDescriptions);\n',
' break;\n',
' }\n',
' default:\n',
@@ -1081,88 +1038,32 @@
' pNext->pNext = NULL;\n',
' }\n',
' }\n',
- ' pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pNext->pNext;\n',
+ ' pNext = (VK_PIPELINE_SHADER_STAGE_CREATE_INFO*)pNext->pNext;\n',
' }\n',
'} else {\n',
' // This is unexpected.\n',
- ' glv_LogError("CreateGraphicsPipeline must have CreateInfo stype of XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO.\\n");\n',
+ ' glv_LogError("CreateGraphicsPipeline must have CreateInfo stype of VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO.\\n");\n',
' pPacket->header = NULL;\n',
'}']},
- 'CreateGraphicsPipelineDerivative' : {'param': 'pCreateInfo', 'txt': ['if (pPacket->pCreateInfo->sType == XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO) {\n',
- ' // need to make a non-const pointer to the pointer so that we can properly change the original pointer to the interpretted one\n',
- ' void** ppNextVoidPtr = (void**)&pPacket->pCreateInfo->pNext;\n',
- ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->pCreateInfo->pNext);\n',
- ' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;\n',
- ' while ((NULL != pNext) && (XGL_NULL_HANDLE != pNext))\n', '{\n',
- ' switch(pNext->sType)\n', ' {\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO:\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO:\n',
- ' {\n',
- ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' break;\n',
- ' }\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO:\n',
- ' {\n',
- ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_PIPELINE_CB_STATE_CREATE_INFO *pCb = (XGL_PIPELINE_CB_STATE_CREATE_INFO *) pNext;\n',
- ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' pCb->pAttachments = (XGL_PIPELINE_CB_ATTACHMENT_STATE*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pCb->pAttachments);\n',
- ' break;\n',
- ' }\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO:\n',
- ' {\n',
- ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' interpret_pipeline_shader(pHeader, &pNext->shader);\n',
- ' break;\n',
- ' }\n',
- ' case XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO:\n',
- ' {\n',
- ' void** ppNextVoidPtr = (void**)&pNext->pNext;\n',
- ' XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *pVi = (XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *) pNext;\n',
- ' *ppNextVoidPtr = (void*)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pNext->pNext);\n',
- ' pVi->pVertexBindingDescriptions = (XGL_VERTEX_INPUT_BINDING_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexBindingDescriptions);\n',
- ' pVi->pVertexAttributeDescriptions = (XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION*) glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pVi->pVertexAttributeDescriptions);\n',
- ' break;\n',
- ' }\n',
- ' default:\n',
- ' {\n',
- ' glv_LogError("Encountered an unexpected type in pipeline state list.\\n");\n',
- ' pPacket->header = NULL;\n',
- ' pNext->pNext = NULL;\n',
- ' }\n',
- ' }\n',
- ' pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pNext->pNext;\n',
- ' }\n',
- '} else {\n',
- ' // This is unexpected.\n',
- ' glv_LogError("CreateGraphicsPipelineDerivative must have CreateInfo stype of XGL_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO.\\n");\n',
- ' pPacket->header = NULL;\n',
- '}']},
- 'CreateComputePipeline' : {'param': 'pCreateInfo', 'txt': ['interpret_pipeline_shader(pHeader, (XGL_PIPELINE_SHADER*)(&pPacket->pCreateInfo->cs));']}}
+ 'CreateComputePipeline' : {'param': 'pCreateInfo', 'txt': ['interpret_pipeline_shader(pHeader, (VK_PIPELINE_SHADER*)(&pPacket->pCreateInfo->cs));']}}
if_body = []
- if_body.append('typedef struct struct_xglApiVersion {')
+ if_body.append('typedef struct struct_vkApiVersion {')
if_body.append(' glv_trace_packet_header* header;')
if_body.append(' uint32_t version;')
- if_body.append('} struct_xglApiVersion;\n')
- if_body.append('static struct_xglApiVersion* interpret_body_as_xglApiVersion(glv_trace_packet_header* pHeader, BOOL check_version)')
+ if_body.append('} struct_vkApiVersion;\n')
+ if_body.append('static struct_vkApiVersion* interpret_body_as_vkApiVersion(glv_trace_packet_header* pHeader, BOOL check_version)')
if_body.append('{')
- if_body.append(' struct_xglApiVersion* pPacket = (struct_xglApiVersion*)pHeader->pBody;')
+ if_body.append(' struct_vkApiVersion* pPacket = (struct_vkApiVersion*)pHeader->pBody;')
if_body.append(' pPacket->header = pHeader;')
- if_body.append(' if (check_version && pPacket->version != XGL_API_VERSION)')
- if_body.append(' glv_LogError("Trace file from older XGL version 0x%x, xgl replayer built from version 0x%x, replayer may fail\\n", pPacket->version, XGL_API_VERSION);')
+ if_body.append(' if (check_version && pPacket->version != VK_API_VERSION)')
+ if_body.append(' glv_LogError("Trace file from older VK version 0x%x, vk replayer built from version 0x%x, replayer may fail\\n", pPacket->version, VK_API_VERSION);')
if_body.append(' return pPacket;')
if_body.append('}\n')
for proto in self.protos:
if 'Wsi' not in proto.name and 'Dbg' not in proto.name:
if 'UnmapMemory' == proto.name:
- proto.params.append(xgl.Param("void*", "pData"))
- if_body.append('typedef struct struct_xgl%s {' % proto.name)
+ proto.params.append(vulkan.Param("void*", "pData"))
+ if_body.append('typedef struct struct_vk%s {' % proto.name)
if_body.append(' glv_trace_packet_header* header;')
for p in proto.params:
if '[4]' in p.ty:
@@ -1171,15 +1072,15 @@
if_body.append(' %s %s;' % (p.ty, p.name))
if 'void' != proto.ret:
if_body.append(' %s result;' % proto.ret)
- if_body.append('} struct_xgl%s;\n' % proto.name)
- if_body.append('static struct_xgl%s* interpret_body_as_xgl%s(glv_trace_packet_header* pHeader)' % (proto.name, proto.name))
+ if_body.append('} struct_vk%s;\n' % proto.name)
+ if_body.append('static struct_vk%s* interpret_body_as_vk%s(glv_trace_packet_header* pHeader)' % (proto.name, proto.name))
if_body.append('{')
- if_body.append(' struct_xgl%s* pPacket = (struct_xgl%s*)pHeader->pBody;' % (proto.name, proto.name))
+ if_body.append(' struct_vk%s* pPacket = (struct_vk%s*)pHeader->pBody;' % (proto.name, proto.name))
if_body.append(' pPacket->header = pHeader;')
for p in proto.params:
if '*' in p.ty:
if 'DEVICE_CREATE_INFO' in p.ty:
- if_body.append(' pPacket->%s = interpret_XGL_DEVICE_CREATE_INFO(pHeader, (intptr_t)pPacket->%s);' % (p.name, p.name))
+ if_body.append(' pPacket->%s = interpret_VK_DEVICE_CREATE_INFO(pHeader, (intptr_t)pPacket->%s);' % (p.name, p.name))
else:
if_body.append(' pPacket->%s = (%s)glv_trace_packet_interpret_buffer_pointer(pHeader, (intptr_t)pPacket->%s);' % (p.name, p.ty, p.name))
# TODO : Generalize this custom code to kill dict data struct above.
@@ -1197,16 +1098,16 @@
if_body = []
for proto in self.protos:
if func_class in proto.name:
- if_body.append('typedef struct struct_xgl%s {' % proto.name)
+ if_body.append('typedef struct struct_vk%s {' % proto.name)
if_body.append(' glv_trace_packet_header* pHeader;')
for p in proto.params:
if_body.append(' %s %s;' % (p.ty, p.name))
if 'void' != proto.ret:
if_body.append(' %s result;' % proto.ret)
- if_body.append('} struct_xgl%s;\n' % proto.name)
- if_body.append('static struct_xgl%s* interpret_body_as_xgl%s(glv_trace_packet_header* pHeader)' % (proto.name, proto.name))
+ if_body.append('} struct_vk%s;\n' % proto.name)
+ if_body.append('static struct_vk%s* interpret_body_as_vk%s(glv_trace_packet_header* pHeader)' % (proto.name, proto.name))
if_body.append('{')
- if_body.append(' struct_xgl%s* pPacket = (struct_xgl%s*)pHeader->pBody;' % (proto.name, proto.name))
+ if_body.append(' struct_vk%s* pPacket = (struct_vk%s*)pHeader->pBody;' % (proto.name, proto.name))
if_body.append(' pPacket->pHeader = pHeader;')
for p in proto.params:
if '*' in p.ty:
@@ -1217,18 +1118,18 @@
def _generate_replay_func_ptrs(self):
xf_body = []
- xf_body.append('struct xglFuncs {')
+ xf_body.append('struct vkFuncs {')
xf_body.append(' void init_funcs(void * libHandle);')
xf_body.append(' void *m_libHandle;\n')
for proto in self.protos:
- xf_body.append(' typedef %s( XGLAPI * type_xgl%s)(' % (proto.ret, proto.name))
+ xf_body.append(' typedef %s( VKAPI * type_vk%s)(' % (proto.ret, proto.name))
for p in proto.params:
if '[4]' in p.ty:
xf_body.append(' %s %s[4],' % (p.ty.strip('[4]'), p.name))
else:
xf_body.append(' %s %s,' % (p.ty, p.name))
xf_body[-1] = xf_body[-1].replace(',', ');')
- xf_body.append(' type_xgl%s real_xgl%s;' % (proto.name, proto.name))
+ xf_body.append(' type_vk%s real_vk%s;' % (proto.name, proto.name))
xf_body.append('};')
return "\n".join(xf_body)
@@ -1250,7 +1151,7 @@
def _remap_decl(self, ty, name):
txt = ' %s remap(const %s& value)\n {\n' % (ty, ty)
txt += ' std::map<%s, %s>::const_iterator q = %s.find(value);\n' % (ty, ty, name)
- txt += ' return (q == %s.end()) ? XGL_NULL_HANDLE : q->second;\n }\n' % name
+ txt += ' return (q == %s.end()) ? VK_NULL_HANDLE : q->second;\n }\n' % name
return txt
def _generate_replay_objMemory_funcs(self):
@@ -1262,7 +1163,7 @@
rof_body.append(' return m_pendingAlloc;')
rof_body.append(' }')
rof_body.append('')
- rof_body.append(' void setAllocInfo(const XGL_MEMORY_ALLOC_INFO *info, const bool pending)')
+ rof_body.append(' void setAllocInfo(const VK_MEMORY_ALLOC_INFO *info, const bool pending)')
rof_body.append(' {')
rof_body.append(' m_pendingAlloc = pending;')
rof_body.append(' m_allocInfo = *info;')
@@ -1322,20 +1223,20 @@
return "\n".join(rof_body)
def _generate_replay_objmapper_class(self):
- # Create dict mapping member var names to XGL type (i.e. 'm_imageViews' : 'XGL_IMAGE_VIEW')
+ # Create dict mapping member var names to VK type (i.e. 'm_imageViews' : 'VK_IMAGE_VIEW')
obj_map_dict = {}
- for ty in xgl.object_type_list:
- if ty in xgl.object_parent_list:
+ for ty in vulkan.object_type_list:
+ if ty in vulkan.object_parent_list:
continue
- mem_var = ty.replace('XGL_', '').lower()
+ mem_var = ty.replace('VK_', '').lower()
mem_var_list = mem_var.split('_')
mem_var = 'm_%s%ss' % (mem_var_list[0], "".join([m.title() for m in mem_var_list[1:]]))
obj_map_dict[mem_var] = ty
rc_body = []
- rc_body.append('typedef struct _XGLAllocInfo {')
- rc_body.append(' XGL_GPU_SIZE size;')
+ rc_body.append('typedef struct _VKAllocInfo {')
+ rc_body.append(' VK_GPU_SIZE size;')
rc_body.append(' void *pData;')
- rc_body.append('} XGLAllocInfo;')
+ rc_body.append('} VKAllocInfo;')
rc_body.append('')
rc_body.append('class objMemory {')
rc_body.append('public:')
@@ -1345,13 +1246,13 @@
rc_body.append(' {')
rc_body.append(' m_numAllocations = num;')
rc_body.append(' }\n')
- rc_body.append(' void setReqs(const XGL_MEMORY_REQUIREMENTS *pReqs, const uint32_t num)')
+ rc_body.append(' void setReqs(const VK_MEMORY_REQUIREMENTS *pReqs, const uint32_t num)')
rc_body.append(' {')
rc_body.append(' if (m_numAllocations != num && m_numAllocations != 0)')
rc_body.append(' glv_LogError("objMemory::setReqs, internal mismatch on number of allocations");')
rc_body.append(' if (m_pMemReqs == NULL && pReqs != NULL)')
rc_body.append(' {')
- rc_body.append(' m_pMemReqs = (XGL_MEMORY_REQUIREMENTS *) glv_malloc(num * sizeof(XGL_MEMORY_REQUIREMENTS));')
+ rc_body.append(' m_pMemReqs = (VK_MEMORY_REQUIREMENTS *) glv_malloc(num * sizeof(VK_MEMORY_REQUIREMENTS));')
rc_body.append(' if (m_pMemReqs == NULL)')
rc_body.append(' {')
rc_body.append(' glv_LogError("objMemory::setReqs out of memory");')
@@ -1362,7 +1263,7 @@
rc_body.append(' }\n')
rc_body.append('private:')
rc_body.append(' uint32_t m_numAllocations;')
- rc_body.append(' XGL_MEMORY_REQUIREMENTS *m_pMemReqs;')
+ rc_body.append(' VK_MEMORY_REQUIREMENTS *m_pMemReqs;')
rc_body.append('};')
rc_body.append('')
rc_body.append('class gpuMemory {')
@@ -1371,7 +1272,7 @@
rc_body.append(' ~gpuMemory() {}')
rc_body.append(self._generate_replay_objMemory_funcs())
# rc_body.append(' bool isPendingAlloc();')
-# rc_body.append(' void setAllocInfo(const XGL_MEMORY_ALLOC_INFO *info, const bool pending);')
+# rc_body.append(' void setAllocInfo(const VK_MEMORY_ALLOC_INFO *info, const bool pending);')
# rc_body.append(' void setMemoryDataAddr(void* pBuf);')
# rc_body.append(' void setMemoryMapRange(void* pBuf, const size_t size, const size_t offset, const bool pending);')
# rc_body.append(' void copyMappingData(const void *pSrcData);')
@@ -1385,42 +1286,42 @@
rc_body.append(' void* pData;')
rc_body.append(' };')
rc_body.append(' std::vector<MapRange> m_mapRange;')
- rc_body.append(' XGL_MEMORY_ALLOC_INFO m_allocInfo;')
+ rc_body.append(' VK_MEMORY_ALLOC_INFO m_allocInfo;')
rc_body.append('};')
rc_body.append('')
rc_body.append('typedef struct _imageObj {')
rc_body.append(' objMemory imageMem;')
- rc_body.append(' XGL_IMAGE replayImage;')
+ rc_body.append(' VK_IMAGE replayImage;')
rc_body.append(' } imageObj;')
rc_body.append('')
rc_body.append('typedef struct _bufferObj {')
rc_body.append(' objMemory bufferMem;')
- rc_body.append(' XGL_BUFFER replayBuffer;')
+ rc_body.append(' VK_BUFFER replayBuffer;')
rc_body.append(' } bufferObj;')
rc_body.append('')
rc_body.append('typedef struct _gpuMemObj {')
rc_body.append(' gpuMemory *pGpuMem;')
- rc_body.append(' XGL_GPU_MEMORY replayGpuMem;')
+ rc_body.append(' VK_GPU_MEMORY replayGpuMem;')
rc_body.append(' } gpuMemObj;')
rc_body.append('')
- rc_body.append('class xglReplayObjMapper {')
+ rc_body.append('class vkReplayObjMapper {')
rc_body.append('public:')
- rc_body.append(' xglReplayObjMapper() {}')
- rc_body.append(' ~xglReplayObjMapper() {}')
+ rc_body.append(' vkReplayObjMapper() {}')
+ rc_body.append(' ~vkReplayObjMapper() {}')
rc_body.append('')
rc_body.append(' bool m_adjustForGPU; // true if replay adjusts behavior based on GPU')
# Code for memory objects for handling replay GPU != trace GPU object memory requirements
- rc_body.append(' void init_objMemCount(const XGL_BASE_OBJECT& object, const uint32_t &num)\n {')
- rc_body.append(' XGL_IMAGE img = static_cast <XGL_IMAGE> (object);')
- rc_body.append(' std::map<XGL_IMAGE, imageObj>::const_iterator it = m_images.find(img);')
+ rc_body.append(' void init_objMemCount(const VK_BASE_OBJECT& object, const uint32_t &num)\n {')
+ rc_body.append(' VK_IMAGE img = static_cast <VK_IMAGE> (object);')
+ rc_body.append(' std::map<VK_IMAGE, imageObj>::const_iterator it = m_images.find(img);')
rc_body.append(' if (it != m_images.end())')
rc_body.append(' {')
rc_body.append(' objMemory obj = it->second.imageMem;')
rc_body.append(' obj.setCount(num);')
rc_body.append(' return;')
rc_body.append(' }')
- rc_body.append(' XGL_BUFFER buf = static_cast <XGL_BUFFER> (object);')
- rc_body.append(' std::map<XGL_BUFFER, bufferObj>::const_iterator itb = m_buffers.find(buf);')
+ rc_body.append(' VK_BUFFER buf = static_cast <VK_BUFFER> (object);')
+ rc_body.append(' std::map<VK_BUFFER, bufferObj>::const_iterator itb = m_buffers.find(buf);')
rc_body.append(' if (itb != m_buffers.end())')
rc_body.append(' {')
rc_body.append(' objMemory obj = itb->second.bufferMem;')
@@ -1429,17 +1330,17 @@
rc_body.append(' }')
rc_body.append(' return;')
rc_body.append(' }\n')
- rc_body.append(' void init_objMemReqs(const XGL_BASE_OBJECT& object, const XGL_MEMORY_REQUIREMENTS *pMemReqs, const unsigned int num)\n {')
- rc_body.append(' XGL_IMAGE img = static_cast <XGL_IMAGE> (object);')
- rc_body.append(' std::map<XGL_IMAGE, imageObj>::const_iterator it = m_images.find(img);')
+ rc_body.append(' void init_objMemReqs(const VK_BASE_OBJECT& object, const VK_MEMORY_REQUIREMENTS *pMemReqs, const unsigned int num)\n {')
+ rc_body.append(' VK_IMAGE img = static_cast <VK_IMAGE> (object);')
+ rc_body.append(' std::map<VK_IMAGE, imageObj>::const_iterator it = m_images.find(img);')
rc_body.append(' if (it != m_images.end())')
rc_body.append(' {')
rc_body.append(' objMemory obj = it->second.imageMem;')
rc_body.append(' obj.setReqs(pMemReqs, num);')
rc_body.append(' return;')
rc_body.append(' }')
- rc_body.append(' XGL_BUFFER buf = static_cast <XGL_BUFFER> (object);')
- rc_body.append(' std::map<XGL_BUFFER, bufferObj>::const_iterator itb = m_buffers.find(buf);')
+ rc_body.append(' VK_BUFFER buf = static_cast <VK_BUFFER> (object);')
+ rc_body.append(' std::map<VK_BUFFER, bufferObj>::const_iterator itb = m_buffers.find(buf);')
rc_body.append(' if (itb != m_buffers.end())')
rc_body.append(' {')
rc_body.append(' objMemory obj = itb->second.bufferMem;')
@@ -1454,85 +1355,85 @@
rc_body.append(' %s.clear();' % var)
rc_body.append(' }\n')
for var in sorted(obj_map_dict):
- if obj_map_dict[var] == 'XGL_IMAGE':
+ if obj_map_dict[var] == 'VK_IMAGE':
rc_body.append(self._map_decl(obj_map_dict[var], 'imageObj', var))
rc_body.append(self._add_to_map_decl(obj_map_dict[var], 'imageObj', var))
rc_body.append(self._rm_from_map_decl(obj_map_dict[var], var))
- rc_body.append(' XGL_IMAGE remap(const XGL_IMAGE& value)')
+ rc_body.append(' VK_IMAGE remap(const VK_IMAGE& value)')
rc_body.append(' {')
- rc_body.append(' std::map<XGL_IMAGE, imageObj>::const_iterator q = m_images.find(value);')
- rc_body.append(' return (q == m_images.end()) ? XGL_NULL_HANDLE : q->second.replayImage;')
+ rc_body.append(' std::map<VK_IMAGE, imageObj>::const_iterator q = m_images.find(value);')
+ rc_body.append(' return (q == m_images.end()) ? VK_NULL_HANDLE : q->second.replayImage;')
rc_body.append(' }\n')
- elif obj_map_dict[var] == 'XGL_BUFFER':
+ elif obj_map_dict[var] == 'VK_BUFFER':
rc_body.append(self._map_decl(obj_map_dict[var], 'bufferObj', var))
rc_body.append(self._add_to_map_decl(obj_map_dict[var], 'bufferObj', var))
rc_body.append(self._rm_from_map_decl(obj_map_dict[var], var))
- rc_body.append(' XGL_BUFFER remap(const XGL_BUFFER& value)')
+ rc_body.append(' VK_BUFFER remap(const VK_BUFFER& value)')
rc_body.append(' {')
- rc_body.append(' std::map<XGL_BUFFER, bufferObj>::const_iterator q = m_buffers.find(value);')
- rc_body.append(' return (q == m_buffers.end()) ? XGL_NULL_HANDLE : q->second.replayBuffer;')
+ rc_body.append(' std::map<VK_BUFFER, bufferObj>::const_iterator q = m_buffers.find(value);')
+ rc_body.append(' return (q == m_buffers.end()) ? VK_NULL_HANDLE : q->second.replayBuffer;')
rc_body.append(' }\n')
- elif obj_map_dict[var] == 'XGL_GPU_MEMORY':
+ elif obj_map_dict[var] == 'VK_GPU_MEMORY':
rc_body.append(self._map_decl(obj_map_dict[var], 'gpuMemObj', var))
rc_body.append(self._add_to_map_decl(obj_map_dict[var], 'gpuMemObj', var))
rc_body.append(self._rm_from_map_decl(obj_map_dict[var], var))
- rc_body.append(' XGL_GPU_MEMORY remap(const XGL_GPU_MEMORY& value)')
+ rc_body.append(' VK_GPU_MEMORY remap(const VK_GPU_MEMORY& value)')
rc_body.append(' {')
- rc_body.append(' std::map<XGL_GPU_MEMORY, gpuMemObj>::const_iterator q = m_gpuMemorys.find(value);')
- rc_body.append(' return (q == m_gpuMemorys.end()) ? XGL_NULL_HANDLE : q->second.replayGpuMem;')
+ rc_body.append(' std::map<VK_GPU_MEMORY, gpuMemObj>::const_iterator q = m_gpuMemorys.find(value);')
+ rc_body.append(' return (q == m_gpuMemorys.end()) ? VK_NULL_HANDLE : q->second.replayGpuMem;')
rc_body.append(' }\n')
else:
rc_body.append(self._map_decl(obj_map_dict[var], obj_map_dict[var], var))
rc_body.append(self._add_to_map_decl(obj_map_dict[var], obj_map_dict[var], var))
rc_body.append(self._rm_from_map_decl(obj_map_dict[var], var))
rc_body.append(self._remap_decl(obj_map_dict[var], var))
- # XGL_DYNAMIC_STATE_OBJECT code
- state_obj_remap_types = xgl.object_dynamic_state_list
- rc_body.append(' XGL_DYNAMIC_STATE_OBJECT remap(const XGL_DYNAMIC_STATE_OBJECT& state)\n {')
- rc_body.append(' XGL_DYNAMIC_STATE_OBJECT obj;')
+ # VK_DYNAMIC_STATE_OBJECT code
+ state_obj_remap_types = vulkan.object_dynamic_state_list
+ rc_body.append(' VK_DYNAMIC_STATE_OBJECT remap(const VK_DYNAMIC_STATE_OBJECT& state)\n {')
+ rc_body.append(' VK_DYNAMIC_STATE_OBJECT obj;')
for t in state_obj_remap_types:
- rc_body.append(' if ((obj = remap(static_cast <%s> (state))) != XGL_NULL_HANDLE)' % t)
+ rc_body.append(' if ((obj = remap(static_cast <%s> (state))) != VK_NULL_HANDLE)' % t)
rc_body.append(' return obj;')
- rc_body.append(' return XGL_NULL_HANDLE;\n }')
- rc_body.append(' void rm_from_map(const XGL_DYNAMIC_STATE_OBJECT& state)\n {')
+ rc_body.append(' return VK_NULL_HANDLE;\n }')
+ rc_body.append(' void rm_from_map(const VK_DYNAMIC_STATE_OBJECT& state)\n {')
for t in state_obj_remap_types:
rc_body.append(' rm_from_map(static_cast <%s> (state));' % t)
rc_body.append(' }')
rc_body.append('')
# OBJECT code
- rc_body.append(' XGL_OBJECT remap(const XGL_OBJECT& object)\n {')
- rc_body.append(' XGL_OBJECT obj;')
- obj_remap_types = xgl.object_list
+ rc_body.append(' VK_OBJECT remap(const VK_OBJECT& object)\n {')
+ rc_body.append(' VK_OBJECT obj;')
+ obj_remap_types = vulkan.object_list
for var in obj_remap_types:
- rc_body.append(' if ((obj = remap(static_cast <%s> (object))) != XGL_NULL_HANDLE)' % (var))
+ rc_body.append(' if ((obj = remap(static_cast <%s> (object))) != VK_NULL_HANDLE)' % (var))
rc_body.append(' return obj;')
- rc_body.append(' return XGL_NULL_HANDLE;\n }')
- rc_body.append(' void rm_from_map(const XGL_OBJECT & objKey)\n {')
+ rc_body.append(' return VK_NULL_HANDLE;\n }')
+ rc_body.append(' void rm_from_map(const VK_OBJECT & objKey)\n {')
for var in obj_remap_types:
rc_body.append(' rm_from_map(static_cast <%s> (objKey));' % (var))
rc_body.append(' }')
- rc_body.append(' XGL_BASE_OBJECT remap(const XGL_BASE_OBJECT& object)\n {')
- rc_body.append(' XGL_BASE_OBJECT obj;')
- base_obj_remap_types = ['XGL_DEVICE', 'XGL_QUEUE', 'XGL_GPU_MEMORY', 'XGL_OBJECT']
+ rc_body.append(' VK_BASE_OBJECT remap(const VK_BASE_OBJECT& object)\n {')
+ rc_body.append(' VK_BASE_OBJECT obj;')
+ base_obj_remap_types = ['VK_DEVICE', 'VK_QUEUE', 'VK_GPU_MEMORY', 'VK_OBJECT']
for t in base_obj_remap_types:
- rc_body.append(' if ((obj = remap(static_cast <%s> (object))) != XGL_NULL_HANDLE)' % t)
+ rc_body.append(' if ((obj = remap(static_cast <%s> (object))) != VK_NULL_HANDLE)' % t)
rc_body.append(' return obj;')
- rc_body.append(' return XGL_NULL_HANDLE;')
+ rc_body.append(' return VK_NULL_HANDLE;')
rc_body.append(' }')
rc_body.append('};')
return "\n".join(rc_body)
def _generate_replay_init_funcs(self):
rif_body = []
- rif_body.append('void xglFuncs::init_funcs(void * handle)\n{\n m_libHandle = handle;')
+ rif_body.append('void vkFuncs::init_funcs(void * handle)\n{\n m_libHandle = handle;')
for proto in self.protos:
- rif_body.append(' real_xgl%s = (type_xgl%s)(glv_platform_get_library_entrypoint(handle, "xgl%s"));' % (proto.name, proto.name, proto.name))
+ rif_body.append(' real_vk%s = (type_vk%s)(glv_platform_get_library_entrypoint(handle, "vk%s"));' % (proto.name, proto.name, proto.name))
rif_body.append('}')
return "\n".join(rif_body)
def _get_packet_param(self, t, n):
# list of types that require remapping
- remap_list = xgl.object_type_list
+ remap_list = vulkan.object_type_list
param_exclude_list = ['p1', 'p2', 'pGpus', 'pDescriptorSets']
if t.strip('*').replace('const ', '') in remap_list and n not in param_exclude_list:
if '*' in t:
@@ -1545,44 +1446,44 @@
def _gen_replay_enum_gpus(self):
ieg_body = []
- ieg_body.append(' returnValue = manually_handle_xglEnumerateGpus(pPacket);')
+ ieg_body.append(' returnValue = manually_handle_vkEnumerateGpus(pPacket);')
return "\n".join(ieg_body)
def _gen_replay_get_gpu_info(self):
ggi_body = []
- ggi_body.append(' returnValue = manually_handle_xglGetGpuInfo(pPacket);')
+ ggi_body.append(' returnValue = manually_handle_vkGetGpuInfo(pPacket);')
return "\n".join(ggi_body)
def _gen_replay_create_device(self):
cd_body = []
- cd_body.append(' returnValue = manually_handle_xglCreateDevice(pPacket);')
+ cd_body.append(' returnValue = manually_handle_vkCreateDevice(pPacket);')
return "\n".join(cd_body)
def _gen_replay_get_extension_support(self):
ges_body = []
- ges_body.append(' returnValue = manually_handle_xglGetExtensionSupport(pPacket);')
+ ges_body.append(' returnValue = manually_handle_vkGetExtensionSupport(pPacket);')
return "\n".join(ges_body)
def _gen_replay_queue_submit(self):
qs_body = []
- qs_body.append(' returnValue = manually_handle_xglQueueSubmit(pPacket);')
+ qs_body.append(' returnValue = manually_handle_vkQueueSubmit(pPacket);')
return "\n".join(qs_body)
def _gen_replay_get_object_info(self):
goi_body = []
- goi_body.append(' returnValue = manually_handle_xglGetObjectInfo(pPacket);')
+ goi_body.append(' returnValue = manually_handle_vkGetObjectInfo(pPacket);')
return "\n".join(goi_body)
def _gen_replay_get_format_info(self):
gfi_body = []
- gfi_body.append(' returnValue = manually_handle_xglGetFormatInfo(pPacket);')
+ gfi_body.append(' returnValue = manually_handle_vkGetFormatInfo(pPacket);')
return "\n".join(gfi_body)
def _gen_replay_create_image(self):
ci_body = []
ci_body.append(' imageObj local_imageObj;')
- ci_body.append(' replayResult = m_xglFuncs.real_xglCreateImage(m_objMapper.remap(pPacket->device), pPacket->pCreateInfo, &local_imageObj.replayImage);')
- ci_body.append(' if (replayResult == XGL_SUCCESS)')
+ ci_body.append(' replayResult = m_vkFuncs.real_vkCreateImage(m_objMapper.remap(pPacket->device), pPacket->pCreateInfo, &local_imageObj.replayImage);')
+ ci_body.append(' if (replayResult == VK_SUCCESS)')
ci_body.append(' {')
ci_body.append(' m_objMapper.add_to_map(pPacket->pImage, &local_imageObj);')
ci_body.append(' }')
@@ -1591,8 +1492,8 @@
def _gen_replay_create_buffer(self):
cb_body = []
cb_body.append(' bufferObj local_bufferObj;')
- cb_body.append(' replayResult = m_xglFuncs.real_xglCreateBuffer(m_objMapper.remap(pPacket->device), pPacket->pCreateInfo, &local_bufferObj.replayBuffer);')
- cb_body.append(' if (replayResult == XGL_SUCCESS)')
+ cb_body.append(' replayResult = m_vkFuncs.real_vkCreateBuffer(m_objMapper.remap(pPacket->device), pPacket->pCreateInfo, &local_bufferObj.replayBuffer);')
+ cb_body.append(' if (replayResult == VK_SUCCESS)')
cb_body.append(' {')
cb_body.append(' m_objMapper.add_to_map(pPacket->pBuffer, &local_bufferObj);')
cb_body.append(' }')
@@ -1600,224 +1501,95 @@
def _gen_replay_get_image_subresource_info(self):
isi_body = []
- isi_body.append(' returnValue = manually_handle_xglGetImageSubresourceInfo(pPacket);')
+ isi_body.append(' returnValue = manually_handle_vkGetImageSubresourceInfo(pPacket);')
return "\n".join(isi_body)
def _gen_replay_update_descriptors(self):
ud_body = []
- ud_body.append(' returnValue = manually_handle_xglUpdateDescriptors(pPacket);')
+ ud_body.append(' returnValue = manually_handle_vkUpdateDescriptors(pPacket);')
return "\n".join(ud_body)
def _gen_replay_create_descriptor_set_layout(self):
cdsl_body = []
- cdsl_body.append(' returnValue = manually_handle_xglCreateDescriptorSetLayout(pPacket);')
+ cdsl_body.append(' returnValue = manually_handle_vkCreateDescriptorSetLayout(pPacket);')
return "\n".join(cdsl_body)
- def _gen_replay_create_descriptor_set_layout_chain(self):
- cdslc_body = []
- cdslc_body.append(' XGL_DESCRIPTOR_SET_LAYOUT_CHAIN local_pLayoutChain;')
- cdslc_body.append(' XGL_DESCRIPTOR_SET_LAYOUT *saveSetLayoutArray = (XGL_DESCRIPTOR_SET_LAYOUT *) glv_malloc(pPacket->setLayoutArrayCount * sizeof(XGL_DESCRIPTOR_SET_LAYOUT));')
- cdslc_body.append(' XGL_DESCRIPTOR_SET_LAYOUT *pSetLayoutOrig = (XGL_DESCRIPTOR_SET_LAYOUT *) pPacket->pSetLayoutArray;')
- cdslc_body.append(' uint32_t i;')
- cdslc_body.append(' for (i = 0; i < pPacket->setLayoutArrayCount && pPacket->pSetLayoutArray != NULL; i++)')
- cdslc_body.append(' {')
- cdslc_body.append(' saveSetLayoutArray[i] = pPacket->pSetLayoutArray[i];')
- cdslc_body.append(' *pSetLayoutOrig++ = m_objMapper.remap(pPacket->pSetLayoutArray[i]);')
- cdslc_body.append(' }')
- cdslc_body.append(' replayResult = m_xglFuncs.real_xglCreateDescriptorSetLayoutChain(m_objMapper.remap(pPacket->device), pPacket->setLayoutArrayCount, pPacket->pSetLayoutArray, &local_pLayoutChain);')
- cdslc_body.append(' pSetLayoutOrig = (XGL_DESCRIPTOR_SET_LAYOUT *) pPacket->pSetLayoutArray;')
- cdslc_body.append(' for (i = 0; i < pPacket->setLayoutArrayCount && pPacket->pSetLayoutArray != NULL; i++)')
- cdslc_body.append(' {')
- cdslc_body.append(' *pSetLayoutOrig++ = saveSetLayoutArray[i];')
- cdslc_body.append(' }')
- cdslc_body.append(' if (replayResult == XGL_SUCCESS)')
- cdslc_body.append(' {')
- cdslc_body.append(' m_objMapper.add_to_map(pPacket->pLayoutChain, &local_pLayoutChain);')
- cdslc_body.append(' }')
- cdslc_body.append(' free(saveSetLayoutArray);')
- return "\n".join(cdslc_body)
-
def _gen_replay_create_graphics_pipeline(self):
cgp_body = []
- cgp_body.append(' returnValue = manually_handle_xglCreateGraphicsPipeline(pPacket);')
- return "\n".join(cgp_body)
-
- def _gen_replay_create_graphics_pipeline_derivative(self):
- cgp_body = []
- cgp_body.append(' XGL_GRAPHICS_PIPELINE_CREATE_INFO createInfo;')
- cgp_body.append(' struct shaderPair saveShader[10];')
- cgp_body.append(' unsigned int idx = 0;')
- cgp_body.append(' memcpy(&createInfo, pPacket->pCreateInfo, sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO));')
- cgp_body.append(' createInfo.pSetLayoutChain = m_objMapper.remap(createInfo.pSetLayoutChain);')
- cgp_body.append(' // Cast to shader type, as those are of primariy interest and all structs in LL have same header w/ sType & pNext')
- cgp_body.append(' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pPacketNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;')
- cgp_body.append(' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)createInfo.pNext;')
- cgp_body.append(' while (XGL_NULL_HANDLE != pPacketNext)')
- cgp_body.append(' {')
- cgp_body.append(' if (XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO == pNext->sType)')
- cgp_body.append(' {')
- cgp_body.append(' saveShader[idx].val = pNext->shader.shader;')
- cgp_body.append(' saveShader[idx++].addr = &(pNext->shader.shader);')
- cgp_body.append(' pNext->shader.shader = m_objMapper.remap(pPacketNext->shader.shader);')
- cgp_body.append(' }')
- cgp_body.append(' pPacketNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacketNext->pNext;')
- cgp_body.append(' pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pNext->pNext;')
- cgp_body.append(' }')
- cgp_body.append(' XGL_PIPELINE pipeline;')
- cgp_body.append(' replayResult = m_xglFuncs.real_xglCreateGraphicsPipelineDerivative(m_objMapper.remap(pPacket->device), &createInfo, m_objMapper.remap(pPacket->basePipeline), &pipeline);')
- cgp_body.append(' if (replayResult == XGL_SUCCESS)')
- cgp_body.append(' {')
- cgp_body.append(' m_objMapper.add_to_map(pPacket->pPipeline, &pipeline);')
- cgp_body.append(' }')
- cgp_body.append(' for (unsigned int i = 0; i < idx; i++)')
- cgp_body.append(' *(saveShader[i].addr) = saveShader[i].val;')
+ cgp_body.append(' returnValue = manually_handle_vkCreateGraphicsPipeline(pPacket);')
return "\n".join(cgp_body)
def _gen_replay_cmd_wait_events(self):
cwe_body = []
- cwe_body.append(' returnValue = manually_handle_xglCmdWaitEvents(pPacket);')
+ cwe_body.append(' returnValue = manually_handle_vkCmdWaitEvents(pPacket);')
return "\n".join(cwe_body)
- def _gen_replay_create_graphics_pipeline_derivative(self):
- cgp_body = []
- cgp_body.append(' XGL_GRAPHICS_PIPELINE_CREATE_INFO createInfo;')
- cgp_body.append(' struct shaderPair saveShader[10];')
- cgp_body.append(' unsigned int idx = 0;')
- cgp_body.append(' memcpy(&createInfo, pPacket->pCreateInfo, sizeof(XGL_GRAPHICS_PIPELINE_CREATE_INFO));')
- cgp_body.append(' createInfo.pSetLayoutChain = m_objMapper.remap(createInfo.pSetLayoutChain);')
- cgp_body.append(' // Cast to shader type, as those are of primariy interest and all structs in LL have same header w/ sType & pNext')
- cgp_body.append(' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pPacketNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacket->pCreateInfo->pNext;')
- cgp_body.append(' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)createInfo.pNext;')
- cgp_body.append(' while (XGL_NULL_HANDLE != pPacketNext)')
- cgp_body.append(' {')
- cgp_body.append(' if (XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO == pNext->sType)')
- cgp_body.append(' {')
- cgp_body.append(' saveShader[idx].val = pNext->shader.shader;')
- cgp_body.append(' saveShader[idx++].addr = &(pNext->shader.shader);')
- cgp_body.append(' pNext->shader.shader = m_objMapper.remap(pPacketNext->shader.shader);')
- cgp_body.append(' }')
- cgp_body.append(' pPacketNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pPacketNext->pNext;')
- cgp_body.append(' pNext = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*)pNext->pNext;')
- cgp_body.append(' }')
- cgp_body.append(' XGL_PIPELINE pipeline;')
- cgp_body.append(' replayResult = m_xglFuncs.real_xglCreateGraphicsPipelineDerivative(m_objMapper.remap(pPacket->device), &createInfo, m_objMapper.remap(pPacket->basePipeline), &pipeline);')
- cgp_body.append(' if (replayResult == XGL_SUCCESS)')
- cgp_body.append(' {')
- cgp_body.append(' m_objMapper.add_to_map(pPacket->pPipeline, &pipeline);')
- cgp_body.append(' }')
- cgp_body.append(' for (unsigned int i = 0; i < idx; i++)')
- cgp_body.append(' *(saveShader[i].addr) = saveShader[i].val;')
- return "\n".join(cgp_body)
-
- def _gen_replay_cmd_bind_descriptor_sets(self):
- cbds_body = []
- cbds_body.append(' XGL_DESCRIPTOR_SET *pSaveSets = (XGL_DESCRIPTOR_SET *) glv_malloc(sizeof(XGL_DESCRIPTOR_SET) * pPacket->count);')
- cbds_body.append(' if (pSaveSets == NULL)')
- cbds_body.append(' {')
- cbds_body.append(' glv_LogError("replay of CmdBindDescriptorSets out of memory\\n");')
- cbds_body.append(' }')
- cbds_body.append(' for (uint32_t idx = 0; idx < pPacket->count && pPacket->pDescriptorSets != NULL; idx++)')
- cbds_body.append(' {')
- cbds_body.append(' XGL_DESCRIPTOR_SET *pSet = (XGL_DESCRIPTOR_SET *) &(pPacket->pDescriptorSets[idx]);')
- cbds_body.append(' pSaveSets[idx] = pPacket->pDescriptorSets[idx];')
- cbds_body.append(' *pSet = m_objMapper.remap(pPacket->pDescriptorSets[idx]);')
- cbds_body.append(' }')
- cbds_body.append(' m_xglFuncs.real_xglCmdBindDescriptorSets(m_objMapper.remap(pPacket->cmdBuffer), pPacket->pipelineBindPoint, m_objMapper.remap(pPacket->layoutChain), pPacket->layoutChainSlot, pPacket->count, pPacket->pDescriptorSets, pPacket->pUserData);')
- cbds_body.append(' for (uint32_t idx = 0; idx < pPacket->count && pPacket->pDescriptorSets != NULL; idx++)')
- cbds_body.append(' {')
- cbds_body.append(' XGL_DESCRIPTOR_SET *pSet = (XGL_DESCRIPTOR_SET *) &(pPacket->pDescriptorSets[idx]);')
- cbds_body.append(' *pSet = pSaveSets[idx];')
- cbds_body.append(' }')
- cbds_body.append(' glv_free(pSaveSets);')
- return "\n".join(cbds_body)
-
def _gen_replay_cmd_pipeline_barrier(self):
cpb_body = []
- cpb_body.append(' returnValue = manually_handle_xglCmdPipelineBarrier(pPacket);')
+ cpb_body.append(' returnValue = manually_handle_vkCmdPipelineBarrier(pPacket);')
return "\n".join(cpb_body)
def _gen_replay_create_framebuffer(self):
cf_body = []
- cf_body.append(' returnValue = manually_handle_xglCreateFramebuffer(pPacket);')
+ cf_body.append(' returnValue = manually_handle_vkCreateFramebuffer(pPacket);')
return "\n".join(cf_body)
def _gen_replay_create_renderpass(self):
cr_body = []
- cr_body.append(' returnValue = manually_handle_xglCreateRenderPass(pPacket);')
+ cr_body.append(' returnValue = manually_handle_vkCreateRenderPass(pPacket);')
return "\n".join(cr_body)
def _gen_replay_begin_command_buffer(self):
bcb_body = []
- bcb_body.append(' returnValue = manually_handle_xglBeginCommandBuffer(pPacket);')
+ bcb_body.append(' returnValue = manually_handle_vkBeginCommandBuffer(pPacket);')
return "\n".join(bcb_body)
- def _gen_replay_begin_render_pass(self):
- cbrp_body = []
- cbrp_body.append(' XGL_RENDER_PASS_BEGIN savedRPB, *pRPB = (XGL_RENDER_PASS_BEGIN *) pPacket->pRenderPassBegin;')
- cbrp_body.append(' savedRPB = *(pPacket->pRenderPassBegin);')
- cbrp_body.append(' pRPB->renderPass = m_objMapper.remap(savedRPB.renderPass);')
- cbrp_body.append(' pRPB->framebuffer = m_objMapper.remap(savedRPB.framebuffer);')
- cbrp_body.append(' m_xglFuncs.real_xglCmdBeginRenderPass(m_objMapper.remap(pPacket->cmdBuffer), pPacket->pRenderPassBegin);')
- cbrp_body.append(' *pRPB = savedRPB;')
- return "\n".join(cbrp_body)
-
def _gen_replay_store_pipeline(self):
sp_body = []
- sp_body.append(' returnValue = manually_handle_xglStorePipeline(pPacket);')
+ sp_body.append(' returnValue = manually_handle_vkStorePipeline(pPacket);')
return "\n".join(sp_body)
def _gen_replay_get_multi_gpu_compatibility(self):
gmgc_body = []
- gmgc_body.append(' returnValue = manually_handle_xglGetMultiGpuCompatibility(pPacket);')
+ gmgc_body.append(' returnValue = manually_handle_vkGetMultiGpuCompatibility(pPacket);')
return "\n".join(gmgc_body)
def _gen_replay_destroy_object(self):
do_body = []
- do_body.append(' returnValue = manually_handle_xglDestroyObject(pPacket);')
+ do_body.append(' returnValue = manually_handle_vkDestroyObject(pPacket);')
return "\n".join(do_body)
def _gen_replay_wait_for_fences(self):
wf_body = []
- wf_body.append(' returnValue = manually_handle_xglWaitForFences(pPacket);')
- return "\n".join(wf_body)
-
- def _gen_replay_reset_fences(self):
- wf_body = []
- wf_body.append(' XGL_FENCE *pFence = GLV_NEW_ARRAY(XGL_FENCE, pPacket->fenceCount);')
- wf_body.append(' for (uint32_t i = 0; i < pPacket->fenceCount; i++)')
- wf_body.append(' {')
- wf_body.append(' *(pFence + i) = m_objMapper.remap(*(pPacket->pFences + i));')
- wf_body.append(' }')
- wf_body.append(' replayResult = m_xglFuncs.real_xglResetFences(m_objMapper.remap(pPacket->device), pPacket->fenceCount, pFence);')
- wf_body.append(' GLV_DELETE(pFence);')
+ wf_body.append(' returnValue = manually_handle_vkWaitForFences(pPacket);')
return "\n".join(wf_body)
def _gen_replay_wsi_associate_connection(self):
wac_body = []
- wac_body.append(' returnValue = manually_handle_xglWsiX11AssociateConnection(pPacket);')
+ wac_body.append(' returnValue = manually_handle_vkWsiX11AssociateConnection(pPacket);')
return "\n".join(wac_body)
def _gen_replay_wsi_get_msc(self):
wgm_body = []
- wgm_body.append(' returnValue = manually_handle_xglWsiX11GetMSC(pPacket);')
+ wgm_body.append(' returnValue = manually_handle_vkWsiX11GetMSC(pPacket);')
return "\n".join(wgm_body)
def _gen_replay_wsi_create_presentable_image(self):
cpi_body = []
- cpi_body.append(' returnValue = manually_handle_xglWsiX11CreatePresentableImage(pPacket);')
+ cpi_body.append(' returnValue = manually_handle_vkWsiX11CreatePresentableImage(pPacket);')
return "\n".join(cpi_body)
def _gen_replay_wsi_queue_present(self):
wqp_body = []
- wqp_body.append(' returnValue = manually_handle_xglWsiX11QueuePresent(pPacket);')
+ wqp_body.append(' returnValue = manually_handle_vkWsiX11QueuePresent(pPacket);')
return "\n".join(wqp_body)
def _gen_replay_alloc_memory(self):
am_body = []
am_body.append(' gpuMemObj local_mem;')
am_body.append(' if (!m_objMapper.m_adjustForGPU)')
- am_body.append(' replayResult = m_xglFuncs.real_xglAllocMemory(m_objMapper.remap(pPacket->device), pPacket->pAllocInfo, &local_mem.replayGpuMem);')
- am_body.append(' if (replayResult == XGL_SUCCESS || m_objMapper.m_adjustForGPU)')
+ am_body.append(' replayResult = m_vkFuncs.real_vkAllocMemory(m_objMapper.remap(pPacket->device), pPacket->pAllocInfo, &local_mem.replayGpuMem);')
+ am_body.append(' if (replayResult == VK_SUCCESS || m_objMapper.m_adjustForGPU)')
am_body.append(' {')
am_body.append(' local_mem.pGpuMem = new (gpuMemory);')
am_body.append(' if (local_mem.pGpuMem)')
@@ -1828,35 +1600,35 @@
def _gen_replay_free_memory(self):
fm_body = []
- fm_body.append(' returnValue = manually_handle_xglFreeMemory(pPacket);')
+ fm_body.append(' returnValue = manually_handle_vkFreeMemory(pPacket);')
return "\n".join(fm_body)
def _gen_replay_map_memory(self):
mm_body = []
- mm_body.append(' returnValue = manually_handle_xglMapMemory(pPacket);')
+ mm_body.append(' returnValue = manually_handle_vkMapMemory(pPacket);')
return "\n".join(mm_body)
-
+
def _gen_replay_unmap_memory(self):
um_body = []
- um_body.append(' returnValue = manually_handle_xglUnmapMemory(pPacket);')
+ um_body.append(' returnValue = manually_handle_vkUnmapMemory(pPacket);')
return "\n".join(um_body)
def _gen_replay_pin_system_memory(self):
psm_body = []
psm_body.append(' gpuMemObj local_mem;')
psm_body.append(' /* TODO do we need to skip (make pending) this call for m_adjustForGPU */')
- psm_body.append(' replayResult = m_xglFuncs.real_xglPinSystemMemory(m_objMapper.remap(pPacket->device), pPacket->pSysMem, pPacket->memSize, &local_mem.replayGpuMem);')
- psm_body.append(' if (replayResult == XGL_SUCCESS)')
+ psm_body.append(' replayResult = m_vkFuncs.real_vkPinSystemMemory(m_objMapper.remap(pPacket->device), pPacket->pSysMem, pPacket->memSize, &local_mem.replayGpuMem);')
+ psm_body.append(' if (replayResult == VK_SUCCESS)')
psm_body.append(' m_objMapper.add_to_map(pPacket->pMem, &local_mem);')
return "\n".join(psm_body)
- # I don't think this function is being generated anymore (ie, it may have been removed from XGL)
+ # I don't think this function is being generated anymore (ie, it may have been removed from VK)
def _gen_replay_bind_dynamic_memory_view(self):
bdmv_body = []
- bdmv_body.append(' XGL_MEMORY_VIEW_ATTACH_INFO memView;')
- bdmv_body.append(' memcpy(&memView, pPacket->pMemView, sizeof(XGL_MEMORY_VIEW_ATTACH_INFO));')
+ bdmv_body.append(' VK_MEMORY_VIEW_ATTACH_INFO memView;')
+ bdmv_body.append(' memcpy(&memView, pPacket->pMemView, sizeof(VK_MEMORY_VIEW_ATTACH_INFO));')
bdmv_body.append(' memView.mem = m_objMapper.remap(pPacket->pMemView->mem);')
- bdmv_body.append(' m_xglFuncs.real_xglCmdBindDynamicMemoryView(m_objMapper.remap(pPacket->cmdBuffer), pPacket->pipelineBindPoint, &memView);')
+ bdmv_body.append(' m_vkFuncs.real_vkCmdBindDynamicMemoryView(m_objMapper.remap(pPacket->cmdBuffer), pPacket->pipelineBindPoint, &memView);')
return "\n".join(bdmv_body)
# Generate main replay case statements where actual replay API call is dispatched based on input packet data
@@ -1873,16 +1645,13 @@
'CreateBuffer': self._gen_replay_create_buffer,
'GetImageSubresourceInfo': self._gen_replay_get_image_subresource_info,
'CreateGraphicsPipeline': self._gen_replay_create_graphics_pipeline,
- 'CreateGraphicsPipelineDerivative': self._gen_replay_create_graphics_pipeline_derivative,
'CreateFramebuffer': self._gen_replay_create_framebuffer,
'CreateRenderPass': self._gen_replay_create_renderpass,
'BeginCommandBuffer': self._gen_replay_begin_command_buffer,
- 'CmdBeginRenderPass': self._gen_replay_begin_render_pass,
'StorePipeline': self._gen_replay_store_pipeline,
'GetMultiGpuCompatibility': self._gen_replay_get_multi_gpu_compatibility,
'DestroyObject': self._gen_replay_destroy_object,
'WaitForFences': self._gen_replay_wait_for_fences,
- 'ResetFences': self._gen_replay_reset_fences,
'WsiX11AssociateConnection': self._gen_replay_wsi_associate_connection,
'WsiX11GetMSC': self._gen_replay_wsi_get_msc,
'WsiX11CreatePresentableImage': self._gen_replay_wsi_create_presentable_image,
@@ -1895,11 +1664,9 @@
'CmdBindDynamicMemoryView': self._gen_replay_bind_dynamic_memory_view,
'UpdateDescriptors': self._gen_replay_update_descriptors,
'CreateDescriptorSetLayout': self._gen_replay_create_descriptor_set_layout,
- 'CreateDescriptorSetLayoutChain': self._gen_replay_create_descriptor_set_layout_chain,
- 'CmdBindDescriptorSets': self._gen_replay_cmd_bind_descriptor_sets,
'CmdWaitEvents': self._gen_replay_cmd_wait_events,
'CmdPipelineBarrier': self._gen_replay_cmd_pipeline_barrier}
- # TODO : Need to guard CreateInstance with "if (!m_display->m_initedXGL)" check
+ # TODO : Need to guard CreateInstance with "if (!m_display->m_initedVK)" check
# Despite returning a value, don't check these funcs b/c custom code includes check already
custom_check_ret_val = ['EnumerateGpus', 'GetGpuInfo', 'CreateDevice', 'GetExtensionSupport', 'QueueSubmit', 'GetObjectInfo',
'GetFormatInfo', 'GetImageSubresourceInfo', 'CreateDescriptorSetLayout', 'CreateGraphicsPipeline',
@@ -1908,23 +1675,23 @@
'WsiX11AssociateConnection', 'WsiX11GetMSC', 'WsiX11CreatePresentableImage', 'WsiX11QueuePresent']
# multi-gpu Open funcs w/ list of local params to create
custom_open_params = {'OpenSharedMemory': (-1,),
- 'OpenSharedSemaphore': (-1,),
+ 'OpenSharedQueueSemaphore': (-1,),
'OpenPeerMemory': (-1,),
'OpenPeerImage': (-1, -2,)}
# Functions that create views are unique from other create functions
create_view_list = ['CreateBufferView', 'CreateImageView', 'CreateColorAttachmentView', 'CreateDepthStencilView', 'CreateComputePipeline']
# Functions to treat as "Create' that don't have 'Create' in the name
- special_create_list = ['LoadPipeline', 'LoadPipelineDerivative', 'AllocMemory', 'GetDeviceQueue', 'PinSystemMemory', 'AllocDescriptorSets']
+ special_create_list = ['LoadPipeline', 'AllocMemory', 'GetDeviceQueue', 'PinSystemMemory', 'AllocDescriptorSets']
# A couple funcs use do while loops
- do_while_dict = {'GetFenceStatus': 'replayResult != pPacket->result && pPacket->result == XGL_SUCCESS', 'GetEventStatus': '(pPacket->result == XGL_EVENT_SET || pPacket->result == XGL_EVENT_RESET) && replayResult != pPacket->result'}
+ do_while_dict = {'GetFenceStatus': 'replayResult != pPacket->result && pPacket->result == VK_SUCCESS', 'GetEventStatus': '(pPacket->result == VK_EVENT_SET || pPacket->result == VK_EVENT_RESET) && replayResult != pPacket->result'}
rbody = []
- rbody.append('glv_replay::GLV_REPLAY_RESULT xglReplay::replay(glv_trace_packet_header *packet)')
+ rbody.append('glv_replay::GLV_REPLAY_RESULT vkReplay::replay(glv_trace_packet_header *packet)')
rbody.append('{')
rbody.append(' glv_replay::GLV_REPLAY_RESULT returnValue = glv_replay::GLV_REPLAY_SUCCESS;')
- rbody.append(' XGL_RESULT replayResult = XGL_ERROR_UNKNOWN;')
+ rbody.append(' VK_RESULT replayResult = VK_ERROR_UNKNOWN;')
rbody.append(' switch (packet->packet_id)')
rbody.append(' {')
- rbody.append(' case GLV_TPI_XGL_xglApiVersion:')
+ rbody.append(' case GLV_TPI_VK_vkApiVersion:')
rbody.append(' break; // nothing to replay on the version packet')
for proto in self.protos:
ret_value = False
@@ -1937,14 +1704,14 @@
create_view = True
elif 'Create' in proto.name or proto.name in special_create_list:
create_func = True
- rbody.append(' case GLV_TPI_XGL_xgl%s:' % proto.name)
+ rbody.append(' case GLV_TPI_VK_vk%s:' % proto.name)
rbody.append(' {')
- rbody.append(' struct_xgl%s* pPacket = (struct_xgl%s*)(packet->pBody);' % (proto.name, proto.name))
+ rbody.append(' struct_vk%s* pPacket = (struct_vk%s*)(packet->pBody);' % (proto.name, proto.name))
if proto.name in custom_body_dict:
rbody.append(custom_body_dict[proto.name]())
else:
if proto.name in custom_open_params:
- rbody.append(' XGL_DEVICE handle;')
+ rbody.append(' VK_DEVICE handle;')
for pidx in custom_open_params[proto.name]:
rbody.append(' %s local_%s;' % (proto.params[pidx].ty.replace('const ', '').strip('*'), proto.params[pidx].name))
rbody.append(' handle = m_objMapper.remap(pPacket->device);')
@@ -1961,17 +1728,15 @@
elif create_func: # Declare local var to store created handle into
rbody.append(' %s local_%s;' % (proto.params[-1].ty.strip('*').replace('const ', ''), proto.params[-1].name))
if 'AllocDescriptorSets' == proto.name:
- # TODO should malloc and free here rather than fixed size array
rbody.append(' %s local_%s[100];' % (proto.params[-2].ty.strip('*').replace('const ', ''), proto.params[-2].name))
- rbody.append(' XGL_DESCRIPTOR_SET_LAYOUT localDescSets[100];')
+ rbody.append(' VK_DESCRIPTOR_SET_LAYOUT localDescSets[100];')
rbody.append(' assert(pPacket->count <= 100);')
rbody.append(' for (uint32_t i = 0; i < pPacket->count; i++)')
rbody.append(' {')
rbody.append(' localDescSets[i] = m_objMapper.remap(pPacket->%s[i]);' % (proto.params[-3].name))
rbody.append(' }')
elif proto.name == 'ClearDescriptorSets':
- # TODO should malloc and free here rather than fixed size array
- rbody.append(' XGL_DESCRIPTOR_SET localDescSets[100];')
+ rbody.append(' VK_DESCRIPTOR_SET localDescSets[100];')
rbody.append(' assert(pPacket->count <= 100);')
rbody.append(' for (uint32_t i = 0; i < pPacket->count; i++)')
rbody.append(' {')
@@ -1985,11 +1750,11 @@
rbody.append(' for (unsigned int i = 0; i < pPacket->maxLayerCount; i++)')
rbody.append(' bufptr[i] = GLV_NEW_ARRAY(char, pPacket->maxStringSize);')
elif proto.name == 'DestroyInstance':
- rbody.append(' xglDbgUnregisterMsgCallback(m_objMapper.remap(pPacket->instance), g_fpDbgMsgCallback);')
+ rbody.append(' vkDbgUnregisterMsgCallback(g_fpDbgMsgCallback);')
rr_string = ' '
if ret_value:
rr_string = ' replayResult = '
- rr_string += 'm_xglFuncs.real_xgl%s(' % proto.name
+ rr_string += 'm_vkFuncs.real_vk%s(' % proto.name
for p in proto.params:
# For last param of Create funcs, pass address of param
if create_func:
@@ -2024,30 +1789,30 @@
rr_string = rr_string.replace('pPacket->pSetLayouts', 'localDescSets')
rbody.append(rr_string)
if 'DestroyDevice' in proto.name:
- rbody.append(' if (replayResult == XGL_SUCCESS)')
+ rbody.append(' if (replayResult == VK_SUCCESS)')
rbody.append(' {')
rbody.append(' m_pCBDump = NULL;')
rbody.append(' m_pDSDump = NULL;')
rbody.append(' m_pGlvSnapshotPrint = NULL;')
rbody.append(' m_objMapper.rm_from_map(pPacket->device);')
- rbody.append(' m_display->m_initedXGL = false;')
+ rbody.append(' m_display->m_initedVK = false;')
rbody.append(' }')
if 'DestroyInstance' in proto.name:
- rbody.append(' if (replayResult == XGL_SUCCESS)')
+ rbody.append(' if (replayResult == VK_SUCCESS)')
rbody.append(' {')
rbody.append(' // TODO need to handle multiple instances and only clearing maps within an instance.')
rbody.append(' // TODO this only works with a single instance used at any given time.')
rbody.append(' m_objMapper.clear_all_map_handles();')
rbody.append(' }')
elif 'AllocDescriptorSets' in proto.name:
- rbody.append(' if (replayResult == XGL_SUCCESS)')
+ rbody.append(' if (replayResult == VK_SUCCESS)')
rbody.append(' {')
rbody.append(' for (uint32_t i = 0; i < local_pCount; i++) {')
rbody.append(' m_objMapper.add_to_map(&pPacket->%s[i], &local_%s[i]);' % (proto.params[-2].name, proto.params[-2].name))
rbody.append(' }')
rbody.append(' }')
elif create_func: # save handle mapping if create successful
- rbody.append(' if (replayResult == XGL_SUCCESS)')
+ rbody.append(' if (replayResult == VK_SUCCESS)')
rbody.append(' {')
rbody.append(' m_objMapper.add_to_map(pPacket->%s, &local_%s);' % (proto.params[-1].name, proto.params[-1].name))
if 'AllocMemory' == proto.name:
@@ -2056,12 +1821,12 @@
elif proto.name in do_while_dict:
rbody[-1] = ' %s' % rbody[-1]
rbody.append(' } while (%s);' % do_while_dict[proto.name])
- rbody.append(' if (pPacket->result != XGL_NOT_READY || replayResult != XGL_SUCCESS)')
+ rbody.append(' if (pPacket->result != VK_NOT_READY || replayResult != VK_SUCCESS)')
elif proto.name == 'EnumerateLayers':
rbody.append(' for (unsigned int i = 0; i < pPacket->maxLayerCount; i++)')
rbody.append(' GLV_DELETE(bufptr[i]);')
if ret_value:
- rbody.append(' CHECK_RETURN_VALUE(xgl%s);' % proto.name)
+ rbody.append(' CHECK_RETURN_VALUE(vk%s);' % proto.name)
if 'MsgCallback' in proto.name:
rbody.pop()
rbody.pop()
@@ -2100,13 +1865,13 @@
header_txt = []
header_txt.append('#include "glv_platform.h"')
header_txt.append('#include "glv_common.h"')
- header_txt.append('#include "glvtrace_xgl_helpers.h"')
- header_txt.append('#include "glvtrace_xgl_xgl.h"')
- header_txt.append('#include "glvtrace_xgl_xgldbg.h"')
- header_txt.append('#include "glvtrace_xgl_xglwsix11ext.h"')
+ header_txt.append('#include "glvtrace_vk_helpers.h"')
+ header_txt.append('#include "glvtrace_vk_vk.h"')
+ header_txt.append('#include "glvtrace_vk_vkdbg.h"')
+ header_txt.append('#include "glvtrace_vk_vkwsix11ext.h"')
header_txt.append('#include "glv_interconnect.h"')
header_txt.append('#include "glv_filelike.h"')
- header_txt.append('#include "xgl_struct_size_helper.h"')
+ header_txt.append('#include "vk_struct_size_helper.h"')
header_txt.append('#ifdef WIN32')
header_txt.append('#include "mhook/mhook-lib/mhook.h"')
header_txt.append('#endif')
@@ -2133,7 +1898,7 @@
header_txt.append('#include "glv_vk_vk_structs.h"')
header_txt.append('#include "glv_vk_vkdbg_structs.h"')
header_txt.append('#include "glv_vk_vkwsix11ext_structs.h"')
- header_txt.append('#include "xgl_enum_string_helper.h"')
+ header_txt.append('#include "vk_enum_string_helper.h"')
header_txt.append('#if defined(WIN32)')
header_txt.append('#define snprintf _snprintf')
header_txt.append('#endif')
@@ -2142,7 +1907,7 @@
header_txt.append('#define SEND_ENTRYPOINT_PARAMS(entrypoint, ...) ;')
header_txt.append('//#define SEND_ENTRYPOINT_PARAMS(entrypoint, ...) glv_TraceInfo(entrypoint, __VA_ARGS__);\n')
header_txt.append('#define CREATE_TRACE_PACKET(entrypoint, buffer_bytes_needed) \\')
- header_txt.append(' pHeader = glv_create_trace_packet(GLV_TID_XGL, GLV_TPI_XGL_##entrypoint, sizeof(struct_##entrypoint), buffer_bytes_needed);\n')
+ header_txt.append(' pHeader = glv_create_trace_packet(GLV_TID_VULKAN, GLV_TPI_VK_##entrypoint, sizeof(struct_##entrypoint), buffer_bytes_needed);\n')
header_txt.append('#define FINISH_TRACE_PACKET() \\')
header_txt.append(' glv_finalize_trace_packet(pHeader); \\')
header_txt.append(' glv_write_trace_packet(pHeader, glv_trace_get_trace_file()); \\')
@@ -2160,7 +1925,7 @@
def generate_header(self):
header_txt = []
header_txt.append('#pragma once\n')
- header_txt.append('#include "xgl.h"')
+ header_txt.append('#include "vulkan.h"')
header_txt.append('#include "glv_trace_packet_utils.h"\n')
return "\n".join(header_txt)
@@ -2174,14 +1939,14 @@
def generate_header(self):
header_txt = []
header_txt.append('#pragma once\n')
- header_txt.append('#include "xgl.h"')
+ header_txt.append('#include "vulkan.h"')
header_txt.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- header_txt.append('#include "xglWsiX11Ext.h"\n')
+ header_txt.append('#include "vkWsiX11Ext.h"\n')
header_txt.append('#else')
- header_txt.append('#include "xglWsiWinExt.h"')
+ header_txt.append('#include "vkWsiWinExt.h"')
header_txt.append('#endif')
- header_txt.append('void AttachHooks_xglwsix11ext();')
- header_txt.append('void DetachHooks_xglwsix11ext();')
+ header_txt.append('void AttachHooks_vkwsix11ext();')
+ header_txt.append('void DetachHooks_vkwsix11ext();')
return "\n".join(header_txt)
def generate_body(self):
@@ -2195,7 +1960,7 @@
header_txt = []
header_txt.append('#include "glv_platform.h"')
header_txt.append('#include "glv_common.h"')
- header_txt.append('#include "glvtrace_xgl_xglwsix11ext.h"')
+ header_txt.append('#include "glvtrace_vk_vkwsix11ext.h"')
header_txt.append('#include "glv_vk_vkwsix11ext_structs.h"')
header_txt.append('#include "glv_vk_packet_id.h"')
header_txt.append('#ifdef WIN32')
@@ -2216,9 +1981,9 @@
header_txt = []
header_txt.append('#pragma once\n')
header_txt.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- header_txt.append('#include "xglWsiX11Ext.h"')
+ header_txt.append('#include "vkWsiX11Ext.h"')
header_txt.append('#else')
- header_txt.append('#include "xglWsiWinExt.h"')
+ header_txt.append('#include "vkWsiWinExt.h"')
header_txt.append('#endif')
header_txt.append('#include "glv_trace_packet_utils.h"\n')
return "\n".join(header_txt)
@@ -2232,10 +1997,10 @@
def generate_header(self):
header_txt = []
header_txt.append('#pragma once\n')
- header_txt.append('#include "xgl.h"')
- header_txt.append('#include "xglDbg.h"\n')
- header_txt.append('void AttachHooks_xgldbg();')
- header_txt.append('void DetachHooks_xgldbg();')
+ header_txt.append('#include "vulkan.h"')
+ header_txt.append('#include "vkDbg.h"\n')
+ header_txt.append('void AttachHooks_vkdbg();')
+ header_txt.append('void DetachHooks_vkdbg();')
return "\n".join(header_txt)
def generate_body(self):
@@ -2249,8 +2014,8 @@
header_txt = []
header_txt.append('#include "glv_platform.h"')
header_txt.append('#include "glv_common.h"')
- header_txt.append('#include "glvtrace_xgl_xgl.h"')
- header_txt.append('#include "glvtrace_xgl_xgldbg.h"')
+ header_txt.append('#include "glvtrace_vk_vk.h"')
+ header_txt.append('#include "glvtrace_vk_vkdbg.h"')
header_txt.append('#include "glv_vk_vkdbg_structs.h"')
header_txt.append('#include "glv_vk_packet_id.h"')
header_txt.append('#ifdef WIN32')
@@ -2270,7 +2035,7 @@
def generate_header(self):
header_txt = []
header_txt.append('#pragma once\n')
- header_txt.append('#include "xglDbg.h"')
+ header_txt.append('#include "vkDbg.h"')
header_txt.append('#include "glv_trace_packet_utils.h"\n')
return "\n".join(header_txt)
@@ -2279,19 +2044,19 @@
return "\n".join(body)
-class GlaveReplayXglFuncPtrs(Subcommand):
+class GlaveReplayVkFuncPtrs(Subcommand):
def generate_header(self):
header_txt = []
header_txt.append('#pragma once\n')
header_txt.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
header_txt.append('#include <xcb/xcb.h>\n')
header_txt.append('#endif')
- header_txt.append('#include "xgl.h"')
- header_txt.append('#include "xglDbg.h"')
+ header_txt.append('#include "vulkan.h"')
+ header_txt.append('#include "vkDbg.h"')
header_txt.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- header_txt.append('#include "xglWsiX11Ext.h"')
+ header_txt.append('#include "vkWsiX11Ext.h"')
header_txt.append('#else')
- header_txt.append('#include "xglWsiWinExt.h"')
+ header_txt.append('#include "vkWsiWinExt.h"')
header_txt.append('#endif')
def generate_body(self):
@@ -2306,12 +2071,12 @@
header_txt.append('#include <map>')
header_txt.append('#include <vector>')
header_txt.append('#include <string>')
- header_txt.append('#include "xgl.h"')
- header_txt.append('#include "xglDbg.h"')
+ header_txt.append('#include "vulkan.h"')
+ header_txt.append('#include "vkDbg.h"')
header_txt.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- header_txt.append('#include "xglWsiX11Ext.h"')
+ header_txt.append('#include "vkWsiX11Ext.h"')
header_txt.append('#else')
- header_txt.append('#include "xglWsiWinExt.h"')
+ header_txt.append('#include "vkWsiWinExt.h"')
header_txt.append('#endif')
return "\n".join(header_txt)
@@ -2323,8 +2088,8 @@
class GlaveReplayC(Subcommand):
def generate_header(self):
header_txt = []
- header_txt.append('#include "glvreplay_xgl_xglreplay.h"\n')
- header_txt.append('#include "glvreplay_xgl.h"\n')
+ header_txt.append('#include "glvreplay_vk_vkreplay.h"\n')
+ header_txt.append('#include "glvreplay_vk.h"\n')
header_txt.append('#include "glvreplay_main.h"\n')
header_txt.append('#include <algorithm>')
header_txt.append('#include <queue>')
@@ -2334,8 +2099,8 @@
header_txt.append('#include "glv_vk_vkdbg_structs.h"')
header_txt.append('#include "glv_vk_vkwsix11ext_structs.h"')
header_txt.append('#include "glv_vk_packet_id.h"')
- header_txt.append('#include "xgl_enum_string_helper.h"\n}\n')
- header_txt.append('#define APP_NAME "glvreplay_xgl"')
+ header_txt.append('#include "vk_enum_string_helper.h"\n}\n')
+ header_txt.append('#define APP_NAME "glvreplay_vk"')
header_txt.append('#define IDI_ICON 101\n')
return "\n".join(header_txt)
@@ -2358,7 +2123,7 @@
"glave-dbg-trace-h" : GlaveDbgHeader,
"glave-dbg-trace-c" : GlaveDbgC,
"glave-dbg-trace-structs" : GlaveDbgStructs,
- "glave-replay-xgl-funcs" : GlaveReplayXglFuncPtrs,
+ "glave-replay-vk-funcs" : GlaveReplayVkFuncPtrs,
"glave-replay-obj-mapper-h" : GlaveReplayObjMapperHeader,
"glave-replay-c" : GlaveReplayC,
}