commit 284cf2dd58ddf6451fba347c04423fecd4595a38
author Tobin Ehlis <tobin@lunarg.com> Mon Mar 16 08:21:33 2015 -0600
committer Tobin Ehlis <tobin@lunarg.com> Mon Mar 16 08:21:33 2015 -0600
tree f2c1b600d54257a4b8fcd268e8fb827f5fa042e8
parent f57562c29488e1b86e32e01ee9135ab585cbd762

glave: Use generated code to get pAppInfo struct size

glave-generate.py

diff --git a/glave-generate.py b/glave-generate.py
index 065cc55..3430342 100755
--- a/glave-generate.py
+++ b/glave-generate.py
@@ -521,7 +521,7 @@
                     func_body.append('    }')
                     func_body.append('    startTime = glv_get_time();')
                     func_body.append('    %sreal_xgl%s;' % (return_txt, proto.c_call()))
-                    func_body.append('    CREATE_TRACE_PACKET(xgl%s, sizeof(XGL_INSTANCE) + calc_size_XGL_APPLICATION_INFO(pAppInfo) + ((pAllocCb == NULL) ? 0 :sizeof(XGL_ALLOC_CALLBACKS)));' % (proto.name))
+                    func_body.append('    CREATE_TRACE_PACKET(xgl%s, sizeof(XGL_INSTANCE) + get_struct_chain_size((void*)pAppInfo) + ((pAllocCb == NULL) ? 0 :sizeof(XGL_ALLOC_CALLBACKS)));' % (proto.name))
                     func_body.append('    pHeader->entrypoint_begin_time = startTime;')
                     func_body.append('    if (isHooked == FALSE) {')
                     func_body.append('        AttachHooks();')
@@ -1281,10 +1281,6 @@
     def _generate_struct_util_funcs(self):
         pid_enum = []
         pid_enum.append('//=============================================================================')
-        pid_enum.append('static uint64_t calc_size_XGL_APPLICATION_INFO(const XGL_APPLICATION_INFO* pStruct)')
-        pid_enum.append('{')
-        pid_enum.append('    return ((pStruct == NULL) ? 0 : sizeof(XGL_APPLICATION_INFO)) + strlen(pStruct->pAppName) + 1 + strlen(pStruct->pEngineName) + 1;')
-        pid_enum.append('}\n')
         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('{')
         pid_enum.append('    glv_add_buffer_to_trace_packet(pHeader, (void**)ppStruct, sizeof(XGL_APPLICATION_INFO), pInStruct);')