Skip to content

Commit

Permalink
codegen: Migrate replay consumer
Browse files Browse the repository at this point in the history 
Migrate the replay consumer code gen to use the Khronos types and
not internal types.
  • Loading branch information
@MarkY-LunarG @jzulauf-lunarg
MarkY-LunarG authored and jzulauf-lunarg committed Jan 21, 2025
1 parent 3f9b993 commit fac1acb
Showing 1 changed file with 14 additions and 36 deletions.
50 changes: 14 additions & 36 deletions ...k/generated/khronos_generators/vulkan_generators/vulkan_replay_consumer_body_generator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,6 @@ def __init__(
diag_file=diag_file
)

# Map of Vulkan structs containing handles to a list values for handle members or struct members
# that contain handles (eg. VkGraphicsPipelineCreateInfo contains a VkPipelineShaderStageCreateInfo
# member that contains handles).
self.structs_with_handles = dict()
self.structs_with_handle_ptrs = []
# Map of struct types to associated VkStructureType.
self.stype_values = dict()

def beginFile(self, gen_opts):
"""Method override."""
BaseGenerator.beginFile(self, gen_opts)
Expand Down Expand Up @@ -154,8 +146,8 @@ def endFile(self):
write(' {', file=self.outFile)
write(' switch(in_pnext->sType)', file=self.outFile)
write(' {', file=self.outFile)
for struct in self.stype_values:
struct_type = self.stype_values[struct]
for struct in self.struct_type_names:
struct_type = self.struct_type_names[struct]
if not struct_type in self.SKIP_PNEXT_STRUCT_TYPES:
write(' case {}:'.format(struct_type), file=self.outFile)
write(' {', file=self.outFile)
Expand Down Expand Up @@ -198,20 +190,6 @@ def endFile(self):
# Finish processing in superclass
BaseGenerator.endFile(self)

def genStruct(self, typeinfo, typename, alias):
"""Method override."""
BaseGenerator.genStruct(self, typeinfo, typename, alias)

if not alias:
self.check_struct_member_handles(
typename, self.structs_with_handles,
self.structs_with_handle_ptrs
)

stype = self.make_structure_type_enum(typeinfo, typename)
if stype:
self.stype_values[typename] = stype

def need_feature_generation(self):
"""Indicates that the current feature has C++ code to generate."""
if self.feature_cmd_params:
Expand Down Expand Up @@ -586,7 +564,7 @@ def make_body_expressions(self, return_type, name, values, is_override):
if need_temp_value:
expr += '{}->GetPointer();'.format(value.name)

if (value.base_type in self.structs_with_handles) or (
if (value.base_type in self.global_structs_with_handles) or (
value.base_type in self.GENERIC_HANDLE_STRUCTS
):
preexpr.append(expr)
Expand Down Expand Up @@ -732,12 +710,12 @@ def make_body_expressions(self, return_type, name, values, is_override):
elif self.is_struct(value.base_type):
# Generate the expression to allocate the output array.
alloc_expr = ''
if value.base_type in self.stype_values:
if value.base_type in self.struct_type_names:
# If this is a struct with sType and pNext fields, we need to initialize them.
# TODO: recreate pNext value read from the capture file.
alloc_expr += 'AllocateOutputData({}, {}{{ {}, nullptr }});'.format(
length_name, value.base_type,
self.stype_values[value.base_type]
self.struct_type_names[value.base_type]
)
else:
alloc_expr += 'AllocateOutputData({});'.format(
Expand All @@ -749,8 +727,8 @@ def make_body_expressions(self, return_type, name, values, is_override):
alloc_expr, paramname=value.name
)
# If this is a struct with handles, we need to add replay mappings for the embedded handles.
if value.base_type in self.structs_with_handles:
if value.base_type in self.structs_with_handle_ptrs:
if value.base_type in self.global_structs_with_handles:
if value.base_type in self.global_structs_with_handle_ptrs:
preexpr.append(
'SetStructArrayHandleLengths<Decoded_{}>({paramname}->GetMetaStructPointer(), {paramname}->GetLength());'
.format(
Expand All @@ -773,8 +751,8 @@ def make_body_expressions(self, return_type, name, values, is_override):
alloc_expr, paramname=value.name
)
# If this is a struct with handles, we need to add replay mappings for the embedded handles.
if value.base_type in self.structs_with_handles:
if value.base_type in self.structs_with_handle_ptrs:
if value.base_type in self.global_structs_with_handles:
if value.base_type in self.global_structs_with_handle_ptrs:
preexpr.append(
'SetStructArrayHandleLengths<Decoded_{}>({paramname}->GetMetaStructPointer(), {paramname}->GetLength());'
.format(
Expand Down Expand Up @@ -890,9 +868,9 @@ def make_body_expressions(self, return_type, name, values, is_override):
)
elif self.is_struct(value.base_type):
# If this is a struct with sType and pNext fields, we need to initialize them.
if value.base_type in self.stype_values:
if value.base_type in self.struct_type_names:
expr += '{paramname}->IsNull() ? nullptr : {paramname}->AllocateOutputData(1, {{ {}, nullptr }});'.format(
self.stype_values[value.base_type],
self.struct_type_names[value.base_type],
paramname=value.name
)
need_initialize_output_pnext_struct = value.name
Expand All @@ -902,9 +880,9 @@ def make_body_expressions(self, return_type, name, values, is_override):
)

# If this is a struct with handles, we need to add replay mappings for the embedded handles.
if value.base_type in self.structs_with_handles:
if value.base_type in self.global_structs_with_handles:
if need_temp_value:
if value.base_type in self.structs_with_handle_ptrs:
if value.base_type in self.global_structs_with_handle_ptrs:
preexpr.append(
'SetStructArrayHandleLengths<Decoded_{}>({paramname}->GetMetaStructPointer(), {paramname}->GetLength());'
.format(
Expand All @@ -924,7 +902,7 @@ def make_body_expressions(self, return_type, name, values, is_override):
)
)
else:
if value.base_type in self.structs_with_handle_ptrs:
if value.base_type in self.global_structs_with_handle_ptrs:
preexpr.append(
'SetStructHandleLengths<Decoded_{}>({paramname}->GetMetaStructPointer(), {paramname}->GetLength());'
.format(
Expand Down

0 comments on commit fac1acb

Please sign in to comment.