Merge branch 'glave_snapshot_support'
Conflicts:
layers/CMakeLists.txt
tools/glave/scripts/vk_generate.py
tools/glave/src/glv_extensions/glvreplay_xgl/CMakeLists.txt
tools/glave/src/glv_extensions/glvtrace_xgl/CMakeLists.txt
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/glvtrace_xgl_xgl.c
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/glvtrace_xgl_xgl.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_size_helper.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_string_helper.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_string_helper_cpp.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_string_helper_no_addr.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_string_helper_no_addr_cpp.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_validate_helper.h
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_wrappers.cpp
tools/glave/src/glv_extensions/glvtrace_xgl/codegen/xgl_struct_wrappers.h
xgl_helper.py
diff --git a/tools/glave/scripts/vk_generate.py b/tools/glave/scripts/vk_generate.py
index ad1e725..829eb54 100755
--- a/tools/glave/scripts/vk_generate.py
+++ b/tools/glave/scripts/vk_generate.py
@@ -179,20 +179,34 @@
return "\n".join(func_protos)
+ def _generate_trace_real_func_ptr_protos(self):
+ func_ptr_assign = []
+ 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))
+ for p in proto.params:
+ 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(',', ');\n')
+ return "\n".join(func_ptr_assign)
+
def _generate_func_ptr_assignments(self):
func_ptr_assign = []
for proto in self.protos:
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
- func_ptr_assign.append('static %s( XGLAPI * real_xgl%s)(' % (proto.ret, proto.name))
+ func_ptr_assign.append('%s( XGLAPI * real_xgl%s)(' % (proto.ret, proto.name))
for p in proto.params:
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.append('static BOOL isHooked = FALSE;\n')
return "\n".join(func_ptr_assign)
+
def _generate_func_ptr_assignments_ext(self, func_class='Wsi'):
func_ptr_assign = []
for proto in self.protos:
@@ -205,6 +219,8 @@
def _generate_attach_hooks(self):
hooks_txt = []
+ hooks_txt.append('// declared as extern in glvtrace_xgl_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
@@ -301,7 +317,7 @@
init_tracer.append(' pPacket->version = XGL_API_VERSION;')
init_tracer.append(' FINISH_TRACE_PACKET();\n}\n')
- init_tracer.append('static GLV_CRITICAL_SECTION g_memInfoLock;')
+ init_tracer.append('extern GLV_CRITICAL_SECTION g_memInfoLock;')
init_tracer.append('void InitTracer(void)\n{')
init_tracer.append(' char *ipAddr = glv_get_global_var("GLVLIB_TRACE_IPADDR");')
init_tracer.append(' if (ipAddr == NULL)')
@@ -314,41 +330,6 @@
init_tracer.append(' send_xgl_api_version_packet();\n}\n')
return "\n".join(init_tracer)
- def _gen_unmap_memory(self):
- um_body = []
- um_body.append('GLVTRACER_EXPORT XGL_RESULT XGLAPI __HOOKED_xglUnmapMemory(')
- um_body.append(' XGL_GPU_MEMORY mem)')
- um_body.append('{')
- um_body.append(' glv_trace_packet_header* pHeader;')
- um_body.append(' XGL_RESULT result;')
- um_body.append(' struct_xglUnmapMemory* pPacket;')
- um_body.append(' XGLAllocInfo *entry;')
- um_body.append(' SEND_ENTRYPOINT_PARAMS("xglUnmapMemory(mem %p)\\n", mem);')
- um_body.append(' // insert into packet the data that was written by CPU between the xglMapMemory call and here')
- um_body.append(' // Note must do this prior to the real xglUnMap() or else may get a FAULT')
- um_body.append(' glv_enter_critical_section(&g_memInfoLock);')
- um_body.append(' entry = find_mem_info_entry(mem);')
- um_body.append(' CREATE_TRACE_PACKET(xglUnmapMemory, (entry) ? entry->size : 0);')
- um_body.append(' pPacket = interpret_body_as_xglUnmapMemory(pHeader);')
- um_body.append(' if (entry)')
- um_body.append(' {')
- um_body.append(' assert(entry->handle == mem);')
- um_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**) &(pPacket->pData), entry->size, entry->pData);')
- um_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pData));')
- um_body.append(' entry->pData = NULL;')
- um_body.append(' } else')
- um_body.append(' {')
- um_body.append(' glv_LogError("Failed to copy app memory into trace packet (idx = %u) on xglUnmapMemory\\n", pHeader->global_packet_index);')
- um_body.append(' }')
- um_body.append(' glv_leave_critical_section(&g_memInfoLock);')
- um_body.append(' result = real_xglUnmapMemory(mem);')
- um_body.append(' pPacket->mem = mem;')
- um_body.append(' pPacket->result = result;')
- um_body.append(' FINISH_TRACE_PACKET();')
- um_body.append(' return result;')
- um_body.append('}\n')
- return "\n".join(um_body)
-
# Take a list of params and return a list of dicts w/ ptr param details
def _get_packet_ptr_param_list(self, params):
ptr_param_list = []
@@ -478,9 +459,12 @@
# return result?
def _generate_trace_funcs(self):
func_body = []
+ manually_written_hooked_funcs = ['CreateInstance', 'EnumerateLayers', 'EnumerateGpus',
+ 'AllocDescriptorSets', 'MapMemory', 'UnmapMemory',
+ 'CmdPipelineBarrier', 'CmdWaitEvents']
for proto in self.protos:
- if 'UnmapMemory' == proto.name:
- func_body.append(self._gen_unmap_memory())
+ 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)
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
@@ -516,51 +500,8 @@
func_body.append(' struct_xgl%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 'CreateInstance' == proto.name:
- func_body.append(' uint64_t startTime;')
- func_body.append(' glv_platform_thread_once(&gInitOnce, InitTracer);')
- func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name)
- func_body.append(' if (real_xglCreateInstance == xglCreateInstance)')
- func_body.append(' {')
- func_body.append(' glv_platform_get_next_lib_sym((void **) &real_xglCreateInstance,"xglCreateInstance");')
- 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) + 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();')
- func_body.append(' AttachHooks_xgldbg();')
- func_body.append(' AttachHooks_xglwsix11ext();')
- func_body.append(' }')
- elif 'EnumerateGpus' == proto.name:
- func_body.append(' uint64_t startTime;')
- func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name)
- func_body.append(' startTime = glv_get_time();')
- func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
- func_body.append(' CREATE_TRACE_PACKET(xglEnumerateGpus, sizeof(uint32_t) + ((pGpus && pGpuCount) ? *pGpuCount * sizeof(XGL_PHYSICAL_GPU) : 0));')
- func_body.append(' pHeader->entrypoint_begin_time = startTime;')
- elif 'EnumerateLayers' == proto.name:
- func_body.append(' uint64_t startTime;')
- func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name)
- func_body.append(' startTime = glv_get_time();')
- func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
- func_body.append(' size_t totStringSize = 0;')
- func_body.append(' uint32_t i = 0;')
- func_body.append(' for (i = 0; i < *pOutLayerCount; i++)')
- func_body.append(' totStringSize += (pOutLayers[i] != NULL) ? strlen(pOutLayers[i]) + 1: 0;')
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, totStringSize + sizeof(size_t));' % (proto.name))
- func_body.append(' pHeader->entrypoint_begin_time = startTime;')
- elif 'AllocDescriptorSets' == proto.name:
- func_body.append(' uint64_t startTime;')
- func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name)
- func_body.append(' startTime = glv_get_time();')
- func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
- func_body.append(' size_t customSize = (*pCount <= 0) ? (sizeof(XGL_DESCRIPTOR_SET)) : (*pCount * sizeof(XGL_DESCRIPTOR_SET));')
- func_body.append(' CREATE_TRACE_PACKET(xglAllocDescriptorSets, sizeof(XGL_DESCRIPTOR_SET_LAYOUT) + customSize + sizeof(uint32_t));')
- func_body.append(' pHeader->entrypoint_begin_time = startTime;')
- elif proto.name in ['CreateFramebuffer', 'CreateRenderPass', 'CreateDynamicViewportState',
- 'CreateDescriptorRegion', 'CmdWaitEvents', 'CmdPipelineBarrier']:
+ if proto.name in ['CreateFramebuffer', 'CreateRenderPass', 'CreateDynamicViewportState',
+ '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;')
@@ -575,15 +516,6 @@
elif 'CreateDescriptorRegion' == proto.name:
func_body.append(' uint32_t rgCount = (pCreateInfo != NULL && pCreateInfo->pTypeCount != NULL) ? pCreateInfo->count : 0;')
func_body.append(' CREATE_TRACE_PACKET(xglCreateDescriptorRegion, get_struct_chain_size((void*)pCreateInfo) + sizeof(XGL_DESCRIPTOR_REGION));')
- else: # ['CmdWaitEvents', 'CmdPipelineBarrier']:
- func_body.append(' size_t customSize;')
- event_array_type = 'XGL_EVENT'
- if 'CmdPipelineBarrier' == proto.name:
- event_array_type = 'XGL_SET_EVENT'
- func_body.append(' uint32_t eventCount = (%s != NULL && %s->pEvents != NULL) ? %s->eventCount : 0;' % (proto.params[-1].name, proto.params[-1].name, proto.params[-1].name))
- func_body.append(' uint32_t mbCount = (%s != NULL && %s->ppMemBarriers != NULL) ? %s->memBarrierCount : 0;' % (proto.params[-1].name, proto.params[-1].name, proto.params[-1].name))
- func_body.append(' customSize = (eventCount * sizeof(%s)) + mbCount * sizeof(void*) + calculate_memory_barrier_size(mbCount, %s->ppMemBarriers);' % (event_array_type, proto.params[-1].name))
- func_body.append(' CREATE_TRACE_PACKET(xgl%s, sizeof(%s) + customSize);' % (proto.name, proto.params[-1].ty.strip('*').replace('const ', '')))
func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call()))
else:
if (0 == len(packet_size)):
@@ -595,72 +527,18 @@
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('\n'.join(raw_packet_update_list))
- if 'MapMemory' == proto.name: # Custom code for MapMem case
- func_body.append(' if (ppData != NULL)')
- func_body.append(' {')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->ppData), sizeof(void*), *ppData);')
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->ppData));')
- func_body.append(' add_data_to_mem_info(mem, *ppData);')
- func_body.append(' }')
+ 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;')
- func_body.append(' FINISH_TRACE_PACKET();')
- elif 'EnumerateLayers' == proto.name: #custom code for EnumerateLayers case
- func_body.append(' pPacket->gpu = gpu;')
- func_body.append(' pPacket->maxLayerCount = maxLayerCount;')
- func_body.append(' pPacket->maxStringSize = maxStringSize;')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pOutLayerCount), sizeof(size_t), pOutLayerCount);')
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pOutLayerCount));')
- func_body.append(' for (i = 0; i < *pOutLayerCount; i++) {')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->pOutLayers[i]), ((pOutLayers[i] != NULL) ? strlen(pOutLayers[i]) + 1 : 0), pOutLayers[i]);')
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pOutLayers[i]));')
- func_body.append(' }')
-
- func_body.append(' pPacket->pReserved = pReserved;')
- func_body.append(' pPacket->result = result;')
- 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']))
- # Some custom add_* and finalize_* function calls for Create* API calls
- if proto.name in ['CmdWaitEvents', 'CmdPipelineBarrier']:
- event_array_type = 'XGL_EVENT'
- if 'CmdPipelineBarrier' == proto.name:
- event_array_type = 'XGL_SET_EVENT'
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s->pEvents), eventCount * sizeof(%s), %s->pEvents);' % (proto.params[-1].name, event_array_type, proto.params[-1].name))
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->%s->pEvents));' % (proto.params[-1].name))
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s->ppMemBarriers), mbCount * sizeof(void*), %s->ppMemBarriers);' % (proto.params[-1].name, proto.params[-1].name))
- func_body.append(' uint32_t i, siz;')
- func_body.append(' for (i = 0; i < mbCount; i++) {')
- func_body.append(' XGL_MEMORY_BARRIER *pNext = (XGL_MEMORY_BARRIER *) %s->ppMemBarriers[i];' % proto.params[-1].name)
- func_body.append(' switch (pNext->sType) {')
- func_body.append(' case XGL_STRUCTURE_TYPE_MEMORY_BARRIER:')
- func_body.append(' siz = sizeof(XGL_MEMORY_BARRIER);')
- func_body.append(' break;')
- func_body.append(' case XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER:')
- func_body.append(' siz = sizeof(XGL_BUFFER_MEMORY_BARRIER);')
- func_body.append(' break;')
- func_body.append(' case XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER:')
- func_body.append(' siz = sizeof(XGL_IMAGE_MEMORY_BARRIER);')
- func_body.append(' break;')
- func_body.append(' default:')
- func_body.append(' assert(0);')
- func_body.append(' siz = 0;')
- func_body.append(' break;')
- func_body.append(' }')
- func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s->ppMemBarriers[i]), siz, %s->ppMemBarriers[i]);' % (proto.params[-1].name, proto.params[-1].name))
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->%s->ppMemBarriers[i]));' % (proto.params[-1].name))
- func_body.append(' }')
- func_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->%s->ppMemBarriers));' % (proto.params[-1].name))
- 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);')
+ 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')
@@ -734,471 +612,6 @@
func_body.append('}\n')
return "\n".join(func_body)
- def _generate_helper_funcs(self):
- hf_body = []
- hf_body.append('// Support for shadowing CPU mapped memory')
- hf_body.append('typedef struct _XGLAllocInfo {')
- hf_body.append(' XGL_GPU_SIZE size;')
- hf_body.append(' XGL_GPU_MEMORY handle;')
- hf_body.append(' void *pData;')
- hf_body.append(' BOOL valid;')
- hf_body.append('} XGLAllocInfo;')
- hf_body.append('typedef struct _XGLMemInfo {')
- hf_body.append(' unsigned int numEntrys;')
- hf_body.append(' XGLAllocInfo *pEntrys;')
- hf_body.append(' XGLAllocInfo *pLastMapped;')
- hf_body.append(' unsigned int capacity;')
- hf_body.append('} XGLMemInfo;')
- hf_body.append('')
- hf_body.append('static XGLMemInfo g_memInfo = {0, NULL, NULL, 0};')
- hf_body.append('')
- hf_body.append('static void init_mem_info_entrys(XGLAllocInfo *ptr, const unsigned int num)')
- hf_body.append('{')
- hf_body.append(' unsigned int i;')
- hf_body.append(' for (i = 0; i < num; i++)')
- hf_body.append(' {')
- hf_body.append(' XGLAllocInfo *entry = ptr + i;')
- hf_body.append(' entry->pData = NULL;')
- hf_body.append(' entry->size = 0;')
- hf_body.append(' entry->handle = NULL;')
- hf_body.append(' entry->valid = FALSE;')
- hf_body.append(' }')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('// caller must hold the g_memInfoLock')
- hf_body.append('static void init_mem_info()')
- hf_body.append('{')
- hf_body.append(' g_memInfo.numEntrys = 0;')
- hf_body.append(' g_memInfo.capacity = 4096;')
- hf_body.append(' g_memInfo.pLastMapped = NULL;')
- hf_body.append('')
- hf_body.append(' g_memInfo.pEntrys = GLV_NEW_ARRAY(XGLAllocInfo, g_memInfo.capacity);')
- hf_body.append('')
- hf_body.append(' if (g_memInfo.pEntrys == NULL)')
- hf_body.append(' glv_LogError("init_mem_info() malloc failed\\n");')
- hf_body.append(' else')
- hf_body.append(' init_mem_info_entrys(g_memInfo.pEntrys, g_memInfo.capacity);')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('// caller must hold the g_memInfoLock')
- hf_body.append('static void delete_mem_info()')
- hf_body.append('{')
- hf_body.append(' GLV_DELETE(g_memInfo.pEntrys);')
- hf_body.append(' g_memInfo.pEntrys = NULL;')
- hf_body.append(' g_memInfo.numEntrys = 0;')
- hf_body.append(' g_memInfo.capacity = 0;')
- hf_body.append(' g_memInfo.pLastMapped = NULL;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('// caller must hold the g_memInfoLock')
- hf_body.append('static XGLAllocInfo * get_mem_info_entry()')
- hf_body.append('{')
- hf_body.append(' unsigned int i;')
- hf_body.append(' XGLAllocInfo *entry;')
- hf_body.append(' if (g_memInfo.numEntrys > g_memInfo.capacity)')
- hf_body.append(' {')
- hf_body.append(' glv_LogError("get_mem_info_entry() bad internal state numEntrys %u\\n", g_memInfo.numEntrys);')
- hf_body.append(' return NULL;')
- hf_body.append(' }')
- hf_body.append('')
- hf_body.append(' entry = g_memInfo.pEntrys;')
- hf_body.append(' for (i = 0; i < g_memInfo.numEntrys; i++)')
- hf_body.append(' {')
- hf_body.append(' if ((entry + i)->valid == FALSE)')
- hf_body.append(' return entry + i;')
- hf_body.append(' }')
- hf_body.append(' if (g_memInfo.numEntrys == g_memInfo.capacity)')
- hf_body.append(' { // grow the array 2x')
- hf_body.append(' g_memInfo.capacity *= 2;')
- hf_body.append(' g_memInfo.pEntrys = (XGLAllocInfo *) GLV_REALLOC(g_memInfo.pEntrys, g_memInfo.capacity * sizeof(XGLAllocInfo));')
- hf_body.append(' if (g_memInfo.pEntrys == NULL)')
- hf_body.append(' glv_LogError("get_mem_info_entry() realloc failed\\n");')
- hf_body.append(' //glv_LogInfo("realloc memInfo from %u to %u\\n", g_memInfo.capacity /2, g_memInfo.capacity);')
- hf_body.append(' //init the newly added entrys')
- hf_body.append(' init_mem_info_entrys(g_memInfo.pEntrys + g_memInfo.capacity / 2, g_memInfo.capacity / 2);')
- hf_body.append(' }')
- hf_body.append('')
- hf_body.append(' assert(g_memInfo.numEntrys < g_memInfo.capacity);')
- hf_body.append(' entry = g_memInfo.pEntrys + g_memInfo.numEntrys;')
- hf_body.append(' g_memInfo.numEntrys++;')
- hf_body.append(' assert(entry->valid == FALSE);')
- hf_body.append(' return entry;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('// caller must hold the g_memInfoLock')
- hf_body.append('static XGLAllocInfo * find_mem_info_entry(const XGL_GPU_MEMORY handle)')
- hf_body.append('{')
- hf_body.append(' XGLAllocInfo *entry;')
- hf_body.append(' unsigned int i;')
- hf_body.append(' entry = g_memInfo.pEntrys;')
- hf_body.append(' if (g_memInfo.pLastMapped && g_memInfo.pLastMapped->handle == handle && g_memInfo.pLastMapped->valid)')
- hf_body.append(' {')
- hf_body.append(' return g_memInfo.pLastMapped;')
- hf_body.append(' }')
- hf_body.append(' for (i = 0; i < g_memInfo.numEntrys; i++)')
- hf_body.append(' {')
- hf_body.append(' if ((entry + i)->valid && (handle == (entry + i)->handle))')
- hf_body.append(' {')
- hf_body.append(' return entry + i;')
- hf_body.append(' }')
- hf_body.append(' }')
- hf_body.append('')
- hf_body.append(' return NULL;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static XGLAllocInfo * find_mem_info_entry_lock(const XGL_GPU_MEMORY handle)')
- hf_body.append('{')
- hf_body.append(' XGLAllocInfo *res;')
- hf_body.append(' glv_enter_critical_section(&g_memInfoLock);')
- hf_body.append(' res = find_mem_info_entry(handle);')
- hf_body.append(' glv_leave_critical_section(&g_memInfoLock);')
- hf_body.append(' return res;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_new_handle_to_mem_info(const XGL_GPU_MEMORY handle, XGL_GPU_SIZE size, void *pData)')
- hf_body.append('{')
- hf_body.append(' XGLAllocInfo *entry;')
- hf_body.append('')
- hf_body.append(' glv_enter_critical_section(&g_memInfoLock);')
- hf_body.append(' if (g_memInfo.capacity == 0)')
- hf_body.append(' init_mem_info();')
- hf_body.append('')
- hf_body.append(' entry = get_mem_info_entry();')
- hf_body.append(' if (entry)')
- hf_body.append(' {')
- hf_body.append(' entry->valid = TRUE;')
- hf_body.append(' entry->handle = handle;')
- hf_body.append(' entry->size = size;')
- hf_body.append(' entry->pData = pData; // NOTE: xglFreeMemory will free this mem, so no malloc()')
- hf_body.append(' }')
- hf_body.append(' glv_leave_critical_section(&g_memInfoLock);')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_data_to_mem_info(const XGL_GPU_MEMORY handle, void *pData)')
- hf_body.append('{')
- hf_body.append(' XGLAllocInfo *entry;')
- hf_body.append('')
- hf_body.append(' glv_enter_critical_section(&g_memInfoLock);')
- hf_body.append(' entry = find_mem_info_entry(handle);')
- hf_body.append(' if (entry)')
- hf_body.append(' {')
- hf_body.append(' entry->pData = pData;')
- hf_body.append(' }')
- hf_body.append(' g_memInfo.pLastMapped = entry;')
- hf_body.append(' glv_leave_critical_section(&g_memInfoLock);')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void rm_handle_from_mem_info(const XGL_GPU_MEMORY handle)')
- hf_body.append('{')
- hf_body.append(' XGLAllocInfo *entry;')
- hf_body.append('')
- hf_body.append(' glv_enter_critical_section(&g_memInfoLock);')
- hf_body.append(' entry = find_mem_info_entry(handle);')
- hf_body.append(' if (entry)')
- hf_body.append(' {')
- hf_body.append(' entry->valid = FALSE;')
- hf_body.append(' entry->pData = NULL;')
- hf_body.append(' entry->size = 0;')
- hf_body.append(' entry->handle = NULL;')
- hf_body.append('')
- hf_body.append(' if (entry == g_memInfo.pLastMapped)')
- hf_body.append(' g_memInfo.pLastMapped = NULL;')
- hf_body.append(' // adjust numEntrys to be last valid entry in list')
- hf_body.append(' do {')
- hf_body.append(' entry = g_memInfo.pEntrys + g_memInfo.numEntrys - 1;')
- hf_body.append(' if (entry->valid == FALSE)')
- hf_body.append(' g_memInfo.numEntrys--;')
- hf_body.append(' } while ((entry->valid == FALSE) && (g_memInfo.numEntrys > 0));')
- hf_body.append(' if (g_memInfo.numEntrys == 0)')
- hf_body.append(' delete_mem_info();')
- hf_body.append(' }')
- hf_body.append(' glv_leave_critical_section(&g_memInfoLock);')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_begin_cmdbuf_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
- hf_body.append('{')
- hf_body.append(' const XGL_CMD_BUFFER_BEGIN_INFO* pInNow = pIn;')
- hf_body.append(' XGL_CMD_BUFFER_BEGIN_INFO** ppOutNext = (XGL_CMD_BUFFER_BEGIN_INFO**)ppOut;')
- hf_body.append(' while (pInNow != NULL)')
- hf_body.append(' {')
- hf_body.append(' XGL_CMD_BUFFER_BEGIN_INFO** ppOutNow = ppOutNext;')
- hf_body.append(' ppOutNext = NULL;')
- hf_body.append('')
- hf_body.append(' switch (pInNow->sType)')
- hf_body.append(' {')
- hf_body.append(' case XGL_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO), pInNow);')
- hf_body.append(' ppOutNext = (XGL_CMD_BUFFER_BEGIN_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' default:')
- hf_body.append(' assert(!"Encountered an unexpected type in cmdbuffer_begin_info list");')
- hf_body.append(' }')
- hf_body.append(' pInNow = (XGL_CMD_BUFFER_BEGIN_INFO*)pInNow->pNext;')
- hf_body.append(' }')
- hf_body.append(' return;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_alloc_memory_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
- hf_body.append('{')
- hf_body.append(' const XGL_MEMORY_ALLOC_INFO* pInNow = pIn;')
- hf_body.append(' XGL_MEMORY_ALLOC_INFO** ppOutNext = (XGL_MEMORY_ALLOC_INFO**)ppOut;')
- hf_body.append(' while (pInNow != NULL)')
- hf_body.append(' {')
- hf_body.append(' XGL_MEMORY_ALLOC_INFO** ppOutNow = ppOutNext;')
- hf_body.append(' ppOutNext = NULL;')
- hf_body.append('')
- hf_body.append(' switch (pInNow->sType)')
- hf_body.append(' {')
- hf_body.append(' case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_BUFFER_INFO:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_MEMORY_ALLOC_BUFFER_INFO), pInNow);')
- hf_body.append(' ppOutNext = (XGL_MEMORY_ALLOC_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_IMAGE_INFO:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_MEMORY_ALLOC_IMAGE_INFO), pInNow);')
- hf_body.append(' ppOutNext = (XGL_MEMORY_ALLOC_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' default:')
- hf_body.append(' assert(!"Encountered an unexpected type in memory_alloc_info list");')
- hf_body.append(' }')
- hf_body.append(' pInNow = (XGL_MEMORY_ALLOC_INFO*)pInNow->pNext;')
- hf_body.append(' }')
- hf_body.append(' return;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static size_t calculate_memory_barrier_size(uint32_t mbCount, const void** ppMemBarriers)')
- hf_body.append('{')
- hf_body.append(' uint32_t i, siz=0;')
- hf_body.append(' for (i = 0; i < mbCount; i++) {')
- hf_body.append(' XGL_MEMORY_BARRIER *pNext = (XGL_MEMORY_BARRIER *) ppMemBarriers[i];')
- hf_body.append(' switch (pNext->sType) {')
- hf_body.append(' case XGL_STRUCTURE_TYPE_MEMORY_BARRIER:')
- hf_body.append(' siz += sizeof(XGL_MEMORY_BARRIER);')
- hf_body.append(' break;')
- hf_body.append(' case XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER:')
- hf_body.append(' siz += sizeof(XGL_BUFFER_MEMORY_BARRIER);')
- hf_body.append(' break;')
- hf_body.append(' case XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER:')
- hf_body.append(' siz += sizeof(XGL_IMAGE_MEMORY_BARRIER);')
- hf_body.append(' break;')
- hf_body.append(' default:')
- hf_body.append(' assert(0);')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' }')
- hf_body.append(' return siz;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_pipeline_shader_to_trace_packet(glv_trace_packet_header* pHeader, XGL_PIPELINE_SHADER* packetShader, const XGL_PIPELINE_SHADER* paramShader)')
- hf_body.append('{')
- hf_body.append(' uint32_t i;')
- hf_body.append(' // constant buffers')
- hf_body.append(' if (paramShader->linkConstBufferCount > 0 && paramShader->pLinkConstBufferInfo != NULL)')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(packetShader->pLinkConstBufferInfo), sizeof(XGL_LINK_CONST_BUFFER) * paramShader->linkConstBufferCount, paramShader->pLinkConstBufferInfo);')
- hf_body.append(' for (i = 0; i < paramShader->linkConstBufferCount; i++)')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(packetShader->pLinkConstBufferInfo[i].pBufferData), packetShader->pLinkConstBufferInfo[i].bufferSize, paramShader->pLinkConstBufferInfo[i].pBufferData);')
- hf_body.append(' }')
- hf_body.append(' }')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void finalize_pipeline_shader_address(glv_trace_packet_header* pHeader, const XGL_PIPELINE_SHADER* packetShader)')
- hf_body.append('{')
- hf_body.append(' uint32_t i;')
- hf_body.append(' // constant buffers')
- hf_body.append(' if (packetShader->linkConstBufferCount > 0 && packetShader->pLinkConstBufferInfo != NULL)')
- hf_body.append(' {')
- hf_body.append(' for (i = 0; i < packetShader->linkConstBufferCount; i++)')
- hf_body.append(' {')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(packetShader->pLinkConstBufferInfo[i].pBufferData));')
- hf_body.append(' }')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(packetShader->pLinkConstBufferInfo));')
- hf_body.append(' }')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_create_ds_layout_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
- hf_body.append('{')
- hf_body.append(' const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO* pInNow = pIn;')
- hf_body.append(' XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO** ppOutNext = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO**)ppOut;')
- hf_body.append(' while (pInNow != NULL)')
- hf_body.append(' {')
- hf_body.append(' XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO** ppOutNow = ppOutNext;')
- hf_body.append(' ppOutNext = NULL;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO), pInNow);')
- hf_body.append(' ppOutNext = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' pInNow = (XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO*)pInNow->pNext;')
- hf_body.append(' }')
- hf_body.append(' return;')
- hf_body.append('}')
- hf_body.append('')
- hf_body.append('static void add_update_descriptors_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
- hf_body.append('{')
- hf_body.append(' const XGL_UPDATE_SAMPLERS* pInNow = pIn;')
- hf_body.append(' XGL_UPDATE_SAMPLERS** ppOutNext = (XGL_UPDATE_SAMPLERS**)ppOut;')
- hf_body.append(' while (pInNow != NULL)')
- hf_body.append(' {')
- hf_body.append(' XGL_UPDATE_SAMPLERS** ppOutNow = ppOutNext;')
- hf_body.append(' ppOutNext = NULL;')
- hf_body.append(' switch (pInNow->sType)')
- hf_body.append(' {')
- hf_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_UPDATE_SAMPLERS), pInNow);')
- hf_body.append(' XGL_UPDATE_SAMPLERS* pPacket = (XGL_UPDATE_SAMPLERS*)*ppOutNow;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pSamplers, ((XGL_UPDATE_SAMPLERS*)pInNow)->count * sizeof(XGL_SAMPLER), ((XGL_UPDATE_SAMPLERS*)pInNow)->pSamplers);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pSamplers));')
- hf_body.append(' ppOutNext = (XGL_UPDATE_SAMPLERS**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:')
- hf_body.append(' {')
- #hf_body.append(' totalUpdateSize += sizeof(XGL_UPDATE_SAMPLER_TEXTURES) + ((XGL_UPDATE_SAMPLER_TEXTURES*)pNext)->count * (sizeof(XGL_SAMPLER_IMAGE_VIEW_INFO) + sizeof(XGL_IMAGE_VIEW_ATTACH_INFO));')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_UPDATE_SAMPLER_TEXTURES), pInNow);')
- hf_body.append(' XGL_UPDATE_SAMPLER_TEXTURES* pPacket = (XGL_UPDATE_SAMPLER_TEXTURES*)*ppOutNow;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pSamplerImageViews, ((XGL_UPDATE_SAMPLER_TEXTURES*)pInNow)->count * sizeof(XGL_SAMPLER_IMAGE_VIEW_INFO), ((XGL_UPDATE_SAMPLER_TEXTURES*)pInNow)->pSamplerImageViews);')
- # TODO : This is still broken. How to update the original XGL_SAMPLER_IMAGE_VIEW_INFO struct ptrs to have correct address for newly added XGL_IMAGE_VIEW_ATTACH_INFO blocks below?
- hf_body.append(' uint32_t i;')
- hf_body.append(' for (i = 0; i < ((XGL_UPDATE_SAMPLER_TEXTURES*)pInNow)->count; i++) {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pSamplerImageViews[i].pImageView, sizeof(XGL_IMAGE_VIEW_ATTACH_INFO), ((XGL_UPDATE_SAMPLER_TEXTURES*)pInNow)->pSamplerImageViews[i].pImageView);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pSamplerImageViews[i].pImageView));')
- hf_body.append(' }')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pSamplerImageViews));')
- hf_body.append(' ppOutNext = (XGL_UPDATE_SAMPLERS**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_UPDATE_IMAGES), pInNow);')
- hf_body.append(' XGL_UPDATE_IMAGES* pPacket = (XGL_UPDATE_IMAGES*)*ppOutNow;')
- hf_body.append(' uint32_t i;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pImageViews, ((XGL_UPDATE_IMAGES*)pInNow)->count * sizeof(XGL_IMAGE_VIEW_ATTACH_INFO *), ((XGL_UPDATE_IMAGES*)pInNow)->pImageViews);')
- hf_body.append(' for (i = 0; i < ((XGL_UPDATE_IMAGES*)pInNow)->count; i++) {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pImageViews[i], sizeof(XGL_IMAGE_VIEW_ATTACH_INFO), ((XGL_UPDATE_IMAGES*)pInNow)->pImageViews[i]);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pImageViews[i]));')
- hf_body.append(' }')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pImageViews));')
- hf_body.append(' ppOutNext = (XGL_UPDATE_SAMPLERS**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_UPDATE_BUFFERS), pInNow);')
- hf_body.append(' XGL_UPDATE_BUFFERS* pPacket = (XGL_UPDATE_BUFFERS*)*ppOutNow;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pBufferViews, ((XGL_UPDATE_BUFFERS*)pInNow)->count * sizeof(XGL_BUFFER_VIEW_ATTACH_INFO *), ((XGL_UPDATE_BUFFERS*)pInNow)->pBufferViews);')
- hf_body.append(' uint32_t i;')
- hf_body.append(' for (i = 0; i < ((XGL_UPDATE_BUFFERS*)pInNow)->count; i++) {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pBufferViews[i], sizeof(XGL_BUFFER_VIEW_ATTACH_INFO), ((XGL_UPDATE_BUFFERS*)pInNow)->pBufferViews[i]);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pBufferViews[i]));')
- hf_body.append(' }')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pBufferViews));')
- hf_body.append(' ppOutNext = (XGL_UPDATE_SAMPLERS**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:')
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_UPDATE_AS_COPY), pInNow);')
- hf_body.append(' ppOutNext = (XGL_UPDATE_SAMPLERS**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' default:')
- hf_body.append(' assert(0);')
- hf_body.append(' }')
- hf_body.append(' pInNow = (XGL_UPDATE_SAMPLERS*)pInNow->pNext;')
- hf_body.append(' }')
- hf_body.append(' return;')
- hf_body.append('}')
- hf_body.append('')
- pipe_state_list = ['IA_STATE_CREATE_INFO',
- 'TESS_STATE_CREATE_INFO',
- 'RS_STATE_CREATE_INFO',
- 'DS_STATE_CREATE_INFO',
- 'VP_STATE_CREATE_INFO',
- 'MS_STATE_CREATE_INFO'
- ]
- hf_body.append('static void add_pipeline_state_to_trace_packet(glv_trace_packet_header* pHeader, void** ppOut, const void* pIn)')
- hf_body.append('{')
- hf_body.append(' const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pInNow = pIn;')
- hf_body.append(' XGL_GRAPHICS_PIPELINE_CREATE_INFO** ppOutNext = (XGL_GRAPHICS_PIPELINE_CREATE_INFO**)ppOut;')
- hf_body.append(' while (pInNow != NULL)')
- hf_body.append(' {')
- hf_body.append(' XGL_GRAPHICS_PIPELINE_CREATE_INFO** ppOutNow = ppOutNext;')
- hf_body.append(' ppOutNext = NULL;')
- hf_body.append('')
- hf_body.append(' switch (pInNow->sType)')
- hf_body.append(' {')
- for pipe_state in pipe_state_list:
- hf_body.append(' case XGL_STRUCTURE_TYPE_PIPELINE_%s:' % pipe_state)
- hf_body.append(' {')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_PIPELINE_%s), pInNow);' % pipe_state)
- hf_body.append(' ppOutNext = (XGL_GRAPHICS_PIPELINE_CREATE_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO:')
- hf_body.append(' {')
- hf_body.append(' XGL_PIPELINE_CB_STATE_CREATE_INFO *pPacket = NULL;')
- hf_body.append(' XGL_PIPELINE_CB_STATE_CREATE_INFO *pIn = NULL;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_PIPELINE_CB_STATE_CREATE_INFO), pInNow);')
- hf_body.append(' pPacket = (XGL_PIPELINE_CB_STATE_CREATE_INFO*) *ppOutNow;')
- hf_body.append(' pIn = (XGL_PIPELINE_CB_STATE_CREATE_INFO*) pInNow;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pAttachments, pIn->attachmentCount * sizeof(XGL_PIPELINE_CB_ATTACHMENT_STATE), pIn->pAttachments);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pAttachments));')
- hf_body.append(' ppOutNext = (XGL_GRAPHICS_PIPELINE_CREATE_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO:')
- hf_body.append(' {')
- hf_body.append(' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pPacket = NULL;')
- hf_body.append(' XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* pInPacket = NULL;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_PIPELINE_SHADER_STAGE_CREATE_INFO), pInNow);')
- hf_body.append(' pPacket = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*) *ppOutNow;')
- hf_body.append(' pInPacket = (XGL_PIPELINE_SHADER_STAGE_CREATE_INFO*) pInNow;')
- hf_body.append(' add_pipeline_shader_to_trace_packet(pHeader, &pPacket->shader, &pInPacket->shader);')
- hf_body.append(' finalize_pipeline_shader_address(pHeader, &pPacket->shader);')
- hf_body.append(' ppOutNext = (XGL_GRAPHICS_PIPELINE_CREATE_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' case XGL_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO:')
- hf_body.append(' {')
- hf_body.append(' XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *pPacket = NULL;')
- hf_body.append(' XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO *pIn = NULL;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)(ppOutNow), sizeof(XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO), pInNow);')
- hf_body.append(' pPacket = (XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO*) *ppOutNow;')
- hf_body.append(' pIn = (XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO*) pInNow;')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pVertexBindingDescriptions, pIn->bindingCount * sizeof(XGL_VERTEX_INPUT_BINDING_DESCRIPTION), pIn->pVertexBindingDescriptions);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pVertexBindingDescriptions));')
- hf_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void **) &pPacket->pVertexAttributeDescriptions, pIn->attributeCount * sizeof(XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION), pIn->pVertexAttributeDescriptions);')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)&(pPacket->pVertexAttributeDescriptions));')
- hf_body.append(' ppOutNext = (XGL_GRAPHICS_PIPELINE_CREATE_INFO**)&(*ppOutNow)->pNext;')
- hf_body.append(' glv_finalize_buffer_address(pHeader, (void**)(ppOutNow));')
- hf_body.append(' break;')
- hf_body.append(' }')
- hf_body.append(' default:')
- hf_body.append(' assert(!"Encountered an unexpected type in pipeline state list");')
- hf_body.append(' }')
- hf_body.append(' pInNow = (XGL_GRAPHICS_PIPELINE_CREATE_INFO*)pInNow->pNext;')
- hf_body.append(' }')
- hf_body.append(' return;')
- hf_body.append('}')
- return "\n".join(hf_body)
-
def _generate_packet_id_enum(self):
pid_enum = []
pid_enum.append('enum GLV_TRACE_PACKET_ID_XGL')
@@ -1699,92 +1112,6 @@
if_body.append('}\n')
return "\n".join(if_body)
- def _generate_replay_class_decls(self):
- cd_body = []
- cd_body.append('class ApiReplay {')
- cd_body.append('public:')
- cd_body.append(' virtual ~ApiReplay() { }')
- cd_body.append(' virtual enum glv_replay::GLV_REPLAY_RESULT replay(glv_trace_packet_header * packet) = 0;')
- cd_body.append(' virtual int init(glv_replay::Display & disp) = 0;')
- cd_body.append(' virtual void push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, size_t location, int32_t msgCode, const char* pMsg) = 0;')
- cd_body.append(' virtual glv_replay::GLV_REPLAY_RESULT pop_validation_msgs() = 0;')
- cd_body.append(' virtual int dump_validation_data() = 0;')
- cd_body.append('};\n')
- cd_body.append('class xglDisplay: public glv_replay::DisplayImp {')
- cd_body.append('friend class xglReplay;')
- cd_body.append('public:')
- cd_body.append(' xglDisplay();')
- cd_body.append(' ~xglDisplay();')
- cd_body.append(' int init(const unsigned int gpu_idx);')
- cd_body.append(' int set_window(glv_window_handle hWindow, unsigned int width, unsigned int height);')
- cd_body.append(' int create_window(const unsigned int width, const unsigned int height);')
- cd_body.append(' void resize_window(const unsigned int width, const unsigned int height);')
- cd_body.append(' void process_event();')
- cd_body.append(' // XGL_DEVICE get_device() { return m_dev[m_gpuIdx];}')
- cd_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- cd_body.append(' xcb_window_t get_window_handle() { return m_XcbWindow; }')
- cd_body.append('#elif defined(WIN32)')
- cd_body.append(' HWND get_window_handle() { return m_windowHandle; }')
- cd_body.append('#endif')
- cd_body.append('private:')
- cd_body.append(' XGL_RESULT init_xgl(const unsigned int gpu_idx);')
- cd_body.append(' bool m_initedXGL;')
- cd_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- cd_body.append(' XGL_WSI_X11_CONNECTION_INFO m_WsiConnection;')
- cd_body.append(' xcb_screen_t *m_pXcbScreen;')
- cd_body.append(' xcb_window_t m_XcbWindow;')
- cd_body.append('#elif defined(WIN32)')
- cd_body.append(' HWND m_windowHandle;')
- cd_body.append('#endif')
- cd_body.append(' unsigned int m_windowWidth;')
- cd_body.append(' unsigned int m_windowHeight;')
- cd_body.append(' unsigned int m_frameNumber;')
- cd_body.append(' std::vector<uint32_t> imageWidth;')
- cd_body.append(' std::vector<uint32_t> imageHeight;')
- cd_body.append(' std::vector<XGL_IMAGE> imageHandles;')
- cd_body.append(' std::vector<XGL_GPU_MEMORY> imageMemory;')
- cd_body.append('#if 0')
- cd_body.append(' XGL_DEVICE m_dev[XGL_MAX_PHYSICAL_GPUS];')
- cd_body.append(' uint32_t m_gpuCount;')
- cd_body.append(' unsigned int m_gpuIdx;')
- cd_body.append(' XGL_PHYSICAL_GPU m_gpus[XGL_MAX_PHYSICAL_GPUS];')
- cd_body.append(' XGL_PHYSICAL_GPU_PROPERTIES m_gpuProps[XGL_MAX_PHYSICAL_GPUS];')
- cd_body.append('#endif')
- cd_body.append(' std::vector<char *>m_extensions;')
- cd_body.append('};\n')
- cd_body.append('class objMemory {')
- cd_body.append('public:')
- cd_body.append(' objMemory() : m_numAllocations(0), m_pMemReqs(NULL) {}')
- cd_body.append(' ~objMemory() { free(m_pMemReqs);}')
- cd_body.append(' void setCount(const uint32_t num);')
- cd_body.append(' void setReqs(const XGL_MEMORY_REQUIREMENTS *pReqs, const uint32_t num);')
- cd_body.append('private:')
- cd_body.append(' uint32_t m_numAllocations;')
- cd_body.append(' XGL_MEMORY_REQUIREMENTS *m_pMemReqs;')
- cd_body.append('};\n')
- cd_body.append('class gpuMemory {')
- cd_body.append('public:')
- cd_body.append(' gpuMemory() : m_pendingAlloc(false) {m_allocInfo.allocationSize = 0;}')
- cd_body.append(' ~gpuMemory() {}')
- cd_body.append(' bool isPendingAlloc();')
- cd_body.append(' void setAllocInfo(const XGL_MEMORY_ALLOC_INFO *info, const bool pending);')
- cd_body.append(' void setMemoryDataAddr(void *pBuf);')
- cd_body.append(' void setMemoryMapRange(void *pBuf, const size_t size, const size_t offset, const bool pending);')
- cd_body.append(' void copyMappingData(const void *pSrcData);')
- cd_body.append(' size_t getMemoryMapSize();')
- cd_body.append('private:')
- cd_body.append(' bool m_pendingAlloc;')
- cd_body.append(' struct mapRange {')
- cd_body.append(' bool pending;')
- cd_body.append(' size_t size;')
- cd_body.append(' size_t offset;')
- cd_body.append(' void *pData;')
- cd_body.append(' };')
- cd_body.append(' std::vector<struct mapRange> m_mapRange;')
- cd_body.append(' XGL_MEMORY_ALLOC_INFO m_allocInfo;')
- cd_body.append('};\n')
- return "\n".join(cd_body)
-
def _generate_replay_func_ptrs(self):
xf_body = []
xf_body.append('struct xglFuncs {')
@@ -1823,7 +1150,75 @@
txt += ' return (q == %s.end()) ? XGL_NULL_HANDLE : q->second;\n }\n' % name
return txt
- def _generate_replay_class(self):
+ def _generate_replay_objMemory_funcs(self):
+ rof_body = []
+ # Custom code for memory mapping functions for app writes into mapped memory
+ rof_body.append('// memory mapping functions for app writes into mapped memory')
+ rof_body.append(' bool isPendingAlloc()')
+ rof_body.append(' {')
+ 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(' {')
+ rof_body.append(' m_pendingAlloc = pending;')
+ rof_body.append(' m_allocInfo = *info;')
+ rof_body.append(' }')
+ rof_body.append('')
+ rof_body.append(' void setMemoryDataAddr(void *pBuf)')
+ rof_body.append(' {')
+ rof_body.append(' if (m_mapRange.empty())')
+ rof_body.append(' {')
+ rof_body.append(' glv_LogError("gpuMemory::setMemoryDataAddr() m_mapRange is empty\\n");')
+ rof_body.append(' return;')
+ rof_body.append(' }')
+ rof_body.append(' MapRange mr = m_mapRange.back();')
+ rof_body.append(' if (mr.pData != NULL)')
+ rof_body.append(' glv_LogWarn("gpuMemory::setMemoryDataAddr() data already mapped overwrite old mapping\\n");')
+ rof_body.append(' else if (pBuf == NULL)')
+ rof_body.append(' glv_LogWarn("gpuMemory::setMemoryDataAddr() adding NULL pointer\\n");')
+ rof_body.append(' mr.pData = pBuf;')
+ rof_body.append(' }')
+ rof_body.append('')
+ rof_body.append(' void setMemoryMapRange(void *pBuf, const size_t size, const size_t offset, const bool pending)')
+ rof_body.append(' {')
+ rof_body.append(' MapRange mr;')
+ rof_body.append(' mr.pData = pBuf;')
+ rof_body.append(' mr.size = size;')
+ rof_body.append(' mr.offset = offset;')
+ rof_body.append(' mr.pending = pending;')
+ rof_body.append(' m_mapRange.push_back(mr);')
+ rof_body.append(' }')
+ rof_body.append('')
+ rof_body.append(' void copyMappingData(const void* pSrcData)')
+ rof_body.append(' {')
+ rof_body.append(' if (m_mapRange.empty())')
+ rof_body.append(' {')
+ rof_body.append(' glv_LogError("gpuMemory::copyMappingData() m_mapRange is empty\\n");')
+ rof_body.append(' return;')
+ rof_body.append(' }')
+ rof_body.append(' MapRange mr = m_mapRange.back();')
+ rof_body.append(' if (!pSrcData || !mr.pData)')
+ rof_body.append(' {')
+ rof_body.append(' if (!pSrcData)')
+ rof_body.append(' glv_LogError("gpuMemory::copyMappingData() null src pointer\\n");')
+ rof_body.append(' else')
+ rof_body.append(' glv_LogError("gpuMemory::copyMappingData() null dest pointer size=%u\\n", m_allocInfo.allocationSize);')
+ rof_body.append(' m_mapRange.pop_back();')
+ rof_body.append(' return;')
+ rof_body.append(' }')
+ rof_body.append(' memcpy(mr.pData, pSrcData, m_allocInfo.allocationSize);')
+ rof_body.append(' if (!mr.pending)')
+ rof_body.append(' m_mapRange.pop_back();')
+ rof_body.append(' }')
+ rof_body.append('')
+ rof_body.append(' size_t getMemoryMapSize()')
+ rof_body.append(' {')
+ rof_body.append(' return (!m_mapRange.empty()) ? m_mapRange.back().size : 0;')
+ rof_body.append(' }\n')
+ 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')
obj_map_dict = {}
for ty in xgl.object_type_list:
@@ -1834,71 +1229,106 @@
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('class xglReplay : public ApiReplay {')
+ rc_body.append('typedef struct _XGLAllocInfo {')
+ rc_body.append(' XGL_GPU_SIZE size;')
+ rc_body.append(' void *pData;')
+ rc_body.append('} XGLAllocInfo;')
+ rc_body.append('')
+ rc_body.append('class objMemory {')
rc_body.append('public:')
- rc_body.append(' ~xglReplay();')
- rc_body.append(' xglReplay(glvreplay_settings *pReplaySettings);\n')
- rc_body.append(' int init(glv_replay::Display & disp);')
- rc_body.append(' xglDisplay * get_display() {return m_display;}')
- rc_body.append(' glv_replay::GLV_REPLAY_RESULT replay(glv_trace_packet_header *packet);')
- rc_body.append(' glv_replay::GLV_REPLAY_RESULT handle_replay_errors(const char* entrypointName, const XGL_RESULT resCall, const XGL_RESULT resTrace, const glv_replay::GLV_REPLAY_RESULT resIn);\n')
- rc_body.append(' void push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, size_t location, int32_t msgCode, const char* pMsg);')
- rc_body.append(' glv_replay::GLV_REPLAY_RESULT pop_validation_msgs();')
- rc_body.append(' int dump_validation_data();')
- rc_body.append('private:')
- rc_body.append(' struct xglFuncs m_xglFuncs;')
- rc_body.append(' DRAW_STATE_DUMP_DOT_FILE m_pDSDump;')
- rc_body.append(' DRAW_STATE_DUMP_COMMAND_BUFFER_DOT_FILE m_pCBDump;')
- rc_body.append(' xglDisplay *m_display;')
- rc_body.append(' struct shaderPair {')
- rc_body.append(' XGL_SHADER *addr;')
- rc_body.append(' XGL_SHADER val;')
- rc_body.append(' };')
- rc_body.append(' struct validationMsg {')
- rc_body.append(' XGL_VALIDATION_LEVEL validationLevel;')
- rc_body.append(' XGL_BASE_OBJECT srcObject;')
- rc_body.append(' size_t location;')
- rc_body.append(' int32_t msgCode;')
- rc_body.append(' char msg[256];')
- rc_body.append(' };')
- rc_body.append(' std::vector<struct validationMsg> m_validationMsgs;')
- rc_body.append(' std::vector<int> m_screenshotFrames;')
- 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(' struct imageObj {')
- rc_body.append(' objMemory imageMem;')
- rc_body.append(' XGL_IMAGE replayImage;')
- rc_body.append(' };\n')
- rc_body.append(' struct bufferObj {')
- rc_body.append(' objMemory bufferMem;')
- rc_body.append(' XGL_BUFFER replayBuffer;')
- rc_body.append(' };\n')
- rc_body.append(' struct gpuMemObj {')
- rc_body.append(' gpuMemory *pGpuMem;')
- rc_body.append(' XGL_GPU_MEMORY replayGpuMem;')
- rc_body.append(' };\n')
- 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, struct 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, struct 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;')
- rc_body.append(' obj.setCount(num);')
- rc_body.append(' return;')
- rc_body.append(' }')
- rc_body.append(' return;')
+ rc_body.append(' objMemory() : m_numAllocations(0), m_pMemReqs(NULL) {}')
+ rc_body.append(' ~objMemory() { free(m_pMemReqs);}')
+ rc_body.append(' void setCount(const uint32_t num)')
+ 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(' {')
+ 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(' if (m_pMemReqs == NULL)')
+ rc_body.append(' {')
+ rc_body.append(' glv_LogError("objMemory::setReqs out of memory");')
+ rc_body.append(' return;')
+ rc_body.append(' }')
+ rc_body.append(' memcpy(m_pMemReqs, pReqs, num);')
+ rc_body.append(' }')
+ 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('};')
+ rc_body.append('')
+ rc_body.append('class gpuMemory {')
+ rc_body.append('public:')
+ rc_body.append(' gpuMemory() : m_pendingAlloc(false) {m_allocInfo.allocationSize = 0;}')
+ 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 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);')
+# rc_body.append(' size_t getMemoryMapSize();')
+ rc_body.append('private:')
+ rc_body.append(' bool m_pendingAlloc;')
+ rc_body.append(' struct MapRange {')
+ rc_body.append(' bool pending;')
+ rc_body.append(' size_t size;')
+ rc_body.append(' size_t offset;')
+ 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('};')
+ rc_body.append('')
+ rc_body.append('typedef struct _imageObj {')
+ rc_body.append(' objMemory imageMem;')
+ rc_body.append(' XGL_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(' } 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(' } gpuMemObj;')
+ rc_body.append('')
+ rc_body.append('class xglReplayObjMapper {')
+ rc_body.append('public:')
+ rc_body.append(' xglReplayObjMapper() {}')
+ rc_body.append(' ~xglReplayObjMapper() {}')
+ 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(' 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(' if (itb != m_buffers.end())')
+ rc_body.append(' {')
+ rc_body.append(' objMemory obj = itb->second.bufferMem;')
+ rc_body.append(' obj.setCount(num);')
+ rc_body.append(' return;')
+ 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, struct imageObj>::const_iterator it = m_images.find(img);')
+ rc_body.append(' std::map<XGL_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;')
@@ -1906,7 +1336,7 @@
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, struct bufferObj>::const_iterator itb = m_buffers.find(buf);')
+ rc_body.append(' std::map<XGL_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;')
@@ -1914,37 +1344,38 @@
rc_body.append(' return;')
rc_body.append(' }')
rc_body.append(' return;')
- rc_body.append(' }\n')
+ rc_body.append(' }')
+ rc_body.append('')
rc_body.append(' void clear_all_map_handles()\n {')
for var in sorted(obj_map_dict):
rc_body.append(' %s.clear();' % var)
rc_body.append(' }\n')
for var in sorted(obj_map_dict):
if obj_map_dict[var] == 'XGL_IMAGE':
- rc_body.append(self._map_decl(obj_map_dict[var], 'struct imageObj', var))
- rc_body.append(self._add_to_map_decl(obj_map_dict[var], 'struct imageObj', var))
+ 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(' {')
- rc_body.append(' std::map<XGL_IMAGE, struct imageObj>::const_iterator q = m_images.find(value);')
+ 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(' }\n')
elif obj_map_dict[var] == 'XGL_BUFFER':
- rc_body.append(self._map_decl(obj_map_dict[var], 'struct bufferObj', var))
- rc_body.append(self._add_to_map_decl(obj_map_dict[var], 'struct bufferObj', var))
+ 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(' {')
- rc_body.append(' std::map<XGL_BUFFER, struct bufferObj>::const_iterator q = m_buffers.find(value);')
+ 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(' }\n')
elif obj_map_dict[var] == 'XGL_GPU_MEMORY':
- rc_body.append(self._map_decl(obj_map_dict[var], 'struct gpuMemObj', var))
- rc_body.append(self._add_to_map_decl(obj_map_dict[var], 'struct gpuMemObj', var))
+ 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(' {')
- rc_body.append(' std::map<XGL_GPU_MEMORY, struct gpuMemObj>::const_iterator q = m_gpuMemorys.find(value);')
+ 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(' }\n')
else:
@@ -1963,7 +1394,8 @@
rc_body.append(' void rm_from_map(const XGL_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(' }\n')
+ 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;')
@@ -1982,461 +1414,11 @@
for t in base_obj_remap_types:
rc_body.append(' if ((obj = remap(static_cast <%s> (object))) != XGL_NULL_HANDLE)' % t)
rc_body.append(' return obj;')
- rc_body.append(' return XGL_NULL_HANDLE;\n }')
- rc_body.append('void process_screenshot_list(const char *list)')
- rc_body.append('{')
- rc_body.append(' std::string spec(list), word;')
- rc_body.append(' size_t start = 0, comma = 0;\n')
- rc_body.append(' while (start < spec.size()) {')
- rc_body.append(' comma = spec.find(\',\', start);\n')
- rc_body.append(' if (comma == std::string::npos)')
- rc_body.append(' word = std::string(spec, start);')
- rc_body.append(' else')
- rc_body.append(' word = std::string(spec, start, comma - start);\n')
- rc_body.append(' m_screenshotFrames.push_back(atoi(word.c_str()));')
- rc_body.append(' if (comma == std::string::npos)')
- rc_body.append(' break;\n')
- rc_body.append(' start = comma + 1;\n')
+ rc_body.append(' return XGL_NULL_HANDLE;')
rc_body.append(' }')
- rc_body.append('}')
rc_body.append('};')
return "\n".join(rc_body)
- def _generate_replay_display_init_xgl(self):
- dix_body = []
- dix_body.append('XGL_RESULT xglDisplay::init_xgl(unsigned int gpu_idx)')
- dix_body.append('{')
- dix_body.append('#if 0')
- dix_body.append(' XGL_APPLICATION_INFO appInfo = {};')
- dix_body.append(' appInfo.pAppName = APP_NAME;')
- dix_body.append(' appInfo.pEngineName = "";')
- dix_body.append(' appInfo.apiVersion = XGL_API_VERSION;')
- dix_body.append(' XGL_RESULT res = xglInitAndEnumerateGpus(&appInfo, NULL, XGL_MAX_PHYSICAL_GPUS, &m_gpuCount, m_gpus);')
- dix_body.append(' if ( res == XGL_SUCCESS ) {')
- dix_body.append(' // retrieve the GPU information for all GPUs')
- dix_body.append(' for( uint32_t gpu = 0; gpu < m_gpuCount; gpu++)')
- dix_body.append(' {')
- dix_body.append(' size_t gpuInfoSize = sizeof(m_gpuProps[0]);\n')
- dix_body.append(' // get the GPU physical properties:')
- dix_body.append(' res = xglGetGpuInfo( m_gpus[gpu], XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES, &gpuInfoSize, &m_gpuProps[gpu]);')
- dix_body.append(' if (res != XGL_SUCCESS)')
- dix_body.append(' glv_LogWarn("Failed to retrieve properties for gpu[%d] result %d\\n", gpu, res);')
- dix_body.append(' }')
- dix_body.append(' res = XGL_SUCCESS;')
- dix_body.append(' } else if ((gpu_idx + 1) > m_gpuCount) {')
- dix_body.append(' glv_LogError("xglInitAndEnumerate number of gpus does not include requested index: num %d, requested %d\\n", m_gpuCount, gpu_idx);')
- dix_body.append(' return -1;')
- dix_body.append(' } else {')
- dix_body.append(' glv_LogError("xglInitAndEnumerate failed\\n");')
- dix_body.append(' return res;')
- dix_body.append(' }')
- dix_body.append(' // TODO add multi-gpu support always use gpu[gpu_idx] for now')
- dix_body.append(' // get all extensions supported by this device gpu[gpu_idx]')
- dix_body.append(' // first check if extensions are available and save a list of them')
- dix_body.append(' bool foundWSIExt = false;')
- dix_body.append(' for( int ext = 0; ext < sizeof( extensions ) / sizeof( extensions[0] ); ext++)')
- dix_body.append(' {')
- dix_body.append(' res = xglGetExtensionSupport( m_gpus[gpu_idx], extensions[ext] );')
- dix_body.append(' if (res == XGL_SUCCESS) {')
- dix_body.append(' m_extensions.push_back((char *) extensions[ext]);')
- dix_body.append(' if (!strcmp(extensions[ext], "XGL_WSI_WINDOWS"))')
- dix_body.append(' foundWSIExt = true;')
- dix_body.append(' }')
- dix_body.append(' }')
- dix_body.append(' if (!foundWSIExt) {')
- dix_body.append(' glv_LogError("XGL_WSI_WINDOWS extension not supported by gpu[%d]\\n", gpu_idx);')
- dix_body.append(' return XGL_ERROR_INCOMPATIBLE_DEVICE;')
- dix_body.append(' }')
- dix_body.append(' // TODO generalize this: use one universal queue for now')
- dix_body.append(' XGL_DEVICE_QUEUE_CREATE_INFO dqci = {};')
- dix_body.append(' dqci.queueCount = 1;')
- dix_body.append(' dqci.queueType = XGL_QUEUE_UNIVERSAL;')
- dix_body.append(' // create the device enabling validation level 4')
- dix_body.append(' const char * const * extNames = &m_extensions[0];')
- dix_body.append(' XGL_DEVICE_CREATE_INFO info = {};')
- dix_body.append(' info.queueRecordCount = 1;')
- dix_body.append(' info.pRequestedQueues = &dqci;')
- dix_body.append(' info.extensionCount = static_cast <uint32_t> (m_extensions.size());')
- dix_body.append(' info.ppEnabledExtensionNames = extNames;')
- dix_body.append(' info.flags = XGL_DEVICE_CREATE_VALIDATION;')
- dix_body.append(' info.maxValidationLevel = XGL_VALIDATION_LEVEL_4;')
- dix_body.append(' bool32_t xglTrue = XGL_TRUE;')
- dix_body.append(' res = xglDbgSetGlobalOption( XGL_DBG_OPTION_BREAK_ON_ERROR, sizeof( xglTrue ), &xglTrue );')
- dix_body.append(' if (res != XGL_SUCCESS)')
- dix_body.append(' glv_LogWarn("Could not set debug option break on error\\n");')
- dix_body.append(' res = xglCreateDevice( m_gpus[0], &info, &m_dev[gpu_idx]);')
- dix_body.append(' return res;')
- dix_body.append('#else')
- dix_body.append(' return XGL_ERROR_INITIALIZATION_FAILED;')
- dix_body.append('#endif')
- dix_body.append('}')
- return "\n".join(dix_body)
-
- def _generate_replay_display_init(self):
- di_body = []
- di_body.append('int xglDisplay::init(const unsigned int gpu_idx)')
- di_body.append('{')
- di_body.append(' //m_gpuIdx = gpu_idx;')
- di_body.append('#if 0')
- di_body.append(' XGL_RESULT result = init_xgl(gpu_idx);')
- di_body.append(' if (result != XGL_SUCCESS) {')
- di_body.append(' glv_LogError("could not init xgl library");')
- di_body.append(' return -1;')
- di_body.append(' } else {')
- di_body.append(' m_initedXGL = true;')
- di_body.append(' }')
- di_body.append('#endif')
- di_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- di_body.append(' const xcb_setup_t *setup;')
- di_body.append(' xcb_screen_iterator_t iter;')
- di_body.append(' int scr;')
- di_body.append(' xcb_connection_t *pConnection;')
- di_body.append(' pConnection = xcb_connect(NULL, &scr);')
- di_body.append(' setup = xcb_get_setup(pConnection);')
- di_body.append(' iter = xcb_setup_roots_iterator(setup);')
- di_body.append(' while (scr-- > 0)')
- di_body.append(' xcb_screen_next(&iter);')
- di_body.append(' m_pXcbScreen = iter.data;')
- di_body.append(' m_WsiConnection.pConnection = pConnection;')
- di_body.append(' m_WsiConnection.root = m_pXcbScreen->root;')
- di_body.append('#endif')
- di_body.append(' return 0;')
- di_body.append('}')
- return "\n".join(di_body)
-
- def _generate_replay_display_structors(self):
- ds_body = []
- ds_body.append('xglDisplay::xglDisplay()')
- ds_body.append(' : m_initedXGL(false),')
- ds_body.append(' m_windowWidth(0),')
- ds_body.append(' m_windowHeight(0)')
- ds_body.append('{')
- ds_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- ds_body.append(' m_WsiConnection.pConnection = NULL;')
- ds_body.append(' m_WsiConnection.root = 0;')
- ds_body.append(' m_WsiConnection.provider = 0;')
- ds_body.append(' m_pXcbScreen = NULL;')
- ds_body.append(' m_XcbWindow = 0;')
- ds_body.append('#elif defined(WIN32)')
- ds_body.append(' m_windowHandle = NULL;')
- ds_body.append('#endif')
- ds_body.append('}')
- ds_body.append('xglDisplay::~xglDisplay()')
- ds_body.append('{')
- ds_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- ds_body.append(' if (m_XcbWindow != 0)')
- ds_body.append(' {')
- ds_body.append(' xcb_destroy_window(m_WsiConnection.pConnection, m_XcbWindow);')
- ds_body.append(' }')
- ds_body.append(' if (m_WsiConnection.pConnection != NULL)')
- ds_body.append(' {')
- ds_body.append(' xcb_disconnect(m_WsiConnection.pConnection);')
- ds_body.append(' }')
- ds_body.append('#endif')
- ds_body.append('}')
- return "\n".join(ds_body)
-
- def _generate_replay_display_window(self):
- dw_body = []
- dw_body.append('#if defined(WIN32)')
- dw_body.append('LRESULT WINAPI WindowProcXgl( HWND window, unsigned int msg, WPARAM wp, LPARAM lp)')
- dw_body.append('{')
- dw_body.append(' switch(msg)')
- dw_body.append(' {')
- dw_body.append(' case WM_CLOSE:')
- dw_body.append(' DestroyWindow( window);')
- dw_body.append(' // fall-thru')
- dw_body.append(' case WM_DESTROY:')
- dw_body.append(' PostQuitMessage(0) ;')
- dw_body.append(' return 0L ;')
- dw_body.append(' default:')
- dw_body.append(' return DefWindowProc( window, msg, wp, lp ) ;')
- dw_body.append(' }')
- dw_body.append('}')
- dw_body.append('#endif')
- dw_body.append('int xglDisplay::set_window(glv_window_handle hWindow, unsigned int width, unsigned int height)')
- dw_body.append('{')
- dw_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- dw_body.append(' m_XcbWindow = hWindow;')
- dw_body.append('#elif defined(WIN32)')
- dw_body.append(' m_windowHandle = hWindow;')
- dw_body.append('#endif')
- dw_body.append(' m_windowWidth = width;')
- dw_body.append(' m_windowHeight = height;')
- dw_body.append(' return 0;')
- dw_body.append('}\n')
- dw_body.append('int xglDisplay::create_window(const unsigned int width, const unsigned int height)')
- dw_body.append('{')
- dw_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)\n')
- dw_body.append(' uint32_t value_mask, value_list[32];')
- dw_body.append(' m_XcbWindow = xcb_generate_id(m_WsiConnection.pConnection);\n')
- dw_body.append(' value_mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;')
- dw_body.append(' value_list[0] = m_pXcbScreen->black_pixel;')
- dw_body.append(' value_list[1] = XCB_EVENT_MASK_KEY_RELEASE |')
- dw_body.append(' XCB_EVENT_MASK_EXPOSURE;\n')
- dw_body.append(' xcb_create_window(m_WsiConnection.pConnection,')
- dw_body.append(' XCB_COPY_FROM_PARENT,')
- dw_body.append(' m_XcbWindow, m_WsiConnection.root,')
- dw_body.append(' 0, 0, width, height, 0,')
- dw_body.append(' XCB_WINDOW_CLASS_INPUT_OUTPUT,')
- dw_body.append(' m_pXcbScreen->root_visual,')
- dw_body.append(' value_mask, value_list);\n')
- dw_body.append(' xcb_map_window(m_WsiConnection.pConnection, m_XcbWindow);')
- dw_body.append(' xcb_flush(m_WsiConnection.pConnection);')
- dw_body.append(' return 0;')
- dw_body.append('#elif defined(WIN32)')
- dw_body.append(' // Register Window class')
- dw_body.append(' WNDCLASSEX wcex = {};')
- dw_body.append(' wcex.cbSize = sizeof( WNDCLASSEX);')
- dw_body.append(' wcex.style = CS_HREDRAW | CS_VREDRAW;')
- dw_body.append(' wcex.lpfnWndProc = WindowProcXgl;')
- dw_body.append(' wcex.cbClsExtra = 0;')
- dw_body.append(' wcex.cbWndExtra = 0;')
- dw_body.append(' wcex.hInstance = GetModuleHandle(0);')
- dw_body.append(' wcex.hIcon = LoadIcon(wcex.hInstance, MAKEINTRESOURCE( IDI_ICON));')
- dw_body.append(' wcex.hCursor = LoadCursor( NULL, IDC_ARROW);')
- dw_body.append(' wcex.hbrBackground = ( HBRUSH )( COLOR_WINDOW + 1);')
- dw_body.append(' wcex.lpszMenuName = NULL;')
- dw_body.append(' wcex.lpszClassName = APP_NAME;')
- dw_body.append(' wcex.hIconSm = LoadIcon( wcex.hInstance, MAKEINTRESOURCE( IDI_ICON));')
- dw_body.append(' if( !RegisterClassEx( &wcex))')
- dw_body.append(' {')
- dw_body.append(' glv_LogError("Failed to register windows class\\n");')
- dw_body.append(' return -1;')
- dw_body.append(' }\n')
- dw_body.append(' // create the window')
- dw_body.append(' m_windowHandle = CreateWindow(APP_NAME, APP_NAME, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU, 0, 0,')
- dw_body.append(' width, height, NULL, NULL, wcex.hInstance, NULL);\n')
- dw_body.append(' if (m_windowHandle)')
- dw_body.append(' {')
- dw_body.append(' ShowWindow( m_windowHandle, SW_SHOWDEFAULT);')
- dw_body.append(' m_windowWidth = width;')
- dw_body.append(' m_windowHeight = height;')
- dw_body.append(' } else {')
- dw_body.append(' glv_LogError("Failed to create window\\n");')
- dw_body.append(' return -1;')
- dw_body.append(' }')
- dw_body.append(' return 0;')
- dw_body.append('#endif')
- dw_body.append('}\n')
- dw_body.append('void xglDisplay::resize_window(const unsigned int width, const unsigned int height)')
- dw_body.append('{')
- dw_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- dw_body.append(' if (width != m_windowWidth || height != m_windowHeight)')
- dw_body.append(' {')
- dw_body.append(' uint32_t values[2];')
- dw_body.append(' values[0] = width;')
- dw_body.append(' values[1] = height;')
- dw_body.append(' xcb_configure_window(m_WsiConnection.pConnection, m_XcbWindow, XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, values);')
- dw_body.append(' m_windowWidth = width;')
- dw_body.append(' m_windowHeight = height;')
- dw_body.append(' }')
- dw_body.append('#elif defined(WIN32)')
- dw_body.append(' if (width != m_windowWidth || height != m_windowHeight)')
- dw_body.append(' {')
- dw_body.append(' SetWindowPos(get_window_handle(), HWND_TOP, 0, 0, width, height, SWP_NOMOVE);')
- dw_body.append(' m_windowWidth = width;')
- dw_body.append(' m_windowHeight = height;')
- dw_body.append(' }')
- dw_body.append('#endif')
- dw_body.append('}\n')
- dw_body.append('void xglDisplay::process_event()')
- dw_body.append('{')
- dw_body.append('}\n')
- return "\n".join(dw_body)
-
- def _generate_replay_objMemory_funcs(self):
- rof_body = []
- rof_body.append('void objMemory::setCount(const uint32_t num)')
- rof_body.append('{')
- rof_body.append(' m_numAllocations = num;')
- rof_body.append('}\n')
- rof_body.append('void objMemory::setReqs(const XGL_MEMORY_REQUIREMENTS *pReqs, const uint32_t num)')
- rof_body.append('{')
- rof_body.append(' if (m_numAllocations != num && m_numAllocations != 0)')
- rof_body.append(' glv_LogError("objMemory::setReqs, internal mismatch on number of allocations");')
- rof_body.append(' if (m_pMemReqs == NULL && pReqs != NULL)')
- rof_body.append(' {')
- rof_body.append(' m_pMemReqs = (XGL_MEMORY_REQUIREMENTS *) glv_malloc(num * sizeof(XGL_MEMORY_REQUIREMENTS));')
- rof_body.append(' if (m_pMemReqs == NULL)')
- rof_body.append(' {')
- rof_body.append(' glv_LogError("objMemory::setReqs out of memory");')
- rof_body.append(' return;')
- rof_body.append(' }')
- rof_body.append(' memcpy(m_pMemReqs, pReqs, num);')
- rof_body.append(' }')
- rof_body.append('}\n')
- # Custom code for memory mapping functions for app writes into mapped memory
- rof_body.append(' // memory mapping functions for app writes into mapped memory')
- rof_body.append(' bool gpuMemory::isPendingAlloc()')
- rof_body.append(' {')
- rof_body.append(' return m_pendingAlloc;')
- rof_body.append(' }\n')
- rof_body.append(' void gpuMemory::setAllocInfo(const XGL_MEMORY_ALLOC_INFO *info, const bool pending)')
- rof_body.append(' {')
- rof_body.append(' m_pendingAlloc = pending;')
- rof_body.append(' m_allocInfo = *info;')
- rof_body.append(' }\n')
- rof_body.append(' void gpuMemory::setMemoryDataAddr(void *pBuf)')
- rof_body.append(' {')
- rof_body.append(' if (m_mapRange.empty())')
- rof_body.append(' {')
- rof_body.append(' glv_LogError("gpuMemory::setMemoryDataAddr() m_mapRange is empty\\n");')
- rof_body.append(' return;')
- rof_body.append(' }')
- rof_body.append(' struct mapRange mr = m_mapRange.back();')
- rof_body.append(' if (mr.pData != NULL)')
- rof_body.append(' glv_LogWarn("gpuMemory::setMemoryDataAddr() data already mapped overwrite old mapping\\n");')
- rof_body.append(' else if (pBuf == NULL)')
- rof_body.append(' glv_LogWarn("gpuMemory::setMemoryDataAddr() adding NULL pointer\\n");')
- rof_body.append(' mr.pData = pBuf;')
- rof_body.append(' }\n')
- rof_body.append(' void gpuMemory::setMemoryMapRange(void *pBuf, const size_t size, const size_t offset, const bool pending)')
- rof_body.append(' {')
- rof_body.append(' struct mapRange mr;')
- rof_body.append(' mr.pData = pBuf;')
- rof_body.append(' mr.size = size;')
- rof_body.append(' mr.offset = offset;')
- rof_body.append(' mr.pending = pending;')
- rof_body.append(' m_mapRange.push_back(mr);')
- rof_body.append(' }\n')
- rof_body.append(' void gpuMemory::copyMappingData(const void* pSrcData)')
- rof_body.append(' {')
- rof_body.append(' if (m_mapRange.empty())')
- rof_body.append(' {')
- rof_body.append(' glv_LogError("gpuMemory::copyMappingData() m_mapRange is empty\\n");')
- rof_body.append(' return;')
- rof_body.append(' }')
- rof_body.append(' struct mapRange mr = m_mapRange.back();')
- rof_body.append(' if (!pSrcData || !mr.pData)')
- rof_body.append(' {')
- rof_body.append(' if (!pSrcData)')
- rof_body.append(' glv_LogError("gpuMemory::copyMappingData() null src pointer\\n");')
- rof_body.append(' else')
- rof_body.append(' glv_LogError("gpuMemory::copyMappingData() null dest pointer size=%u\\n", m_allocInfo.allocationSize);')
- rof_body.append(' m_mapRange.pop_back();')
- rof_body.append(' return;')
- rof_body.append(' }')
- rof_body.append(' memcpy(mr.pData, pSrcData, m_allocInfo.allocationSize);')
- rof_body.append(' if (!mr.pending)')
- rof_body.append(' m_mapRange.pop_back();')
- rof_body.append(' }\n')
- rof_body.append(' size_t gpuMemory::getMemoryMapSize()')
- rof_body.append(' {')
- rof_body.append(' return (!m_mapRange.empty()) ? m_mapRange.back().size : 0;')
- rof_body.append(' }\n')
- return "\n".join(rof_body)
-
- def _generate_replay_structors(self):
- rs_body = []
- rs_body.append('xglReplay::xglReplay(glvreplay_settings *pReplaySettings)')
- rs_body.append('{')
- rs_body.append(' g_pReplaySettings = pReplaySettings;')
- rs_body.append(' m_display = new xglDisplay();')
- rs_body.append(' m_pDSDump = NULL;')
- rs_body.append(' m_pCBDump = NULL;')
- rs_body.append(' m_adjustForGPU = false;')
- rs_body.append(' if (g_pReplaySettings && g_pReplaySettings->screenshotList) {')
- rs_body.append(' process_screenshot_list(g_pReplaySettings->screenshotList);')
- rs_body.append(' }')
- rs_body.append('}\n')
- rs_body.append('xglReplay::~xglReplay()')
- rs_body.append('{')
- rs_body.append(' delete m_display;')
- rs_body.append(' glv_platform_close_library(m_xglFuncs.m_libHandle);')
- rs_body.append('}')
- return "\n".join(rs_body)
-
- def _generate_replay_init(self):
- ri_body = []
- ri_body.append('int xglReplay::init(glv_replay::Display & disp)')
- ri_body.append('{')
- ri_body.append(' int err;')
- ri_body.append('#if defined PLATFORM_LINUX')
- ri_body.append(' void * handle = dlopen("libXGL.so", RTLD_LAZY);')
- ri_body.append('#else')
- ri_body.append(' HMODULE handle = LoadLibrary("xgl.dll" );')
- ri_body.append('#endif\n')
- ri_body.append(' if (handle == NULL) {')
- ri_body.append(' glv_LogError("Failed to open xgl library.\\n");')
- ri_body.append(' return -1;')
- ri_body.append(' }')
- ri_body.append(' m_xglFuncs.init_funcs(handle);')
- ri_body.append(' disp.set_implementation(m_display);')
- ri_body.append(' if ((err = m_display->init(disp.get_gpu())) != 0) {')
- ri_body.append(' glv_LogError("Failed to init XGL display.\\n");')
- ri_body.append(' return err;')
- ri_body.append(' }')
- ri_body.append(' if (disp.get_window_handle() == 0)')
- ri_body.append(' {')
- ri_body.append(' if ((err = m_display->create_window(disp.get_width(), disp.get_height())) != 0) {')
- ri_body.append(' glv_LogError("Failed to create Window\\n");')
- ri_body.append(' return err;')
- ri_body.append(' }')
- ri_body.append(' }')
- ri_body.append(' else')
- ri_body.append(' {')
- ri_body.append(' if ((err = m_display->set_window(disp.get_window_handle(), disp.get_width(), disp.get_height())) != 0)')
- ri_body.append(' {')
- ri_body.append(' glv_LogError("Failed to set Window\\n");')
- ri_body.append(' return err;')
- ri_body.append(' }')
- ri_body.append(' }')
- ri_body.append(' return 0;')
- ri_body.append('}')
- return "\n".join(ri_body)
-
- def _generate_replay_errors(self):
- re_body = []
- re_body.append('glv_replay::GLV_REPLAY_RESULT xglReplay::handle_replay_errors(const char* entrypointName, const XGL_RESULT resCall, const XGL_RESULT resTrace, const glv_replay::GLV_REPLAY_RESULT resIn)')
- re_body.append('{')
- re_body.append(' glv_replay::GLV_REPLAY_RESULT res = resIn;')
- re_body.append(' if (resCall != resTrace) {')
- re_body.append(' glv_LogWarn("Mismatched return from API call (%s) traced result %s, replay result %s\\n", entrypointName,')
- re_body.append(' string_XGL_RESULT((XGL_RESULT)resTrace), string_XGL_RESULT((XGL_RESULT)resCall));')
- re_body.append(' res = glv_replay::GLV_REPLAY_BAD_RETURN;')
- re_body.append(' }')
- re_body.append('#if 0')
- re_body.append(' if (resCall != XGL_SUCCESS) {')
- re_body.append(' glv_LogWarn("API call (%s) returned failed result %s\\n", entrypointName, string_XGL_RESULT(resCall));')
- re_body.append(' }')
- re_body.append('#endif')
- re_body.append(' return res;')
- re_body.append('}')
- return "\n".join(re_body)
-
- def _generate_replay_validation_funcs(self):
- rvf_body = []
- rvf_body.append('void xglReplay::push_validation_msg(XGL_VALIDATION_LEVEL validationLevel, XGL_BASE_OBJECT srcObject, size_t location, int32_t msgCode, const char * pMsg)')
- rvf_body.append('{')
- rvf_body.append(' struct validationMsg msgObj;')
- rvf_body.append(' msgObj.validationLevel = validationLevel;')
- rvf_body.append(' msgObj.srcObject = srcObject;')
- rvf_body.append(' msgObj.location = location;')
- rvf_body.append(' msgObj.msgCode = msgCode;')
- rvf_body.append(' strncpy(msgObj.msg, pMsg, 256);')
- rvf_body.append(" msgObj.msg[255] = '\\0';")
- rvf_body.append(' m_validationMsgs.push_back(msgObj);')
- rvf_body.append('}\n')
- rvf_body.append('glv_replay::GLV_REPLAY_RESULT xglReplay::pop_validation_msgs()')
- rvf_body.append('{')
- rvf_body.append(' if (m_validationMsgs.size() == 0)')
- rvf_body.append(' return glv_replay::GLV_REPLAY_SUCCESS;')
- rvf_body.append(' m_validationMsgs.clear();')
- rvf_body.append(' return glv_replay::GLV_REPLAY_VALIDATION_ERROR;')
- rvf_body.append('}')
- rvf_body.append('int xglReplay::dump_validation_data()')
- rvf_body.append('{')
- rvf_body.append(' if (!m_pDSDump || !m_pCBDump)')
- rvf_body.append(' {')
- rvf_body.append(' return -1;')
- rvf_body.append(' }')
- rvf_body.append(' m_pDSDump((char *) "pipeline_dump.dot");')
- rvf_body.append(' m_pCBDump((char *) "cb_dump.dot");')
- rvf_body.append(' return 0;')
- rvf_body.append('}')
- return "\n".join(rvf_body)
-
def _generate_replay_init_funcs(self):
rif_body = []
rif_body.append('void xglFuncs::init_funcs(void * handle)\n{\n m_libHandle = handle;')
@@ -2452,918 +1434,197 @@
if t.strip('*').replace('const ', '') in remap_list and n not in param_exclude_list:
if '*' in t:
if 'const ' not in t:
- return 'remap(*pPacket->%s)' % (n)
+ return 'm_objMapper.remap(*pPacket->%s)' % (n)
else: # TODO : Don't remap array ptrs?
return 'pPacket->%s' % (n)
- return 'remap(pPacket->%s)' % (n)
+ return 'm_objMapper.remap(pPacket->%s)' % (n)
return 'pPacket->%s' % (n)
def _gen_replay_enum_gpus(self):
ieg_body = []
- ieg_body.append(' if (!m_display->m_initedXGL)')
- ieg_body.append(' {')
- ieg_body.append(' uint32_t gpuCount;')
- ieg_body.append(' XGL_PHYSICAL_GPU gpus[XGL_MAX_PHYSICAL_GPUS];')
- ieg_body.append(' uint32_t maxGpus = (pPacket->maxGpus < XGL_MAX_PHYSICAL_GPUS) ? pPacket->maxGpus : XGL_MAX_PHYSICAL_GPUS;')
- ieg_body.append(' replayResult = m_xglFuncs.real_xglEnumerateGpus(remap(pPacket->instance), maxGpus, &gpuCount, &gpus[0]);')
- ieg_body.append(' CHECK_RETURN_VALUE(xglEnumerateGpus);')
- ieg_body.append(' //TODO handle different number of gpus in trace versus replay')
- ieg_body.append(' if (gpuCount != *(pPacket->pGpuCount))')
- ieg_body.append(' {')
- ieg_body.append(' glv_LogWarn("number of gpus mismatched in replay %u versus trace %u\\n", gpuCount, *(pPacket->pGpuCount));')
- ieg_body.append(' }')
- ieg_body.append(' else if (gpuCount == 0)')
- ieg_body.append(' {')
- ieg_body.append(' glv_LogError("xglEnumerateGpus number of gpus is zero\\n");')
- ieg_body.append(' }')
- ieg_body.append(' else')
- ieg_body.append(' {')
- ieg_body.append(' glv_LogInfo("Enumerated %d GPUs in the system\\n", gpuCount);')
- ieg_body.append(' }')
- ieg_body.append(' // TODO handle enumeration results in a different order from trace to replay')
- ieg_body.append(' for (uint32_t i = 0; i < gpuCount; i++)')
- ieg_body.append(' {')
- ieg_body.append(' if (pPacket->pGpus)')
- ieg_body.append(' add_to_map(&(pPacket->pGpus[i]), &(gpus[i]));')
- ieg_body.append(' }')
- ieg_body.append(' }')
+ ieg_body.append(' returnValue = manually_handle_xglEnumerateGpus(pPacket);')
return "\n".join(ieg_body)
def _gen_replay_get_gpu_info(self):
ggi_body = []
- ggi_body.append(' if (!m_display->m_initedXGL)')
- ggi_body.append(' {')
- ggi_body.append(' switch (pPacket->infoType) {')
- ggi_body.append(' case XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES:')
- ggi_body.append(' {')
- ggi_body.append(' XGL_PHYSICAL_GPU_PROPERTIES gpuProps;')
- ggi_body.append(' size_t dataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);')
- ggi_body.append(' replayResult = m_xglFuncs.real_xglGetGpuInfo(remap(pPacket->gpu), pPacket->infoType, &dataSize,')
- ggi_body.append(' (pPacket->pData == NULL) ? NULL : &gpuProps);')
- ggi_body.append(' if (pPacket->pData != NULL)')
- ggi_body.append(' {')
- ggi_body.append(' glv_LogInfo("Replay Gpu Properties\\n");')
- ggi_body.append(' glv_LogInfo("Vendor ID %x, Device ID %x, name %s\\n",gpuProps.vendorId, gpuProps.deviceId, gpuProps.gpuName);')
- ggi_body.append(' glv_LogInfo("API version %u, Driver version %u, gpu Type %u\\n",gpuProps.apiVersion, gpuProps.driverVersion, gpuProps.gpuType);')
- ggi_body.append(' }')
- ggi_body.append(' break;')
- ggi_body.append(' }')
- ggi_body.append(' case XGL_INFO_TYPE_PHYSICAL_GPU_PERFORMANCE:')
- ggi_body.append(' {')
- ggi_body.append(' XGL_PHYSICAL_GPU_PERFORMANCE gpuPerfs;')
- ggi_body.append(' size_t dataSize = sizeof(XGL_PHYSICAL_GPU_PERFORMANCE);')
- ggi_body.append(' replayResult = m_xglFuncs.real_xglGetGpuInfo(remap(pPacket->gpu), pPacket->infoType, &dataSize,')
- ggi_body.append(' (pPacket->pData == NULL) ? NULL : &gpuPerfs);')
- ggi_body.append(' if (pPacket->pData != NULL)')
- ggi_body.append(' {')
- ggi_body.append(' glv_LogInfo("Replay Gpu Performance\\n");')
- ggi_body.append(' glv_LogInfo("Max GPU clock %f, max shader ALUs/clock %f, max texel fetches/clock %f\\n",gpuPerfs.maxGpuClock, gpuPerfs.aluPerClock, gpuPerfs.texPerClock);')
- ggi_body.append(' glv_LogInfo("Max primitives/clock %f, Max pixels/clock %f\\n",gpuPerfs.primsPerClock, gpuPerfs.pixelsPerClock);')
- ggi_body.append(' }')
- ggi_body.append(' break;')
- ggi_body.append(' }')
- ggi_body.append(' case XGL_INFO_TYPE_PHYSICAL_GPU_QUEUE_PROPERTIES:')
- ggi_body.append(' {')
- ggi_body.append(' XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *pGpuQueue, *pQ;')
- ggi_body.append(' size_t dataSize = sizeof(XGL_PHYSICAL_GPU_QUEUE_PROPERTIES);')
- ggi_body.append(' size_t numQueues = 1;')
- ggi_body.append(' assert(pPacket->pDataSize);')
- ggi_body.append(' if ((*(pPacket->pDataSize) % dataSize) != 0)')
- ggi_body.append(' glv_LogWarn("xglGetGpuInfo() for GPU_QUEUE_PROPERTIES not an integral data size assuming 1\\n");')
- ggi_body.append(' else')
- ggi_body.append(' numQueues = *(pPacket->pDataSize) / dataSize;')
- ggi_body.append(' dataSize = numQueues * dataSize;')
- ggi_body.append(' pQ = static_cast < XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *> (glv_malloc(dataSize));')
- ggi_body.append(' pGpuQueue = pQ;')
- ggi_body.append(' replayResult = m_xglFuncs.real_xglGetGpuInfo(remap(pPacket->gpu), pPacket->infoType, &dataSize,')
- ggi_body.append(' (pPacket->pData == NULL) ? NULL : pGpuQueue);')
- ggi_body.append(' if (pPacket->pData != NULL)')
- ggi_body.append(' {')
- ggi_body.append(' for (unsigned int i = 0; i < numQueues; i++)')
- ggi_body.append(' {')
- ggi_body.append(' glv_LogInfo("Replay Gpu Queue Property for index %d, flags %u\\n", i, pGpuQueue->queueFlags);')
- ggi_body.append(' glv_LogInfo("Max available count %u, max atomic counters %u, supports timestamps %u\\n",pGpuQueue->queueCount, pGpuQueue->maxAtomicCounters, pGpuQueue->supportsTimestamps);')
- ggi_body.append(' pGpuQueue++;')
- ggi_body.append(' }')
- ggi_body.append(' }')
- ggi_body.append(' glv_free(pQ);')
- ggi_body.append(' break;')
- ggi_body.append(' }')
- ggi_body.append(' default:')
- ggi_body.append(' {')
- ggi_body.append(' size_t size = 0;')
- ggi_body.append(' void* pData = NULL;')
- ggi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
- ggi_body.append(' {')
- ggi_body.append(' size = *pPacket->pDataSize;')
- ggi_body.append(' pData = glv_malloc(*pPacket->pDataSize);')
- ggi_body.append(' }')
- ggi_body.append(' replayResult = m_xglFuncs.real_xglGetGpuInfo(remap(pPacket->gpu), pPacket->infoType, &size, pData);')
- ggi_body.append(' if (replayResult == XGL_SUCCESS)')
- ggi_body.append(' {')
- ggi_body.append(' if (size != *pPacket->pDataSize && pData != NULL)')
- ggi_body.append(' {')
- ggi_body.append(' glv_LogWarn("xglGetGpuInfo returned a differing data size: replay (%d bytes) vs trace (%d bytes)\\n", size, *pPacket->pDataSize);')
- ggi_body.append(' }')
- ggi_body.append(' else if (pData != NULL && memcmp(pData, pPacket->pData, size) != 0)')
- ggi_body.append(' {')
- ggi_body.append(' glv_LogWarn("xglGetGpuInfo returned differing data contents than the trace file contained.\\n");')
- ggi_body.append(' }')
- ggi_body.append(' }')
- ggi_body.append(' glv_free(pData);')
- ggi_body.append(' break;')
- ggi_body.append(' }')
- ggi_body.append(' };')
- ggi_body.append(' CHECK_RETURN_VALUE(xglGetGpuInfo);')
- ggi_body.append(' }')
+ ggi_body.append(' returnValue = manually_handle_xglGetGpuInfo(pPacket);')
return "\n".join(ggi_body)
def _gen_replay_create_device(self):
cd_body = []
- cd_body.append(' if (!m_display->m_initedXGL)')
- cd_body.append(' {')
- cd_body.append(' XGL_DEVICE device;')
- cd_body.append(' if (g_xglReplaySettings.debugLevel > 0)')
- cd_body.append(' {')
- cd_body.append(' XGL_DEVICE_CREATE_INFO cInfo, *ci, *pCreateInfoSaved;')
- cd_body.append(' unsigned int numLayers = 0;')
- cd_body.append(' char ** layersStr = get_enableLayers_list(&numLayers);')
- cd_body.append(' apply_layerSettings_overrides();')
- cd_body.append(' XGL_LAYER_CREATE_INFO layerInfo;')
- cd_body.append(' pCreateInfoSaved = (XGL_DEVICE_CREATE_INFO *) pPacket->pCreateInfo;')
- cd_body.append(' ci = (XGL_DEVICE_CREATE_INFO *) pPacket->pCreateInfo;')
-
- cd_body.append(' if (layersStr != NULL && numLayers > 0)')
- cd_body.append(' {')
- cd_body.append(' while (ci->pNext != NULL)')
- cd_body.append(' ci = (XGL_DEVICE_CREATE_INFO *) ci->pNext;')
- cd_body.append(' ci->pNext = &layerInfo;')
- cd_body.append(' layerInfo.sType = XGL_STRUCTURE_TYPE_LAYER_CREATE_INFO;')
- cd_body.append(' layerInfo.pNext = 0;')
- cd_body.append(' layerInfo.layerCount = numLayers;')
- cd_body.append(' layerInfo.ppActiveLayerNames = layersStr;')
- cd_body.append(' }')
-
- cd_body.append(' memcpy(&cInfo, pPacket->pCreateInfo, sizeof(XGL_DEVICE_CREATE_INFO));')
- cd_body.append(' cInfo.flags = pPacket->pCreateInfo->flags | XGL_DEVICE_CREATE_VALIDATION_BIT;')
- cd_body.append(' cInfo.maxValidationLevel = (XGL_VALIDATION_LEVEL)((g_xglReplaySettings.debugLevel <= 4) ? (unsigned int) XGL_VALIDATION_LEVEL_0 + g_xglReplaySettings.debugLevel : (unsigned int) XGL_VALIDATION_LEVEL_0);')
- cd_body.append(' pPacket->pCreateInfo = &cInfo;')
- cd_body.append(' replayResult = m_xglFuncs.real_xglCreateDevice(remap(pPacket->gpu), pPacket->pCreateInfo, &device);')
- cd_body.append(' // restore the packet for next replay')
- cd_body.append(' ci->pNext = NULL;')
- cd_body.append(' pPacket->pCreateInfo = pCreateInfoSaved;')
- cd_body.append(' release_enableLayer_list(layersStr);')
- cd_body.append(' if (xglDbgRegisterMsgCallback(g_fpDbgMsgCallback, NULL) != XGL_SUCCESS)')
- cd_body.append(' glv_LogError("Failed to register xgl callback for replayer error handling\\n");')
- cd_body.append('#if !defined(_WIN32)')
- cd_body.append(' m_pDSDump = (DRAW_STATE_DUMP_DOT_FILE) m_xglFuncs.real_xglGetProcAddr(remap(pPacket->gpu), "drawStateDumpDotFile");')
- cd_body.append(' m_pCBDump = (DRAW_STATE_DUMP_COMMAND_BUFFER_DOT_FILE) m_xglFuncs.real_xglGetProcAddr(remap(pPacket->gpu), "drawStateDumpCommandBufferDotFile");')
- cd_body.append('#endif')
- cd_body.append(' }')
- cd_body.append(' else ')
- cd_body.append(' replayResult = m_xglFuncs.real_xglCreateDevice(remap(pPacket->gpu), pPacket->pCreateInfo, &device);')
- cd_body.append(' CHECK_RETURN_VALUE(xglCreateDevice);')
- cd_body.append(' if (replayResult == XGL_SUCCESS)')
- cd_body.append(' {')
- cd_body.append(' add_to_map(pPacket->pDevice, &device);')
- cd_body.append(' }')
- cd_body.append(' }')
+ cd_body.append(' returnValue = manually_handle_xglCreateDevice(pPacket);')
return "\n".join(cd_body)
def _gen_replay_get_extension_support(self):
ges_body = []
- ges_body.append(' if (!m_display->m_initedXGL) {')
- ges_body.append(' replayResult = m_xglFuncs.real_xglGetExtensionSupport(remap(pPacket->gpu), pPacket->pExtName);')
- ges_body.append(' CHECK_RETURN_VALUE(xglGetExtensionSupport);')
- ges_body.append(' if (replayResult == XGL_SUCCESS) {')
- ges_body.append(' for (unsigned int ext = 0; ext < sizeof(g_extensions) / sizeof(g_extensions[0]); ext++)')
- ges_body.append(' {')
- ges_body.append(' if (!strncmp(g_extensions[ext], pPacket->pExtName, strlen(g_extensions[ext]))) {')
- ges_body.append(' bool extInList = false;')
- ges_body.append(' for (unsigned int j = 0; j < m_display->m_extensions.size(); ++j) {')
- ges_body.append(' if (!strncmp(m_display->m_extensions[j], g_extensions[ext], strlen(g_extensions[ext])))')
- ges_body.append(' extInList = true;')
- ges_body.append(' break;')
- ges_body.append(' }')
- ges_body.append(' if (!extInList)')
- ges_body.append(' m_display->m_extensions.push_back((char *) g_extensions[ext]);')
- ges_body.append(' break;')
- ges_body.append(' }')
- ges_body.append(' }')
- ges_body.append(' }')
- ges_body.append(' }')
+ ges_body.append(' returnValue = manually_handle_xglGetExtensionSupport(pPacket);')
return "\n".join(ges_body)
def _gen_replay_queue_submit(self):
qs_body = []
- qs_body.append(' XGL_CMD_BUFFER *remappedBuffers = NULL;')
- qs_body.append(' if (pPacket->pCmdBuffers != NULL)')
- qs_body.append(' {')
- qs_body.append(' remappedBuffers = GLV_NEW_ARRAY( XGL_CMD_BUFFER, pPacket->cmdBufferCount);')
- qs_body.append(' for (uint32_t i = 0; i < pPacket->cmdBufferCount; i++)')
- qs_body.append(' {')
- qs_body.append(' *(remappedBuffers + i) = remap(*(pPacket->pCmdBuffers + i));')
- qs_body.append(' }')
- qs_body.append(' }')
- qs_body.append(' XGL_MEMORY_REF* memRefs = NULL;')
- qs_body.append(' if (pPacket->pMemRefs != NULL)')
- qs_body.append(' {')
- qs_body.append(' memRefs = GLV_NEW_ARRAY(XGL_MEMORY_REF, pPacket->memRefCount);')
- qs_body.append(' memcpy(memRefs, pPacket->pMemRefs, sizeof(XGL_MEMORY_REF) * pPacket->memRefCount);')
- qs_body.append(' for (uint32_t i = 0; i < pPacket->memRefCount; i++)')
- qs_body.append(' {')
- qs_body.append(' memRefs[i].mem = remap(pPacket->pMemRefs[i].mem);')
- qs_body.append(' }')
- qs_body.append(' }')
- qs_body.append(' replayResult = m_xglFuncs.real_xglQueueSubmit(remap(pPacket->queue), pPacket->cmdBufferCount, remappedBuffers, pPacket->memRefCount,')
- qs_body.append(' memRefs, remap(pPacket->fence));')
- qs_body.append(' GLV_DELETE(remappedBuffers);')
- qs_body.append(' GLV_DELETE(memRefs);')
+ qs_body.append(' returnValue = manually_handle_xglQueueSubmit(pPacket);')
return "\n".join(qs_body)
def _gen_replay_get_object_info(self):
goi_body = []
- goi_body.append(' size_t size = 0;')
- goi_body.append(' void* pData = NULL;')
- goi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
- goi_body.append(' {')
- goi_body.append(' size = *pPacket->pDataSize;')
- goi_body.append(' pData = glv_malloc(*pPacket->pDataSize);')
- goi_body.append(' memcpy(pData, pPacket->pData, *pPacket->pDataSize);')
- goi_body.append(' }')
- goi_body.append(' // TODO only search for object once rather than at remap() and init_objMemXXX()')
- goi_body.append(' replayResult = m_xglFuncs.real_xglGetObjectInfo(remap(pPacket->object), pPacket->infoType, &size, pData);')
- goi_body.append(' if (replayResult == XGL_SUCCESS)')
- goi_body.append(' {')
- goi_body.append(' if (size != *pPacket->pDataSize && pData != NULL)')
- goi_body.append(' {')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo returned a differing data size: replay (%d bytes) vs trace (%d bytes)\\n", size, *pPacket->pDataSize);')
- goi_body.append(' } else if (pData != NULL)')
- goi_body.append(' {')
- goi_body.append(' switch (pPacket->infoType)')
- goi_body.append(' {')
- goi_body.append(' case XGL_INFO_TYPE_MEMORY_ALLOCATION_COUNT:')
- goi_body.append(' {')
- goi_body.append(' uint32_t traceCount = *((uint32_t *) pPacket->pData);')
- goi_body.append(' uint32_t replayCount = *((uint32_t *) pData);')
- goi_body.append(' if (traceCount != replayCount)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo(INFO_TYPE_MEMORY_ALLOCATION_COUNT) mismatch: trace count %u, replay count %u\\n", traceCount, replayCount);')
- goi_body.append(' if (m_adjustForGPU)')
- goi_body.append(' init_objMemCount(pPacket->object, replayCount);')
- goi_body.append(' break;')
- goi_body.append(' }')
- goi_body.append(' case XGL_INFO_TYPE_MEMORY_REQUIREMENTS:')
- goi_body.append(' {')
- goi_body.append(' XGL_MEMORY_REQUIREMENTS *traceReqs = (XGL_MEMORY_REQUIREMENTS *) pPacket->pData;')
- goi_body.append(' XGL_MEMORY_REQUIREMENTS *replayReqs = (XGL_MEMORY_REQUIREMENTS *) pData;')
- goi_body.append(' unsigned int num = size / sizeof(XGL_MEMORY_REQUIREMENTS);')
- goi_body.append(' for (unsigned int i = 0; i < num; i++)')
- goi_body.append(' {')
- goi_body.append(' if (traceReqs->size != replayReqs->size)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo(INFO_TYPE_MEMORY_REQUIREMENTS) mismatch: trace size %u, replay size %u\\n", traceReqs->size, replayReqs->size);')
- goi_body.append(' if (traceReqs->alignment != replayReqs->alignment)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo(INFO_TYPE_MEMORY_REQUIREMENTS) mismatch: trace alignment %u, replay aligmnent %u\\n", traceReqs->alignment, replayReqs->alignment);')
- goi_body.append(' if (traceReqs->granularity != replayReqs->granularity)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo(INFO_TYPE_MEMORY_REQUIREMENTS) mismatch: trace granularity %u, replay granularity %u\\n", traceReqs->granularity, replayReqs->granularity);')
- goi_body.append(' if (traceReqs->memProps != replayReqs->memProps)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo(INFO_TYPE_MEMORY_REQUIREMENTS) mismatch: trace memProps %u, replay memProps %u\\n", traceReqs->memProps, replayReqs->memProps);')
- goi_body.append(' if (traceReqs->memType != replayReqs->memType)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo(INFO_TYPE_MEMORY_REQUIREMENTS) mismatch: trace memType %u, replay memType %u\\n", traceReqs->memType, replayReqs->memType);')
- goi_body.append(' traceReqs++;')
- goi_body.append(' replayReqs++;')
- goi_body.append(' }')
- goi_body.append(' if (m_adjustForGPU)')
- goi_body.append(' init_objMemReqs(pPacket->object, replayReqs - num, num);')
- goi_body.append(' break;')
- goi_body.append(' }')
- goi_body.append(' default:')
- goi_body.append(' if (memcmp(pData, pPacket->pData, size) != 0)')
- goi_body.append(' glv_LogWarn("xglGetObjectInfo() mismatch on *pData: between trace and replay *pDataSize %u\\n", size);')
- goi_body.append(' }')
- goi_body.append(' }')
- goi_body.append(' }')
- goi_body.append(' glv_free(pData);')
+ goi_body.append(' returnValue = manually_handle_xglGetObjectInfo(pPacket);')
return "\n".join(goi_body)
def _gen_replay_get_format_info(self):
gfi_body = []
- gfi_body.append(' size_t size = 0;')
- gfi_body.append(' void* pData = NULL;')
- gfi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
- gfi_body.append(' {')
- gfi_body.append(' size = *pPacket->pDataSize;')
- gfi_body.append(' pData = glv_malloc(*pPacket->pDataSize);')
- gfi_body.append(' }')
- gfi_body.append(' replayResult = m_xglFuncs.real_xglGetFormatInfo(remap(pPacket->device), pPacket->format, pPacket->infoType, &size, pData);')
- gfi_body.append(' if (replayResult == XGL_SUCCESS)')
- gfi_body.append(' {')
- gfi_body.append(' if (size != *pPacket->pDataSize && pData != NULL)')
- gfi_body.append(' {')
- gfi_body.append(' glv_LogWarn("xglGetFormatInfo returned a differing data size: replay (%d bytes) vs trace (%d bytes)\\n", size, *pPacket->pDataSize);')
- gfi_body.append(' }')
- gfi_body.append(' else if (pData != NULL && memcmp(pData, pPacket->pData, size) != 0)')
- gfi_body.append(' {')
- gfi_body.append(' glv_LogWarn("xglGetFormatInfo returned differing data contents than the trace file contained.\\n");')
- gfi_body.append(' }')
- gfi_body.append(' }')
- gfi_body.append(' glv_free(pData);')
+ gfi_body.append(' returnValue = manually_handle_xglGetFormatInfo(pPacket);')
return "\n".join(gfi_body)
def _gen_replay_create_image(self):
ci_body = []
- ci_body.append(' struct imageObj local_imageObj;')
- ci_body.append(' replayResult = m_xglFuncs.real_xglCreateImage(remap(pPacket->device), pPacket->pCreateInfo, &local_imageObj.replayImage);')
+ 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(' {')
- ci_body.append(' add_to_map(pPacket->pImage, &local_imageObj);')
+ ci_body.append(' m_objMapper.add_to_map(pPacket->pImage, &local_imageObj);')
ci_body.append(' }')
return "\n".join(ci_body)
def _gen_replay_create_buffer(self):
cb_body = []
- cb_body.append(' struct bufferObj local_bufferObj;')
- cb_body.append(' replayResult = m_xglFuncs.real_xglCreateBuffer(remap(pPacket->device), pPacket->pCreateInfo, &local_bufferObj.replayBuffer);')
+ 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(' {')
- cb_body.append(' add_to_map(pPacket->pBuffer, &local_bufferObj);')
+ cb_body.append(' m_objMapper.add_to_map(pPacket->pBuffer, &local_bufferObj);')
cb_body.append(' }')
return "\n".join(cb_body)
def _gen_replay_get_image_subresource_info(self):
isi_body = []
- isi_body.append(' size_t size = 0;')
- isi_body.append(' void* pData = NULL;')
- isi_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
- isi_body.append(' {')
- isi_body.append(' size = *pPacket->pDataSize;')
- isi_body.append(' pData = glv_malloc(*pPacket->pDataSize);')
- isi_body.append(' }')
- isi_body.append(' replayResult = m_xglFuncs.real_xglGetImageSubresourceInfo(remap(pPacket->image), pPacket->pSubresource, pPacket->infoType, &size, pData);')
- isi_body.append(' if (replayResult == XGL_SUCCESS)')
- isi_body.append(' {')
- isi_body.append(' if (size != *pPacket->pDataSize && pData != NULL)')
- isi_body.append(' {')
- isi_body.append(' glv_LogWarn("xglGetImageSubresourceInfo returned a differing data size: replay (%d bytes) vs trace (%d bytes)\\n", size, *pPacket->pDataSize);')
- isi_body.append(' }')
- isi_body.append(' else if (pData != NULL && memcmp(pData, pPacket->pData, size) != 0)')
- isi_body.append(' {')
- isi_body.append(' glv_LogWarn("xglGetImageSubresourceInfo returned differing data contents than the trace file contained.\\n");')
- isi_body.append(' }')
- isi_body.append(' }')
- isi_body.append(' glv_free(pData);')
+ isi_body.append(' returnValue = manually_handle_xglGetImageSubresourceInfo(pPacket);')
return "\n".join(isi_body)
def _gen_replay_update_descriptors(self):
ud_body = []
- # We have to remap handles internal to the structures so save the handles prior to remap and then restore
- # Rather than doing a deep memcpy of the entire struct and fixing any intermediate pointers, do save and restores via STL queue
- ud_body.append(' XGL_UPDATE_SAMPLERS* pUpdateChain = (XGL_UPDATE_SAMPLERS*)pPacket->pUpdateChain;')
- ud_body.append(' std::queue<XGL_SAMPLER> saveSamplers;')
- ud_body.append(' std::queue<XGL_BUFFER_VIEW> saveBufferViews;')
- ud_body.append(' std::queue<XGL_IMAGE_VIEW> saveImageViews;')
- ud_body.append(' std::queue<XGL_DESCRIPTOR_SET> saveDescSets;')
- ud_body.append(' while (pUpdateChain) {')
- ud_body.append(' switch(pUpdateChain->sType)')
- ud_body.append(' {')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:')
- ud_body.append(' for (uint32_t i = 0; i < ((XGL_UPDATE_SAMPLERS*)pUpdateChain)->count; i++) {')
- ud_body.append(' XGL_SAMPLER* pLocalSampler = (XGL_SAMPLER*) &((XGL_UPDATE_SAMPLERS*)pUpdateChain)->pSamplers[i];')
- ud_body.append(' saveSamplers.push(*pLocalSampler);')
- ud_body.append(' *pLocalSampler = remap(((XGL_UPDATE_SAMPLERS*)pUpdateChain)->pSamplers[i]);')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:')
- ud_body.append(' {')
- ud_body.append(' XGL_UPDATE_SAMPLER_TEXTURES *pUST = (XGL_UPDATE_SAMPLER_TEXTURES *) pUpdateChain;')
- ud_body.append(' for (uint32_t i = 0; i < pUST->count; i++) {')
- ud_body.append(' XGL_SAMPLER *pLocalSampler = (XGL_SAMPLER *) &pUST->pSamplerImageViews[i].pSampler;')
- ud_body.append(' saveSamplers.push(*pLocalSampler);')
- ud_body.append(' *pLocalSampler = remap(pUST->pSamplerImageViews[i].pSampler);')
- ud_body.append(' XGL_IMAGE_VIEW *pLocalView = (XGL_IMAGE_VIEW *) &pUST->pSamplerImageViews[i].pImageView->view;')
- ud_body.append(' saveImageViews.push(*pLocalView);')
- ud_body.append(' *pLocalView = remap(pUST->pSamplerImageViews[i].pImageView->view);')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:')
- ud_body.append(' {')
- ud_body.append(' XGL_UPDATE_IMAGES *pUI = (XGL_UPDATE_IMAGES*) pUpdateChain;')
- ud_body.append(' for (uint32_t i = 0; i < pUI->count; i++) {')
- ud_body.append(' XGL_IMAGE_VIEW* pLocalView = (XGL_IMAGE_VIEW*) &pUI->pImageViews[i]->view;')
- ud_body.append(' saveImageViews.push(*pLocalView);')
- ud_body.append(' *pLocalView = remap(pUI->pImageViews[i]->view);')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:')
- ud_body.append(' {')
- ud_body.append(' XGL_UPDATE_BUFFERS *pUB = (XGL_UPDATE_BUFFERS *) pUpdateChain;')
- ud_body.append(' for (uint32_t i = 0; i < pUB->count; i++) {')
- ud_body.append(' XGL_BUFFER_VIEW* pLocalView = (XGL_BUFFER_VIEW*) &pUB->pBufferViews[i]->view;')
- ud_body.append(' saveBufferViews.push(*pLocalView);')
- ud_body.append(' *pLocalView = remap(pUB->pBufferViews[i]->view);')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:')
- ud_body.append(' saveDescSets.push(((XGL_UPDATE_AS_COPY*)pUpdateChain)->descriptorSet);')
- ud_body.append(' ((XGL_UPDATE_AS_COPY*)pUpdateChain)->descriptorSet = remap(((XGL_UPDATE_AS_COPY*)pUpdateChain)->descriptorSet);')
- ud_body.append(' break;')
- ud_body.append(' default:')
- ud_body.append(' assert(0);')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' pUpdateChain = (XGL_UPDATE_SAMPLERS*) pUpdateChain->pNext;')
- ud_body.append(' }')
- ud_body.append(' m_xglFuncs.real_xglUpdateDescriptors(remap(pPacket->descriptorSet), pPacket->pUpdateChain);')
- ud_body.append(' pUpdateChain = (XGL_UPDATE_SAMPLERS*) pPacket->pUpdateChain;')
- ud_body.append(' while (pUpdateChain) {')
- ud_body.append(' switch(pUpdateChain->sType)')
- ud_body.append(' {')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLERS:')
- ud_body.append(' for (uint32_t i = 0; i < ((XGL_UPDATE_SAMPLERS*)pUpdateChain)->count; i++) {')
- ud_body.append(' XGL_SAMPLER* pLocalSampler = (XGL_SAMPLER*) &((XGL_UPDATE_SAMPLERS*)pUpdateChain)->pSamplers[i];')
- ud_body.append(' *pLocalSampler = saveSamplers.front();')
- ud_body.append(' saveSamplers.pop();')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES:')
- ud_body.append(' {')
- ud_body.append(' XGL_UPDATE_SAMPLER_TEXTURES *pUST = (XGL_UPDATE_SAMPLER_TEXTURES *) pUpdateChain;')
- ud_body.append(' for (uint32_t i = 0; i < pUST->count; i++) {')
- ud_body.append(' XGL_SAMPLER *plocalSampler = (XGL_SAMPLER *) &pUST->pSamplerImageViews[i].pSampler;')
- ud_body.append(' *plocalSampler = saveSamplers.front();')
- ud_body.append(' saveSamplers.pop();')
- ud_body.append(' XGL_IMAGE_VIEW *pLocalView = (XGL_IMAGE_VIEW *) &pUST->pSamplerImageViews[i].pImageView->view;')
- ud_body.append(' *pLocalView = saveImageViews.front();')
- ud_body.append(' saveImageViews.pop();')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_IMAGES:')
- ud_body.append(' {')
- ud_body.append(' XGL_UPDATE_IMAGES *pUI = (XGL_UPDATE_IMAGES*) pUpdateChain;')
- ud_body.append(' for (uint32_t i = 0; i < pUI->count; i++) {')
- ud_body.append(' XGL_IMAGE_VIEW* pLocalView = (XGL_IMAGE_VIEW*) &pUI->pImageViews[i]->view;')
- ud_body.append(' *pLocalView = saveImageViews.front();')
- ud_body.append(' saveImageViews.pop();')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_BUFFERS:')
- ud_body.append(' {')
- ud_body.append(' XGL_UPDATE_BUFFERS *pUB = (XGL_UPDATE_BUFFERS *) pUpdateChain;')
- ud_body.append(' for (uint32_t i = 0; i < pUB->count; i++) {')
- ud_body.append(' XGL_BUFFER_VIEW* pLocalView = (XGL_BUFFER_VIEW*) &pUB->pBufferViews[i]->view;')
- ud_body.append(' *pLocalView = saveBufferViews.front();')
- ud_body.append(' saveBufferViews.pop();')
- ud_body.append(' }')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' case XGL_STRUCTURE_TYPE_UPDATE_AS_COPY:')
- ud_body.append(' ((XGL_UPDATE_AS_COPY*)pUpdateChain)->descriptorSet = saveDescSets.front();')
- ud_body.append(' saveDescSets.pop();')
- ud_body.append(' //pFreeMe = (XGL_UPDATE_SAMPLERS*)pLocalUpdateChain;')
- ud_body.append(' //pLocalUpdateChain = (void*)((XGL_UPDATE_SAMPLERS*)pLocalUpdateChain)->pNext;')
- ud_body.append(' //free(pFreeMe);')
- ud_body.append(' break;')
- ud_body.append(' default:')
- ud_body.append(' assert(0);')
- ud_body.append(' break;')
- ud_body.append(' }')
- ud_body.append(' pUpdateChain = (XGL_UPDATE_SAMPLERS*) pUpdateChain->pNext;')
- ud_body.append(' }')
+ ud_body.append(' returnValue = manually_handle_xglUpdateDescriptors(pPacket);')
return "\n".join(ud_body)
def _gen_replay_create_descriptor_set_layout(self):
cdsl_body = []
- cdsl_body.append(' XGL_SAMPLER saveSampler;')
- cdsl_body.append(' if (pPacket->pSetLayoutInfoList != NULL) {')
- cdsl_body.append(' XGL_SAMPLER *pSampler = (XGL_SAMPLER *) &pPacket->pSetLayoutInfoList->immutableSampler;')
- cdsl_body.append(' saveSampler = pPacket->pSetLayoutInfoList->immutableSampler;')
- cdsl_body.append(' *pSampler = remap(saveSampler);')
- cdsl_body.append(' }')
- cdsl_body.append(' XGL_DESCRIPTOR_SET_LAYOUT setLayout;')
- cdsl_body.append(' replayResult = m_xglFuncs.real_xglCreateDescriptorSetLayout(remap(pPacket->device), pPacket->stageFlags, pPacket->pSetBindPoints, remap(pPacket->priorSetLayout), pPacket->pSetLayoutInfoList, &setLayout);')
- cdsl_body.append(' if (replayResult == XGL_SUCCESS)')
- cdsl_body.append(' {')
- cdsl_body.append(' add_to_map(pPacket->pSetLayout, &setLayout);')
- cdsl_body.append(' }')
- cdsl_body.append(' if (pPacket->pSetLayoutInfoList != NULL) {')
- cdsl_body.append(' XGL_SAMPLER *pSampler = (XGL_SAMPLER *) &pPacket->pSetLayoutInfoList->immutableSampler;')
- cdsl_body.append(' *pSampler = saveSampler;')
- cdsl_body.append(' }')
+ cdsl_body.append(' returnValue = manually_handle_xglCreateDescriptorSetLayout(pPacket);')
return "\n".join(cdsl_body)
def _gen_replay_create_graphics_pipeline(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.lastSetLayout = remap(createInfo.lastSetLayout);')
- 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 = 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_xglCreateGraphicsPipeline(remap(pPacket->device), &createInfo, &pipeline);')
- cgp_body.append(' if (replayResult == XGL_SUCCESS)')
- cgp_body.append(' {')
- cgp_body.append(' 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_xglCreateGraphicsPipeline(pPacket);')
return "\n".join(cgp_body)
def _gen_replay_cmd_wait_events(self):
cwe_body = []
- cwe_body.append(' XGL_EVENT saveEvent[100];')
- cwe_body.append(' uint32_t idx, numRemapBuf=0, numRemapImg=0;')
- cwe_body.append(' assert(pPacket->pWaitInfo && pPacket->pWaitInfo->eventCount <= 100);')
- cwe_body.append(' for (idx = 0; idx < pPacket->pWaitInfo->eventCount; idx++)')
- cwe_body.append(' {')
- cwe_body.append(' XGL_EVENT *pEvent = (XGL_EVENT *) &(pPacket->pWaitInfo->pEvents[idx]);')
- cwe_body.append(' saveEvent[idx] = pPacket->pWaitInfo->pEvents[idx];')
- cwe_body.append(' *pEvent = remap(pPacket->pWaitInfo->pEvents[idx]);')
- cwe_body.append(' }')
- cwe_body.append('')
- cwe_body.append(' XGL_BUFFER saveBuf[100];')
- cwe_body.append(' XGL_IMAGE saveImg[100];')
- cwe_body.append(' for (idx = 0; idx < pPacket->pWaitInfo->memBarrierCount; idx++)')
- cwe_body.append(' {')
- cwe_body.append(' XGL_MEMORY_BARRIER *pNext = (XGL_MEMORY_BARRIER *) pPacket->pWaitInfo->ppMemBarriers[idx];')
- cwe_body.append(' assert(pNext);')
- cwe_body.append(' if (pNext->sType == XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER) {')
- cwe_body.append(' XGL_BUFFER_MEMORY_BARRIER *pNextBuf = (XGL_BUFFER_MEMORY_BARRIER *) pPacket->pWaitInfo->ppMemBarriers[idx];')
- cwe_body.append(' assert(numRemapBuf < 100);')
- cwe_body.append(' saveBuf[numRemapBuf++] = pNextBuf->buffer;')
- cwe_body.append(' pNextBuf->buffer = remap(pNextBuf->buffer);')
- cwe_body.append(' } else if (pNext->sType == XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) {')
- cwe_body.append(' XGL_IMAGE_MEMORY_BARRIER *pNextImg = (XGL_IMAGE_MEMORY_BARRIER *) pPacket->pWaitInfo->ppMemBarriers[idx];')
- cwe_body.append(' assert(numRemapImg < 100);')
- cwe_body.append(' saveImg[numRemapImg++] = pNextImg->image;')
- cwe_body.append(' pNextImg->image = remap(pNextImg->image);')
- cwe_body.append(' }')
- cwe_body.append(' }')
- cwe_body.append(' m_xglFuncs.real_xglCmdWaitEvents(remap(pPacket->cmdBuffer), pPacket->pWaitInfo);')
- cwe_body.append(' for (idx = 0; idx < pPacket->pWaitInfo->memBarrierCount; idx++) {')
- cwe_body.append(' XGL_MEMORY_BARRIER *pNext = (XGL_MEMORY_BARRIER *) pPacket->pWaitInfo->ppMemBarriers[idx];')
- cwe_body.append(' if (pNext->sType == XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER) {')
- cwe_body.append(' XGL_BUFFER_MEMORY_BARRIER *pNextBuf = (XGL_BUFFER_MEMORY_BARRIER *) pPacket->pWaitInfo->ppMemBarriers[idx];')
- cwe_body.append(' pNextBuf->buffer = saveBuf[idx];')
- cwe_body.append(' } else if (pNext->sType == XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) {')
- cwe_body.append(' XGL_IMAGE_MEMORY_BARRIER *pNextImg = (XGL_IMAGE_MEMORY_BARRIER *) pPacket->pWaitInfo->ppMemBarriers[idx];')
- cwe_body.append(' pNextImg->image = saveImg[idx];')
- cwe_body.append(' }')
- cwe_body.append(' }')
- cwe_body.append(' for (idx = 0; idx < pPacket->pWaitInfo->eventCount; idx++) {')
- cwe_body.append(' XGL_EVENT *pEvent = (XGL_EVENT *) &(pPacket->pWaitInfo->pEvents[idx]);')
- cwe_body.append(' *pEvent = saveEvent[idx];')
- cwe_body.append(' }')
+ cwe_body.append(' returnValue = manually_handle_xglCmdWaitEvents(pPacket);')
return "\n".join(cwe_body)
def _gen_replay_cmd_pipeline_barrier(self):
cpb_body = []
- cpb_body.append(' uint32_t idx, numRemapBuf=0, numRemapImg=0;')
- cpb_body.append(' XGL_BUFFER saveBuf[100];')
- cpb_body.append(' XGL_IMAGE saveImg[100];')
- cpb_body.append(' for (idx = 0; idx < pPacket->pBarrier->memBarrierCount; idx++)')
- cpb_body.append(' {')
- cpb_body.append(' XGL_MEMORY_BARRIER *pNext = (XGL_MEMORY_BARRIER *) pPacket->pBarrier->ppMemBarriers[idx];')
- cpb_body.append(' assert(pNext);')
- cpb_body.append(' if (pNext->sType == XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER) {')
- cpb_body.append(' XGL_BUFFER_MEMORY_BARRIER *pNextBuf = (XGL_BUFFER_MEMORY_BARRIER *) pPacket->pBarrier->ppMemBarriers[idx];')
- cpb_body.append(' assert(numRemapBuf < 100);')
- cpb_body.append(' saveBuf[numRemapBuf++] = pNextBuf->buffer;')
- cpb_body.append(' pNextBuf->buffer = remap(pNextBuf->buffer);')
- cpb_body.append(' } else if (pNext->sType == XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) {')
- cpb_body.append(' XGL_IMAGE_MEMORY_BARRIER *pNextImg = (XGL_IMAGE_MEMORY_BARRIER *) pPacket->pBarrier->ppMemBarriers[idx];')
- cpb_body.append(' assert(numRemapImg < 100);')
- cpb_body.append(' saveImg[numRemapImg++] = pNextImg->image;')
- cpb_body.append(' pNextImg->image = remap(pNextImg->image);')
- cpb_body.append(' }')
- cpb_body.append(' }')
- cpb_body.append(' m_xglFuncs.real_xglCmdPipelineBarrier(remap(pPacket->cmdBuffer), pPacket->pBarrier);')
- cpb_body.append(' for (idx = 0; idx < pPacket->pBarrier->memBarrierCount; idx++) {')
- cpb_body.append(' XGL_MEMORY_BARRIER *pNext = (XGL_MEMORY_BARRIER *) pPacket->pBarrier->ppMemBarriers[idx];')
- cpb_body.append(' if (pNext->sType == XGL_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER) {')
- cpb_body.append(' XGL_BUFFER_MEMORY_BARRIER *pNextBuf = (XGL_BUFFER_MEMORY_BARRIER *) pPacket->pBarrier->ppMemBarriers[idx];')
- cpb_body.append(' pNextBuf->buffer = saveBuf[idx];')
- cpb_body.append(' } else if (pNext->sType == XGL_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) {')
- cpb_body.append(' XGL_IMAGE_MEMORY_BARRIER *pNextImg = (XGL_IMAGE_MEMORY_BARRIER *) pPacket->pBarrier->ppMemBarriers[idx];')
- cpb_body.append(' pNextImg->image = saveImg[idx];')
- cpb_body.append(' }')
- cpb_body.append(' }')
+ cpb_body.append(' returnValue = manually_handle_xglCmdPipelineBarrier(pPacket);')
return "\n".join(cpb_body)
def _gen_replay_create_framebuffer(self):
cf_body = []
- cf_body.append(' XGL_FRAMEBUFFER_CREATE_INFO *pInfo = (XGL_FRAMEBUFFER_CREATE_INFO *) pPacket->pCreateInfo;')
- cf_body.append(' XGL_COLOR_ATTACHMENT_BIND_INFO *pColorAttachments, *pSavedColor = (XGL_COLOR_ATTACHMENT_BIND_INFO*)pInfo->pColorAttachments;')
- cf_body.append(' bool allocatedColorAttachments = false;')
- cf_body.append(' if (pSavedColor != NULL)')
- cf_body.append(' {')
- cf_body.append(' allocatedColorAttachments = true;')
- cf_body.append(' pColorAttachments = GLV_NEW_ARRAY(XGL_COLOR_ATTACHMENT_BIND_INFO, pInfo->colorAttachmentCount);')
- cf_body.append(' memcpy(pColorAttachments, pSavedColor, sizeof(XGL_COLOR_ATTACHMENT_BIND_INFO) * pInfo->colorAttachmentCount);')
- cf_body.append(' for (uint32_t i = 0; i < pInfo->colorAttachmentCount; i++)')
- cf_body.append(' {')
- cf_body.append(' pColorAttachments[i].view = remap(pInfo->pColorAttachments[i].view);')
- cf_body.append(' }')
- cf_body.append(' pInfo->pColorAttachments = pColorAttachments;')
- cf_body.append(' }')
- cf_body.append(' // remap depth stencil target')
- cf_body.append(' const XGL_DEPTH_STENCIL_BIND_INFO *pSavedDS = pInfo->pDepthStencilAttachment;')
- cf_body.append(' XGL_DEPTH_STENCIL_BIND_INFO depthTarget;')
- cf_body.append(' if (pSavedDS != NULL)')
- cf_body.append(' {')
- cf_body.append(' memcpy(&depthTarget, pSavedDS, sizeof(XGL_DEPTH_STENCIL_BIND_INFO));')
- cf_body.append(' depthTarget.view = remap(pSavedDS->view);')
- cf_body.append(' pInfo->pDepthStencilAttachment = &depthTarget;')
- cf_body.append(' }')
- cf_body.append(' XGL_FRAMEBUFFER local_framebuffer;')
- cf_body.append(' replayResult = m_xglFuncs.real_xglCreateFramebuffer(remap(pPacket->device), pPacket->pCreateInfo, &local_framebuffer);')
- cf_body.append(' pInfo->pColorAttachments = pSavedColor;')
- cf_body.append(' pInfo->pDepthStencilAttachment = pSavedDS;')
- cf_body.append(' if (replayResult == XGL_SUCCESS)')
- cf_body.append(' {')
- cf_body.append(' add_to_map(pPacket->pFramebuffer, &local_framebuffer);')
- cf_body.append(' }')
- cf_body.append(' if (allocatedColorAttachments)')
- cf_body.append(' {')
- cf_body.append(' GLV_DELETE((void*)pColorAttachments);')
- cf_body.append(' }')
+ cf_body.append(' returnValue = manually_handle_xglCreateFramebuffer(pPacket);')
return "\n".join(cf_body)
def _gen_replay_create_renderpass(self):
cr_body = []
- cr_body.append(' XGL_RENDER_PASS_CREATE_INFO *pInfo = (XGL_RENDER_PASS_CREATE_INFO *) pPacket->pCreateInfo;')
- cr_body.append(' // remap framebuffer')
- cr_body.append(' XGL_FRAMEBUFFER savedFB = 0, *pFB = &(pInfo->framebuffer);')
- cr_body.append(' if (*pFB != NULL)')
- cr_body.append(' {')
- cr_body.append(' savedFB = pInfo->framebuffer;')
- cr_body.append(' *pFB = remap(pInfo->framebuffer);')
- cr_body.append(' }')
- cr_body.append(' XGL_RENDER_PASS local_renderpass;')
- cr_body.append(' replayResult = m_xglFuncs.real_xglCreateRenderPass(remap(pPacket->device), pPacket->pCreateInfo, &local_renderpass);')
- cr_body.append(' if (*pFB != NULL)')
- cr_body.append(' pInfo->framebuffer = savedFB;')
- cr_body.append(' if (replayResult == XGL_SUCCESS)')
- cr_body.append(' {')
- cr_body.append(' add_to_map(pPacket->pRenderPass, &local_renderpass);')
- cr_body.append(' }')
+ cr_body.append(' returnValue = manually_handle_xglCreateRenderPass(pPacket);')
return "\n".join(cr_body)
def _gen_replay_begin_command_buffer(self):
bcb_body = []
- bcb_body.append(' XGL_CMD_BUFFER_BEGIN_INFO* pInfo = (XGL_CMD_BUFFER_BEGIN_INFO*)pPacket->pBeginInfo;')
- bcb_body.append(' // assume only zero or one graphics_begin_info in the chain')
- bcb_body.append(' XGL_RENDER_PASS savedRP, *pRP;')
- bcb_body.append(' XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO *pGInfo = NULL;')
- bcb_body.append(' while (pInfo != NULL)')
- bcb_body.append(' {')
- bcb_body.append('')
- bcb_body.append(' if (pInfo->sType == XGL_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO)')
- bcb_body.append(' {')
- bcb_body.append(' pGInfo = (XGL_CMD_BUFFER_GRAPHICS_BEGIN_INFO *) pInfo;')
- bcb_body.append(' savedRP = pGInfo->renderPass;')
- bcb_body.append(' pRP = &(pGInfo->renderPass);')
- bcb_body.append(' *pRP = remap(pGInfo->renderPass);')
- bcb_body.append(' break;')
- bcb_body.append(' }')
- bcb_body.append(' pInfo = (XGL_CMD_BUFFER_BEGIN_INFO*) pInfo->pNext;')
- bcb_body.append(' }')
- bcb_body.append(' replayResult = m_xglFuncs.real_xglBeginCommandBuffer(remap(pPacket->cmdBuffer), pPacket->pBeginInfo);')
- bcb_body.append(' if (pGInfo != NULL)')
- bcb_body.append(' pGInfo->renderPass = savedRP;')
+ bcb_body.append(' returnValue = manually_handle_xglBeginCommandBuffer(pPacket);')
return "\n".join(bcb_body)
def _gen_replay_store_pipeline(self):
sp_body = []
- sp_body.append(' size_t size = 0;')
- sp_body.append(' void* pData = NULL;')
- sp_body.append(' if (pPacket->pData != NULL && pPacket->pDataSize != NULL)')
- sp_body.append(' {')
- sp_body.append(' size = *pPacket->pDataSize;')
- sp_body.append(' pData = glv_malloc(*pPacket->pDataSize);')
- sp_body.append(' }')
- sp_body.append(' replayResult = m_xglFuncs.real_xglStorePipeline(remap(pPacket->pipeline), &size, pData);')
- sp_body.append(' if (replayResult == XGL_SUCCESS)')
- sp_body.append(' {')
- sp_body.append(' if (size != *pPacket->pDataSize && pData != NULL)')
- sp_body.append(' {')
- sp_body.append(' glv_LogWarn("xglStorePipeline returned a differing data size: replay (%d bytes) vs trace (%d bytes)\\n", size, *pPacket->pDataSize);')
- sp_body.append(' }')
- sp_body.append(' else if (pData != NULL && memcmp(pData, pPacket->pData, size) != 0)')
- sp_body.append(' {')
- sp_body.append(' glv_LogWarn("xglStorePipeline returned differing data contents than the trace file contained.\\n");')
- sp_body.append(' }')
- sp_body.append(' }')
- sp_body.append(' glv_free(pData);')
+ sp_body.append(' returnValue = manually_handle_xglStorePipeline(pPacket);')
return "\n".join(sp_body)
def _gen_replay_get_multi_gpu_compatibility(self):
gmgc_body = []
- gmgc_body.append(' XGL_GPU_COMPATIBILITY_INFO cInfo;')
- gmgc_body.append(' XGL_PHYSICAL_GPU handle0, handle1;')
- gmgc_body.append(' handle0 = remap(pPacket->gpu0);')
- gmgc_body.append(' handle1 = remap(pPacket->gpu1);')
- gmgc_body.append(' replayResult = m_xglFuncs.real_xglGetMultiGpuCompatibility(handle0, handle1, &cInfo);')
+ gmgc_body.append(' returnValue = manually_handle_xglGetMultiGpuCompatibility(pPacket);')
return "\n".join(gmgc_body)
def _gen_replay_destroy_object(self):
do_body = []
- do_body.append(' XGL_OBJECT object = remap(pPacket->object);')
- do_body.append(' if (object != XGL_NULL_HANDLE)')
- do_body.append(' replayResult = m_xglFuncs.real_xglDestroyObject(object);')
- do_body.append(' if (replayResult == XGL_SUCCESS)')
- do_body.append(' rm_from_map(pPacket->object);')
+ do_body.append(' returnValue = manually_handle_xglDestroyObject(pPacket);')
return "\n".join(do_body)
def _gen_replay_wait_for_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) = remap(*(pPacket->pFences + i));')
- wf_body.append(' }')
- wf_body.append(' replayResult = m_xglFuncs.real_xglWaitForFences(remap(pPacket->device), pPacket->fenceCount, pFence, pPacket->waitAll, pPacket->timeout);')
- wf_body.append(' GLV_DELETE(pFence);')
+ wf_body.append(' returnValue = manually_handle_xglWaitForFences(pPacket);')
return "\n".join(wf_body)
def _gen_replay_wsi_associate_connection(self):
wac_body = []
- wac_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- wac_body.append(' //associate with the replayers Wsi connection rather than tracers')
- wac_body.append(' replayResult = m_xglFuncs.real_xglWsiX11AssociateConnection(remap(pPacket->gpu), &(m_display->m_WsiConnection));')
- wac_body.append('#elif defined(WIN32)')
- wac_body.append(' //TBD')
- wac_body.append(' replayResult = XGL_SUCCESS;')
- wac_body.append('#endif')
+ wac_body.append(' returnValue = manually_handle_xglWsiX11AssociateConnection(pPacket);')
return "\n".join(wac_body)
def _gen_replay_wsi_get_msc(self):
wgm_body = []
- wgm_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- wgm_body.append(' xcb_window_t window = m_display->m_XcbWindow;')
- wgm_body.append(' replayResult = m_xglFuncs.real_xglWsiX11GetMSC(remap(pPacket->device), window, pPacket->crtc, pPacket->pMsc);')
- wgm_body.append('#elif defined(WIN32)')
- wgm_body.append(' //TBD')
- wgm_body.append(' replayResult = XGL_SUCCESS;')
- wgm_body.append('#else')
-
- wgm_body.append('#endif')
+ wgm_body.append(' returnValue = manually_handle_xglWsiX11GetMSC(pPacket);')
return "\n".join(wgm_body)
def _gen_replay_wsi_create_presentable_image(self):
cpi_body = []
- cpi_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- cpi_body.append(' struct imageObj local_imgObj;')
- cpi_body.append(' struct gpuMemObj local_mem;')
- cpi_body.append(' m_display->imageHeight.push_back(pPacket->pCreateInfo->extent.height);')
- cpi_body.append(' m_display->imageWidth.push_back(pPacket->pCreateInfo->extent.width);')
- cpi_body.append(' replayResult = m_xglFuncs.real_xglWsiX11CreatePresentableImage(remap(pPacket->device), pPacket->pCreateInfo, &local_imgObj.replayImage, &local_mem.replayGpuMem);')
- cpi_body.append(' if (replayResult == XGL_SUCCESS)')
- cpi_body.append(' {')
- cpi_body.append(' if (pPacket->pImage != NULL)')
- cpi_body.append(' add_to_map(pPacket->pImage, &local_imgObj);')
- cpi_body.append(' if(pPacket->pMem != NULL)')
- cpi_body.append(' add_to_map(pPacket->pMem, &local_mem);')
- cpi_body.append(' m_display->imageHandles.push_back(local_imgObj.replayImage);')
- cpi_body.append(' m_display->imageMemory.push_back(local_mem.replayGpuMem);')
- cpi_body.append(' }')
- cpi_body.append('#elif defined(WIN32)')
- cpi_body.append(' //TBD')
- cpi_body.append(' replayResult = XGL_SUCCESS;')
- cpi_body.append('#endif')
+ cpi_body.append(' returnValue = manually_handle_xglWsiX11CreatePresentableImage(pPacket);')
return "\n".join(cpi_body)
def _gen_replay_wsi_queue_present(self):
wqp_body = []
- wqp_body.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
- wqp_body.append(' XGL_WSI_X11_PRESENT_INFO pInfo;')
- wqp_body.append(' std::vector<int>::iterator it;')
- wqp_body.append(' memcpy(&pInfo, pPacket->pPresentInfo, sizeof(XGL_WSI_X11_PRESENT_INFO));')
- wqp_body.append(' pInfo.srcImage = remap(pPacket->pPresentInfo->srcImage);')
- wqp_body.append(' // use replayers Xcb window')
- wqp_body.append(' pInfo.destWindow = m_display->m_XcbWindow;')
- wqp_body.append(' replayResult = m_xglFuncs.real_xglWsiX11QueuePresent(remap(pPacket->queue), &pInfo, remap(pPacket->fence));')
- wqp_body.append(' it = std::find(m_screenshotFrames.begin(), m_screenshotFrames.end(), m_display->m_frameNumber);')
- wqp_body.append(' if (it != m_screenshotFrames.end())')
- wqp_body.append(' {')
- wqp_body.append(' for(unsigned int i=0; i<m_display->imageHandles.size(); i++)')
- wqp_body.append(' {')
- wqp_body.append(' if (m_display->imageHandles[i] == pInfo.srcImage)')
- wqp_body.append(' {')
- wqp_body.append(' char frameName[32];')
- wqp_body.append(' sprintf(frameName, "%d",m_display->m_frameNumber);')
- wqp_body.append(' glvWritePPM(frameName, m_display->imageWidth[i], m_display->imageHeight[i],')
- wqp_body.append(' m_display->imageHandles[i], m_display->imageMemory[i], &m_xglFuncs);')
- wqp_body.append(' break;')
- wqp_body.append(' }')
- wqp_body.append(' }')
- wqp_body.append(' }')
- wqp_body.append('#elif defined(WIN32)')
- wqp_body.append(' //TBD')
- wqp_body.append(' replayResult = XGL_SUCCESS;')
- wqp_body.append('#endif')
- wqp_body.append(' m_display->m_frameNumber++;')
+ wqp_body.append(' returnValue = manually_handle_xglWsiX11QueuePresent(pPacket);')
return "\n".join(wqp_body)
def _gen_replay_alloc_memory(self):
am_body = []
- am_body.append(' struct gpuMemObj local_mem;')
- am_body.append(' if (!m_adjustForGPU)')
- am_body.append(' replayResult = m_xglFuncs.real_xglAllocMemory(remap(pPacket->device), pPacket->pAllocInfo, &local_mem.replayGpuMem);')
- am_body.append(' if (replayResult == XGL_SUCCESS || m_adjustForGPU)')
+ 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(' {')
am_body.append(' local_mem.pGpuMem = new (gpuMemory);')
am_body.append(' if (local_mem.pGpuMem)')
- am_body.append(' local_mem.pGpuMem->setAllocInfo(pPacket->pAllocInfo, m_adjustForGPU);')
- am_body.append(' add_to_map(pPacket->pMem, &local_mem);')
+ am_body.append(' local_mem.pGpuMem->setAllocInfo(pPacket->pAllocInfo, m_objMapper.m_adjustForGPU);')
+ am_body.append(' m_objMapper.add_to_map(pPacket->pMem, &local_mem);')
am_body.append(' }')
return "\n".join(am_body)
def _gen_replay_free_memory(self):
fm_body = []
- fm_body.append(' struct gpuMemObj local_mem;')
- fm_body.append(' local_mem = m_gpuMemorys.find(pPacket->mem)->second;')
- fm_body.append(' // TODO how/when to free pendingAlloc that did not use and existing gpuMemObj')
- fm_body.append(' replayResult = m_xglFuncs.real_xglFreeMemory(local_mem.replayGpuMem);')
- fm_body.append(' if (replayResult == XGL_SUCCESS) ')
- fm_body.append(' {')
- fm_body.append(' delete local_mem.pGpuMem;')
- fm_body.append(' rm_from_map(pPacket->mem);')
- fm_body.append(' }')
+ fm_body.append(' returnValue = manually_handle_xglFreeMemory(pPacket);')
return "\n".join(fm_body)
def _gen_replay_map_memory(self):
mm_body = []
- mm_body.append(' struct gpuMemObj local_mem = m_gpuMemorys.find(pPacket->mem)->second;')
- mm_body.append(' void* pData;')
- mm_body.append(' if (!local_mem.pGpuMem->isPendingAlloc())')
- mm_body.append(' {')
- mm_body.append(' replayResult = m_xglFuncs.real_xglMapMemory(local_mem.replayGpuMem, pPacket->flags, &pData);')
- mm_body.append(' if (replayResult == XGL_SUCCESS)')
- mm_body.append(' {')
- mm_body.append(' if (local_mem.pGpuMem)')
- mm_body.append(' local_mem.pGpuMem->setMemoryMapRange(pData, 0, 0, false);')
- mm_body.append(' }')
- mm_body.append(' } else')
- mm_body.append(' {')
- mm_body.append(' if (local_mem.pGpuMem)')
- mm_body.append(' local_mem.pGpuMem->setMemoryMapRange(NULL, 0, 0, true);')
- mm_body.append(' }')
+ mm_body.append(' returnValue = manually_handle_xglMapMemory(pPacket);')
return "\n".join(mm_body)
def _gen_replay_unmap_memory(self):
um_body = []
- um_body.append(' struct gpuMemObj local_mem = m_gpuMemorys.find(pPacket->mem)->second;')
- um_body.append(' if (!local_mem.pGpuMem->isPendingAlloc())')
- um_body.append(' {')
- um_body.append(' if (local_mem.pGpuMem)')
- um_body.append(' local_mem.pGpuMem->copyMappingData(pPacket->pData); // copies data from packet into memory buffer')
- um_body.append(' replayResult = m_xglFuncs.real_xglUnmapMemory(local_mem.replayGpuMem);')
- um_body.append(' } else')
- um_body.append(' {')
- um_body.append(' if (local_mem.pGpuMem)')
- um_body.append(' {')
- um_body.append(' unsigned char *pBuf = (unsigned char *) glv_malloc(local_mem.pGpuMem->getMemoryMapSize());')
- um_body.append(' if (!pBuf)')
- um_body.append(' glv_LogError("vkUnmapMemory() malloc failed");')
- um_body.append(' local_mem.pGpuMem->setMemoryDataAddr(pBuf);')
- um_body.append(' local_mem.pGpuMem->copyMappingData(pPacket->pData);')
- um_body.append(' }')
- um_body.append(' }')
+ um_body.append(' returnValue = manually_handle_xglUnmapMemory(pPacket);')
return "\n".join(um_body)
def _gen_replay_pin_system_memory(self):
psm_body = []
- psm_body.append(' struct gpuMemObj local_mem;')
+ 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(remap(pPacket->device), pPacket->pSysMem, pPacket->memSize, &local_mem.replayGpuMem);')
+ 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(' add_to_map(pPacket->pMem, &local_mem);')
+ 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)
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(' memView.mem = remap(pPacket->pMemView->mem);')
- bdmv_body.append(' m_xglFuncs.real_xglCmdBindDynamicMemoryView(remap(pPacket->cmdBuffer), pPacket->pipelineBindPoint, &memView);')
+ 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);')
return "\n".join(bdmv_body)
# Generate main replay case statements where actual replay API call is dispatched based on input packet data
@@ -3403,7 +1664,11 @@
'CmdPipelineBarrier': self._gen_replay_cmd_pipeline_barrier}
# TODO : Need to guard CreateInstance with "if (!m_display->m_initedXGL)" 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']
+ custom_check_ret_val = ['EnumerateGpus', 'GetGpuInfo', 'CreateDevice', 'GetExtensionSupport', 'QueueSubmit', 'GetObjectInfo',
+ 'GetFormatInfo', 'GetImageSubresourceInfo', 'CreateDescriptorSetLayout', 'CreateGraphicsPipeline',
+ 'CreateFramebuffer', 'CreateRenderPass', 'BeginCommandBuffer', 'StorePipeline', 'GetMultiGpuCompatibility',
+ 'DestroyObject', 'WaitForFences', 'FreeMemory', 'MapMemory', 'UnmapMemory',
+ 'WsiX11AssociateConnection', 'WsiX11GetMSC', 'WsiX11CreatePresentableImage', 'WsiX11QueuePresent']
# multi-gpu Open funcs w/ list of local params to create
custom_open_params = {'OpenSharedMemory': (-1,),
'OpenSharedQueueSemaphore': (-1,),
@@ -3416,7 +1681,6 @@
# 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'}
rbody = []
- rbody.append('#define CHECK_RETURN_VALUE(entrypoint) returnValue = handle_replay_errors(#entrypoint, replayResult, pPacket->result, returnValue);\n')
rbody.append('glv_replay::GLV_REPLAY_RESULT xglReplay::replay(glv_trace_packet_header *packet)')
rbody.append('{')
rbody.append(' glv_replay::GLV_REPLAY_RESULT returnValue = glv_replay::GLV_REPLAY_SUCCESS;')
@@ -3446,16 +1710,16 @@
rbody.append(' XGL_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 = remap(pPacket->device);')
+ rbody.append(' handle = m_objMapper.remap(pPacket->device);')
elif create_view:
rbody.append(' %s createInfo;' % (proto.params[1].ty.strip('*').replace('const ', '')))
rbody.append(' memcpy(&createInfo, pPacket->pCreateInfo, sizeof(%s));' % (proto.params[1].ty.strip('*').replace('const ', '')))
if 'CreateComputePipeline' == proto.name:
- rbody.append(' createInfo.cs.shader = remap(pPacket->pCreateInfo->cs.shader);')
+ rbody.append(' createInfo.cs.shader = m_objMapper.remap(pPacket->pCreateInfo->cs.shader);')
elif 'CreateBufferView' == proto.name:
- rbody.append(' createInfo.buffer = remap(pPacket->pCreateInfo->buffer);')
+ rbody.append(' createInfo.buffer = m_objMapper.remap(pPacket->pCreateInfo->buffer);')
else:
- rbody.append(' createInfo.image = remap(pPacket->pCreateInfo->image);')
+ rbody.append(' createInfo.image = m_objMapper.remap(pPacket->pCreateInfo->image);')
rbody.append(' %s local_%s;' % (proto.params[-1].ty.strip('*').replace('const ', ''), proto.params[-1].name))
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))
@@ -3465,14 +1729,14 @@
rbody.append(' assert(pPacket->count <= 100);')
rbody.append(' for (uint32_t i = 0; i < pPacket->count; i++)')
rbody.append(' {')
- rbody.append(' localDescSets[i] = remap(pPacket->%s[i]);' % (proto.params[-3].name))
+ rbody.append(' localDescSets[i] = m_objMapper.remap(pPacket->%s[i]);' % (proto.params[-3].name))
rbody.append(' }')
elif proto.name == 'ClearDescriptorSets':
rbody.append(' XGL_DESCRIPTOR_SET 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] = remap(pPacket->%s[i]);' % (proto.params[-1].name))
+ rbody.append(' localDescSets[i] = m_objMapper.remap(pPacket->%s[i]);' % (proto.params[-1].name))
rbody.append(' }')
elif proto.name in do_while_dict:
rbody.append(' do {')
@@ -3501,7 +1765,7 @@
rr_string = '%s);' % rr_string[:-2]
if proto.name in custom_open_params:
rr_list = rr_string.split(', ')
- rr_list[0] = rr_list[0].replace('remap(pPacket->device)', 'handle')
+ rr_list[0] = rr_list[0].replace('m_objMapper.remap(pPacket->device)', 'handle')
for pidx in custom_open_params[proto.name]:
rr_list[pidx] = '&local_%s' % proto.params[pidx].name
rr_string = ', '.join(rr_list)
@@ -3525,7 +1789,8 @@
rbody.append(' {')
rbody.append(' m_pCBDump = NULL;')
rbody.append(' m_pDSDump = NULL;')
- rbody.append(' rm_from_map(pPacket->device);')
+ rbody.append(' m_pGlvSnapshotPrint = NULL;')
+ rbody.append(' m_objMapper.rm_from_map(pPacket->device);')
rbody.append(' m_display->m_initedXGL = false;')
rbody.append(' }')
if 'DestroyInstance' in proto.name:
@@ -3533,19 +1798,21 @@
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(' clear_all_map_handles();')
+ rbody.append(' m_objMapper.clear_all_map_handles();')
rbody.append(' }')
elif 'AllocDescriptorSets' in proto.name:
rbody.append(' if (replayResult == XGL_SUCCESS)')
rbody.append(' {')
rbody.append(' for (uint32_t i = 0; i < local_pCount; i++) {')
- rbody.append(' add_to_map(&pPacket->%s[i], &local_%s[i]);' % (proto.params[-2].name, proto.params[-2].name))
+ 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(' {')
- rbody.append(' add_to_map(pPacket->%s, &local_%s);' % (proto.params[-1].name, proto.params[-1].name))
+ rbody.append(' m_objMapper.add_to_map(pPacket->%s, &local_%s);' % (proto.params[-1].name, proto.params[-1].name))
+ if 'AllocMemory' == proto.name:
+ rbody.append(' m_objMapper.add_entry_to_mapData(local_%s, pPacket->pAllocInfo->allocationSize);' % (proto.params[-1].name))
rbody.append(' }')
elif proto.name in do_while_dict:
rbody[-1] = ' %s' % rbody[-1]
@@ -3584,7 +1851,8 @@
def generate_body(self):
body = [self._generate_trace_func_ptrs(),
- self._generate_trace_func_protos()]
+ self._generate_trace_func_protos(),
+ self._generate_trace_real_func_ptr_protos()]
return "\n".join(body)
@@ -3593,6 +1861,7 @@
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"')
@@ -3611,7 +1880,6 @@
self._generate_attach_hooks(),
self._generate_detach_hooks(),
self._generate_init_funcs(),
- self._generate_helper_funcs(),
self._generate_trace_funcs()]
return "\n".join(body)
@@ -3772,20 +2040,13 @@
return "\n".join(body)
-class GlaveReplayHeader(Subcommand):
+class GlaveReplayXglFuncPtrs(Subcommand):
def generate_header(self):
header_txt = []
header_txt.append('#pragma once\n')
- header_txt.append('#include <set>')
- header_txt.append('#include <map>')
- header_txt.append('#include <vector>')
- header_txt.append('#include <string>')
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 "glvreplay_window.h"')
- header_txt.append('#include "glvreplay_factory.h"')
- header_txt.append('#include "glv_trace_packet_identifiers.h"\n')
header_txt.append('#include "xgl.h"')
header_txt.append('#include "xglDbg.h"')
header_txt.append('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
@@ -3793,26 +2054,42 @@
header_txt.append('#else')
header_txt.append('#include "xglWsiWinExt.h"')
header_txt.append('#endif')
- header_txt.append('#include "draw_state.h"')
+
+ def generate_body(self):
+ body = [self._generate_replay_func_ptrs()]
+ return "\n".join(body)
+
+class GlaveReplayObjMapperHeader(Subcommand):
+ def generate_header(self):
+ header_txt = []
+ header_txt.append('#pragma once\n')
+ header_txt.append('#include <set>')
+ 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('#if defined(PLATFORM_LINUX) || defined(XCB_NVIDIA)')
+ header_txt.append('#include "xglWsiX11Ext.h"')
+ header_txt.append('#else')
+ header_txt.append('#include "xglWsiWinExt.h"')
+ header_txt.append('#endif')
return "\n".join(header_txt)
def generate_body(self):
- body = [self._generate_replay_class_decls(),
- self._generate_replay_func_ptrs(),
- self._generate_replay_class()]
+ body = [self._generate_replay_objmapper_class()]
return "\n".join(body)
class GlaveReplayC(Subcommand):
def generate_header(self):
header_txt = []
- header_txt.append('#include "glvreplay_xgl_replay.h"\n')
+ header_txt.append('#include "glvreplay_xgl_xglreplay.h"\n')
header_txt.append('#include "glvreplay_xgl.h"\n')
- header_txt.append('#include "glvreplay_xgl_write_ppm.h"\n')
header_txt.append('#include "glvreplay_main.h"\n')
header_txt.append('#include <algorithm>')
header_txt.append('#include <queue>')
- header_txt.append('glvreplay_settings *g_pReplaySettings;')
+ header_txt.append('\n')
header_txt.append('extern "C" {')
header_txt.append('#include "glv_vk_vk_structs.h"')
header_txt.append('#include "glv_vk_vkdbg_structs.h"')
@@ -3821,30 +2098,11 @@
header_txt.append('#include "xgl_enum_string_helper.h"\n}\n')
header_txt.append('#define APP_NAME "glvreplay_xgl"')
header_txt.append('#define IDI_ICON 101\n')
- header_txt.append('static const char* g_extensions[] =')
- header_txt.append('{')
- header_txt.append(' "XGL_WSI_WINDOWS",')
- header_txt.append(' "XGL_TIMER_QUEUE",')
- header_txt.append(' "XGL_GPU_TIMESTAMP_CALIBRATION",')
- header_txt.append(' "XGL_DMA_QUEUE",')
- header_txt.append(' "XGL_COMMAND_BUFFER_CONTROL_FLOW",')
- header_txt.append(' "XGL_COPY_OCCLUSION_QUERY_DATA",')
- header_txt.append(' "XGL_ADVANCED_MULTISAMPLING",')
- header_txt.append(' "XGL_BORDER_COLOR_PALETTE"')
- header_txt.append('};')
+
return "\n".join(header_txt)
def generate_body(self):
- body = [self._generate_replay_display_init_xgl(),
- self._generate_replay_display_init(),
- self._generate_replay_display_structors(),
- self._generate_replay_display_window(),
- self._generate_replay_objMemory_funcs(),
- self._generate_replay_structors(),
- self._generate_replay_init(),
- self._generate_replay_errors(),
- self._generate_replay_validation_funcs(),
- self._generate_replay_init_funcs(),
+ body = [self._generate_replay_init_funcs(),
self._generate_replay()]
return "\n".join(body)
@@ -3861,7 +2119,8 @@
"glave-dbg-trace-h" : GlaveDbgHeader,
"glave-dbg-trace-c" : GlaveDbgC,
"glave-dbg-trace-structs" : GlaveDbgStructs,
- "glave-replay-h" : GlaveReplayHeader,
+ "glave-replay-xgl-funcs" : GlaveReplayXglFuncPtrs,
+ "glave-replay-obj-mapper-h" : GlaveReplayObjMapperHeader,
"glave-replay-c" : GlaveReplayC,
}