diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-12-29 14:21:25 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-29 14:42:26 -0700 |
| commit | 14fd9b8284ef809189c4ff7558637d79061924ae (patch) | |
| tree | 8e33b97531181b8714ce0a472d52c3c86d2c96d7 | |
| parent | b90f50d9a48b1a5312d5e7aaf9327097154b7281 (diff) | |
| download | usermoji-14fd9b8284ef809189c4ff7558637d79061924ae.tar.xz | |
vktrace: version 217 WSI changes
| -rwxr-xr-x | vk_helper.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vk_helper.py b/vk_helper.py index be0ba408..7e017bee 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -1265,7 +1265,17 @@ class StructWrapperGen: def _generateSizeHelperFunctionsC(self): sh_funcs = [] # generate function definitions + exclude_struct_list = ['VkAndroidSurfaceCreateInfoKHR', + 'VkMirSurfaceCreateInfoKHR', + 'VkWaylandSurfaceCreateInfoKHR', + 'VkXlibSurfaceCreateInfoKHR'] + if sys.platform == 'win32': + exclude_struct_list.append('VkXcbSurfaceCreateInfoKHR') + else: + exclude_struct_list.append('VkWin32SurfaceCreateInfoKHR') for s in sorted(self.struct_dict): + if (typedef_fwd_dict[s] in exclude_struct_list): + continue skip_list = [] # Used when struct elements need to be skipped b/c size already accounted for sh_funcs.append('size_t %s(const %s* pStruct)\n{' % (self._get_size_helper_func_name(s), typedef_fwd_dict[s])) indent = ' ' @@ -1315,7 +1325,8 @@ class StructWrapperGen: elif is_type(self.struct_dict[s][m]['type'], 'struct'): sh_funcs.append('%sstructSize += %s(pStruct->%s);' % (indent, self._get_size_helper_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['name'])) elif 'void' not in self.struct_dict[s][m]['type'].lower(): - sh_funcs.append('%sstructSize += sizeof(%s);' % (indent, self.struct_dict[s][m]['type'])) + if (self.struct_dict[s][m]['type'] != 'xcb_connection_t'): + sh_funcs.append('%sstructSize += sizeof(%s);' % (indent, self.struct_dict[s][m]['type'])) elif 'size_t' == self.struct_dict[s][m]['type'].lower(): sh_funcs.append('%sstructSize += pStruct->%s;' % (indent, self.struct_dict[s][m]['name'])) skip_list.append(m+1) |