From bb3c9cb6074d92a09bf66cfffeba26b9f436fad6 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Tue, 28 Apr 2015 17:27:16 -0600 Subject: layers: Fix bug in APIDump where some void* members were having their address printed when APIDumpNoAddr was TRUE --- vk_helper.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vk_helper.py b/vk_helper.py index 52f707a0..8104b2fb 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -861,6 +861,11 @@ class StructWrapperGen: sh_funcs.append(' ss[%u].str(pStruct->%s ? "TRUE" : "FALSE");' % (index, self.struct_dict[s][m]['name'])) elif 'uint8' in self.struct_dict[s][m]['type'].lower(): sh_funcs.append(' ss[%u] << (uint32_t)pStruct->%s;' % (index, self.struct_dict[s][m]['name'])) + elif 'void' in self.struct_dict[s][m]['type'].lower() and self.struct_dict[s][m]['ptr']: + sh_funcs.append(' if (StreamControl::writeAddress)') + sh_funcs.append(' ss[%u] << pStruct->%s;' % (index, self.struct_dict[s][m]['name'])) + sh_funcs.append(' else') + sh_funcs.append(' ss[%u].str("address");' % (index)) else: (po, pa) = self._get_struct_print_formatted(self.struct_dict[s][m]) if "addr" in po: # or self.struct_dict[s][m]['ptr']: -- cgit v1.2.3