param0_name = proto.params[0].name
ret_val = ''
stmt = ''
- cis_param_index = [] # Store 'index' func has struct param to print, or an name of binding "Count" param for array to print
+ sp_param_dict = {} # Store 'index' for struct param to print, or an name of binding "Count" param for array to print
create_params = 0 # Num of params at end of function that are created and returned as output values
- if 'WsiX11CreatePresentableImage' in proto.name:
+ if 'WsiX11CreatePresentableImage' in proto.name or 'AllocDescriptorSets' in proto.name:
create_params = -2
elif 'Create' in proto.name or 'Alloc' in proto.name or 'MapMemory' in proto.name:
create_params = -1
log_func = 'cout << "t{" << getTIDIndex() << "} xgl%s(' % proto.name
f_close = '\n pthread_mutex_unlock( &print_lock );'
pindex = 0
+ prev_count_name = ''
for p in proto.params:
# TODO : Need to handle xglWsiX11CreatePresentableImage for which the last 2 params are returned vals
cp = False
#print_vals += ', %s' % (pfi)
# TODO : Just want this to be simple check for params of STRUCT type
#if "pCreateInfo" in p.name or ('const' in p.ty and '*' in p.ty and False not in [tmp_ty not in p.ty for tmp_ty in ['char', 'void', 'int', 'XGL_CMD_BUFFER', 'XGL_QUEUE_SEMAPHORE', 'XGL_FENCE', 'XGL_SAMPLER']]):
- if xgl_helper.is_type(p.ty.strip('const').strip('*'), 'struct'):
+ if prev_count_name != '' and (prev_count_name.strip('Count')[1:] in p.name or 'slotCount' == prev_count_name):
+ sp_param_dict[pindex] = prev_count_name
+ elif 'pDescriptorSets' == p.name and proto.params[-1].name == 'pCount':
+ sp_param_dict[pindex] = '*pCount'
+ elif xgl_helper.is_type(p.ty.strip('const').strip('*'), 'struct'):
if 'Wsi' not in proto.name:
- cis_param_index.append(pindex)
+ sp_param_dict[pindex] = 'index'
pindex += 1
+ if p.name.endswith('Count'):
+ if '*' in p.ty:
+ prev_count_name = "*%s" % p.name
+ else:
+ prev_count_name = p.name
+ else:
+ prev_count_name = ''
log_func = log_func.strip(', ')
if proto.ret != "void":
log_func += ') = " << string_XGL_RESULT((XGL_RESULT)result) << "\\n"'
else:
log_func += ')\\n"'
log_func += ';'
- if len(cis_param_index) > 0:
+ if len(sp_param_dict) > 0:
+ i_decl = False
log_func += '\n string tmp_str;'
- for sp_index in cis_param_index:
- cis_print_func = 'xgl_print_%s' % (proto.params[sp_index].ty.strip('const ').strip('*').lower())
- log_func += '\n if (%s) {' % (proto.params[sp_index].name)
- log_func += '\n tmp_str = %s(%s, " ");' % (cis_print_func, proto.params[sp_index].name)
- if "File" in layer:
- if no_addr:
- log_func += '\n fprintf(pOutFile, " %s (addr)\\n%%s\\n", pTmpStr);' % (proto.params[sp_index].name)
+ for sp_index in sp_param_dict:
+ if 'index' == sp_param_dict[sp_index]:
+ cis_print_func = 'xgl_print_%s' % (proto.params[sp_index].ty.strip('const ').strip('*').lower())
+ log_func += '\n if (%s) {' % (proto.params[sp_index].name)
+ log_func += '\n tmp_str = %s(%s, " ");' % (cis_print_func, proto.params[sp_index].name)
+ if "File" in layer:
+ if no_addr:
+ log_func += '\n fprintf(pOutFile, " %s (addr)\\n%%s\\n", pTmpStr);' % (proto.params[sp_index].name)
+ else:
+ log_func += '\n fprintf(pOutFile, " %s (%%p)\\n%%s\\n", (void*)%s, pTmpStr);' % (proto.params[sp_index].name, proto.params[sp_index].name)
else:
- log_func += '\n fprintf(pOutFile, " %s (%%p)\\n%%s\\n", (void*)%s, pTmpStr);' % (proto.params[sp_index].name, proto.params[sp_index].name)
- else:
- if no_addr:
- #log_func += '\n printf(" %s (addr)\\n%%s\\n", pTmpStr);' % (proto.params[sp_index].name)
- log_func += '\n cout << " %s (addr)" << endl << tmp_str << endl;' % (proto.params[sp_index].name)
+ if no_addr:
+ #log_func += '\n printf(" %s (addr)\\n%%s\\n", pTmpStr);' % (proto.params[sp_index].name)
+ log_func += '\n cout << " %s (addr)" << endl << tmp_str << endl;' % (proto.params[sp_index].name)
+ else:
+ #log_func += '\n printf(" %s (%%p)\\n%%s\\n", (void*)%s, pTmpStr);' % (proto.params[sp_index].name, proto.params[sp_index].name)
+ log_func += '\n cout << " %s (" << %s << ")" << endl << tmp_str << endl;' % (proto.params[sp_index].name, proto.params[sp_index].name)
+ #log_func += '\n fflush(stdout);'
+ log_func += '\n }'
+ else: # We have a count value stored to iterate over an array
+ print_cast = ''
+ print_func = ''
+ if xgl_helper.is_type(proto.params[sp_index].ty.strip('*').strip('const '), 'struct'):
+ print_cast = '&'
+ print_func = 'xgl_print_%s' % proto.params[sp_index].ty.strip('const ').strip('*').lower()
+ #cis_print_func = 'tmp_str = xgl_print_%s(&%s[i], " ");' % (proto.params[sp_index].ty.strip('const ').strip('*').lower(), proto.params[sp_index].name)
+# TODO : Need to display this address as a string
else:
- #log_func += '\n printf(" %s (%%p)\\n%%s\\n", (void*)%s, pTmpStr);' % (proto.params[sp_index].name, proto.params[sp_index].name)
- log_func += '\n cout << " %s (" << %s << ")" << endl << tmp_str << endl;' % (proto.params[sp_index].name, proto.params[sp_index].name)
- #log_func += '\n fflush(stdout);'
- log_func += '\n }'
+ print_cast = '(void*)'
+ print_func = 'string_convert_helper'
+ #cis_print_func = 'tmp_str = string_convert_helper((void*)%s[i], " ");' % proto.params[sp_index].name
+ cis_print_func = 'tmp_str = %s(%s%s[i], " ");' % (print_func, print_cast, proto.params[sp_index].name)
+# else:
+# cis_print_func = ''
+ if not i_decl:
+ log_func += '\n uint32_t i;'
+ i_decl = True
+ log_func += '\n for (i = 0; i < %s; i++) {' % (sp_param_dict[sp_index])
+ log_func += '\n %s' % (cis_print_func)
+ if "File" in layer:
+ if no_addr:
+ log_func += '\n fprintf(pOutFile, " %s (addr)\\n%%s\\n", pTmpStr);' % (proto.params[sp_index].name)
+ else:
+ log_func += '\n fprintf(pOutFile, " %s (%%p)\\n%%s\\n", (void*)%s, pTmpStr);' % (proto.params[sp_index].name, proto.params[sp_index].name)
+ else:
+ if no_addr:
+ #log_func += '\n printf(" %s (addr)\\n%%s\\n", pTmpStr);' % (proto.params[sp_index].name)
+ log_func += '\n cout << " %s[" << (uint32_t)i << "] (addr)" << endl << tmp_str << endl;' % (proto.params[sp_index].name)
+ else:
+ #log_func += '\n printf(" %s (%%p)\\n%%s\\n", (void*)%s, pTmpStr);' % (proto.params[sp_index].name, proto.params[sp_index].name)
+ #log_func += '\n cout << " %s[" << (uint32_t)i << "] (" << %s[i] << ")" << endl << tmp_str << endl;' % (proto.params[sp_index].name, proto.params[sp_index].name)
+ log_func += '\n cout << " %s[" << i << "] (" << %s%s[i] << ")" << endl << tmp_str << endl;' % (proto.params[sp_index].name, print_cast, proto.params[sp_index].name)
+ #log_func += '\n fflush(stdout);'
+ log_func += '\n }'
if proto.name == "EnumerateLayers":
c_call = proto.c_call().replace("(" + proto.params[0].name, "((XGL_PHYSICAL_GPU)gpuw->nextObject", 1)
funcs.append('%s%s\n'
param0_name = proto.params[0].name
ret_val = ''
stmt = ''
- sp_param_dict = {} # Store list of indices when func has struct params
+ sp_param_dict = {} # Store 'index' for struct param to print, or an name of binding "Count" param for array to print
create_params = 0 # Num of params at end of function that are created and returned as output values
if 'WsiX11CreatePresentableImage' in proto.name:
create_params = -2
# Catch array inputs that are bound by a "Count" param
if prev_count_name != '' and (prev_count_name.strip('Count')[1:] in p.name or 'slotCount' == prev_count_name):
sp_param_dict[pindex] = prev_count_name
+ elif 'pDescriptorSets' == p.name and proto.params[-1].name == 'pCount':
+ sp_param_dict[pindex] = '*pCount'
elif 'Wsi' not in proto.name and xgl_helper.is_type(p.ty.strip('*').strip('const '), 'struct'):
sp_param_dict[pindex] = 'index'
pindex += 1
def _generateStringHelperFunctions(self):
sh_funcs = []
# We do two passes, first pass just generates prototypes for all the functsions
- for s in self.struct_dict:
+ for s in sorted(self.struct_dict):
sh_funcs.append('char* %s(const %s* pStruct, const char* prefix);\n' % (self._get_sh_func_name(s), typedef_fwd_dict[s]))
sh_funcs.append('\n')
for s in self.struct_dict:
p_args = ""
stp_list = [] # stp == "struct to print" a list of structs for this API call that should be printed as structs
# This isn't great but this pre-pass counts chars in struct members and flags structs w/ pNext
- for m in self.struct_dict[s]:
+ for m in sorted(self.struct_dict[s]):
if 'pNext' == self.struct_dict[s][m]['name'] or is_type(self.struct_dict[s][m]['type'], 'struct'):
stp_list.append(self.struct_dict[s][m])
sh_funcs.append('char* %s(const %s* pStruct, const char* prefix)\n{\n char* str;\n' % (self._get_sh_func_name(s), typedef_fwd_dict[s]))
# create and return final string
sh_funcs = []
# First generate prototypes for every struct
- for s in self.struct_dict:
+ for s in sorted(self.struct_dict):
sh_funcs.append('string %s(const %s* pStruct, const string prefix);' % (self._get_sh_func_name(s), typedef_fwd_dict[s]))
sh_funcs.append('\n')
- for s in self.struct_dict:
+ for s in sorted(self.struct_dict):
num_non_enum_elems = [is_type(self.struct_dict[s][elem]['type'], 'enum') for elem in self.struct_dict[s]].count(False)
stp_list = [] # stp == "struct to print" a list of structs for this API call that should be printed as structs
# This isn't great but this pre-pass counts chars in struct members and flags structs w/ pNext
- for m in self.struct_dict[s]:
+ for m in sorted(self.struct_dict[s]):
if 'pNext' == self.struct_dict[s][m]['name'] or is_type(self.struct_dict[s][m]['type'], 'struct'):
stp_list.append(self.struct_dict[s][m])
sh_funcs.append('string %s(const %s* pStruct, const string prefix)\n{' % (self._get_sh_func_name(s), typedef_fwd_dict[s]))
sh_funcs.append(' string final_str;')
sh_funcs.append(' string tmp_str;')
sh_funcs.append(' string extra_indent = " " + prefix;')
- sh_funcs.append(' stringstream ss[%u];' % num_non_enum_elems)
+ if (0 != num_non_enum_elems):
+ sh_funcs.append(' stringstream ss[%u];' % num_non_enum_elems)
num_stps = len(stp_list)
# First generate code for any embedded structs
if 0 < num_stps:
final_str += " + %s" % " + ".join(['stp_strs[%u]' % n for n in reversed(range(num_stps))])
sh_funcs.append(' final_str = %s;' % final_str)
sh_funcs.append(' return final_str;\n}')
+ # Add function to return a string value for input void*
+ sh_funcs.append("string string_convert_helper(const void* toString, const string prefix)\n{")
+ sh_funcs.append(" stringstream ss;")
+ sh_funcs.append(' ss << toString;')
+ sh_funcs.append(' string final_str = prefix + ss.str();')
+ sh_funcs.append(" return final_str;")
+ sh_funcs.append("}")
# Add function to dynamically print out unknown struct
sh_funcs.append("string dynamic_display(const void* pStruct, const string prefix)\n{")
sh_funcs.append(" // Cast to APP_INFO ptr initially just to pull sType off struct")