layers: Remove additional unused parameters in OT
Change-Id: Ife70e2352127805a3990af79765fc6d3681c4c11
diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py
index cd7c629..04c78c0 100644
--- a/scripts/object_tracker_generator.py
+++ b/scripts/object_tracker_generator.py
@@ -740,9 +740,8 @@
return object_array, destroy_obj_code
#
# Output validation for a single object (obj_count is NULL) or a counted list of objects
- def outputObjects(self, obj_type, obj_name, obj_count, prefix, index, indent, destroy_func, destroy_array, disp_name, parent_name, null_allowed, top_level):
+ def outputObjects(self, obj_type, obj_name, obj_count, prefix, index, indent, disp_name, parent_name, null_allowed, top_level):
pre_call_code = ''
- post_call_code = ''
param_suffix = '%s-parameter' % (obj_name)
parent_suffix = '%s-parent' % (obj_name)
param_vuid = self.GetVuid(parent_name, param_suffix)
@@ -759,15 +758,11 @@
pre_call_code += '%s }\n' % indent
else:
pre_call_code += '%s skip |= ValidateObject(%s, %s%s, %s, %s, %s, %s);\n' % (indent, disp_name, prefix, obj_name, self.GetVulkanObjType(obj_type), null_allowed, param_vuid, parent_vuid)
- return pre_call_code, post_call_code
+ return pre_call_code
#
# first_level_param indicates if elements are passed directly into the function else they're below a ptr/struct
- # create_func means that this is API creates or allocates objects
- # destroy_func indicates that this API destroys or frees objects
- # destroy_array means that the destroy_func operated on an array of objects
- def validate_objects(self, members, indent, prefix, array_index, create_func, destroy_func, destroy_array, disp_name, parent_name, first_level_param):
+ def validate_objects(self, members, indent, prefix, array_index, disp_name, parent_name, first_level_param):
pre_code = ''
- post_code = ''
index = 'index%s' % str(array_index)
array_index += 1
# Process any objects in this structure and recurse for any sub-structs in this struct
@@ -780,9 +775,8 @@
if (count_name is not None):
count_name = '%s%s' % (prefix, member.len)
null_allowed = member.isoptional
- (tmp_pre, tmp_post) = self.outputObjects(member.type, member.name, count_name, prefix, index, indent, destroy_func, destroy_array, disp_name, parent_name, str(null_allowed).lower(), first_level_param)
+ tmp_pre = self.outputObjects(member.type, member.name, count_name, prefix, index, indent, disp_name, parent_name, str(null_allowed).lower(), first_level_param)
pre_code += tmp_pre
- post_code += tmp_post
# Handle Structs that contain objects at some level
elif member.type in self.struct_member_dict:
# Structs at first level will have an object
@@ -800,9 +794,8 @@
indent = self.incIndent(indent)
local_prefix = '%s[%s].' % (new_prefix, index)
# Process sub-structs in this struct
- (tmp_pre, tmp_post) = self.validate_objects(struct_info, indent, local_prefix, array_index, create_func, destroy_func, destroy_array, disp_name, member.type, False)
+ tmp_pre = self.validate_objects(struct_info, indent, local_prefix, array_index, disp_name, member.type, False)
pre_code += tmp_pre
- post_code += tmp_post
indent = self.decIndent(indent)
pre_code += '%s }\n' % indent
indent = self.decIndent(indent)
@@ -815,12 +808,11 @@
pre_code += '%s if (%s%s) {\n' % (indent, prefix, member.name)
indent = self.incIndent(indent)
# Process sub-structs in this struct
- (tmp_pre, tmp_post) = self.validate_objects(struct_info, indent, new_prefix, array_index, create_func, destroy_func, destroy_array, disp_name, member.type, False)
+ tmp_pre = self.validate_objects(struct_info, indent, new_prefix, array_index, disp_name, member.type, False)
pre_code += tmp_pre
- post_code += tmp_post
indent = self.decIndent(indent)
pre_code += '%s }\n' % indent
- return pre_code, post_code
+ return pre_code
#
# For a particular API, generate the object handling code
def generate_wrapping_code(self, cmd):
@@ -846,7 +838,7 @@
param_post_code = ''
create_func = True if create_obj_code else False
destroy_func = True if destroy_object_code else False
- (param_pre_code, param_post_code) = self.validate_objects(cmd_info, indent, '', 0, create_func, destroy_func, destroy_array, disp_name, proto.text, True)
+ param_pre_code = self.validate_objects(cmd_info, indent, '', 0, disp_name, proto.text, True)
param_post_code += create_obj_code
if destroy_object_code:
if destroy_array == True: