commit ce12ad6b1990deec2557e82677ec523ddfb292a6
author Tobin Ehlis <tobin@lunarg.com> Thu Dec 18 09:29:58 2014 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:05 2015 -0700
tree 5e400240bd257454a9f1d4f04daf227c81220a48
parent 27e02a60246ffa00044e6b68ed2d7ca4d7526dde

layers: Validate structs embedded in structs

xgl_helper.py

diff --git a/xgl_helper.py b/xgl_helper.py
index 4965121..73bc07d 100755
--- a/xgl_helper.py
+++ b/xgl_helper.py
@@ -891,8 +891,11 @@
                 if is_type(self.struct_dict[s][m]['type'], 'enum'):
                     sh_funcs.append('    if (!validate_%s(pStruct->%s))\n        return 0;' % (self.struct_dict[s][m]['type'], self.struct_dict[s][m]['name']))
                 # TODO : Need a little refinement to this code to make sure type of struct matches expected input (ptr, const...)
-                #if is_type(self.struct_dict[s][m]['type'], 'struct'):
-                #    sh_funcs.append('    if (!%s((%s)pStruct->%s))\n        return 0;' % (self._get_vh_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['full_type'], self.struct_dict[s][m]['name']))
+                if is_type(self.struct_dict[s][m]['type'], 'struct'):
+                    if (self.struct_dict[s][m]['ptr']):
+                        sh_funcs.append('    if (!%s((const %s*)pStruct->%s))\n        return 0;' % (self._get_vh_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['type'], self.struct_dict[s][m]['name']))
+                    else:
+                        sh_funcs.append('    if (!%s((const %s*)&pStruct->%s))\n        return 0;' % (self._get_vh_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['type'], self.struct_dict[s][m]['name']))
             sh_funcs.append("    return 1;\n}")
 
         return "\n".join(sh_funcs)