Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vulkan Codegen refactor -- next tranche #1916

Merged
merged 32 commits into from
Jan 7, 2025
Merged

Vulkan Codegen refactor -- next tranche #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b3988bf
codegen vulkan: Move vulkan_generator scripts
MarkY-LunarG Oct 29, 2024
1063b84
codegen: Remove class funcs
MarkY-LunarG Oct 30, 2024
c18a9ee
codegen: Global and per-feature struct/union info
MarkY-LunarG Oct 30, 2024
6806bd1
codegen: Add vulkan video to new structure items
MarkY-LunarG Oct 31, 2024
4cab6d8
codegen: Move mappers body items to endFile
MarkY-LunarG Oct 30, 2024
b43b233
codegen: Remove feature break
MarkY-LunarG Oct 31, 2024
13419d6
codegen: Force all process_* to True
MarkY-LunarG Oct 31, 2024
b1e5945
codegen: Remove process_* & feature_break
MarkY-LunarG Oct 31, 2024
a197e95
codegen: Add base_header and extended struct
MarkY-LunarG Oct 31, 2024
d459da8
codegen: Rename base_header to children
MarkY-LunarG Oct 31, 2024
1d94087
codegen: Generate struct type at genStruct time
MarkY-LunarG Oct 31, 2024
9aca626
codegen: Use khronos_base items for pnext gen
MarkY-LunarG Oct 31, 2024
3f354c5
codegen: Add API Data class
MarkY-LunarG Nov 11, 2024
7036f90
codegen: Split processingStruct functionality out
MarkY-LunarG Nov 11, 2024
1200525
codegen: Switch to using structure_type variable
MarkY-LunarG Nov 11, 2024
8f37399
codegen: Start using ApiData content
MarkY-LunarG Oct 31, 2024
904dbe1
codegen: Rename extraVulkanHeaders to extra_headers
MarkY-LunarG Oct 31, 2024
90457d8
codegen: Move pnext encode/decode to separate defs
MarkY-LunarG Nov 11, 2024
97fd694
codegen: Move encode/decode pnext defs into khronos
MarkY-LunarG Nov 11, 2024
6f54992
codegen: Rename includeVulkanHeaders to abstract
MarkY-LunarG Oct 31, 2024
20fdc86
codegen: Make stype functionality generic
MarkY-LunarG Oct 31, 2024
20f0a8d
codegen: Move flag detection logic to Khronos
MarkY-LunarG Nov 12, 2024
cdd61d7
codegen: Add APIData bool types
MarkY-LunarG Nov 1, 2024
3a8b953
codegen: Move some json processing to endFile
MarkY-LunarG Nov 12, 2024
8b30bf7
codegen: Move common struct->json body to Khronos
MarkY-LunarG Nov 12, 2024
7865696
codegen: Update types in khronos struct->json
MarkY-LunarG Nov 12, 2024
6983301
codegen: struct->json body add parent/child func
MarkY-LunarG Nov 12, 2024
80c450d
codegen: Add parent->child to struct->json header
MarkY-LunarG Nov 12, 2024
3b31874
codegen: Move generation to endFile for cmd buf utils
MarkY-LunarG Nov 5, 2024
29ada5d
codegen: Move generation to endFile for Api encoder
MarkY-LunarG Nov 5, 2024
0f4b741
codegen: Update more Vulkan to generate at endFile
MarkY-LunarG Nov 5, 2024
5ab8d35
codegen: Generate vulkan handle wrapping to endFile
MarkY-LunarG Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/generated/generated_decode_pnext_struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
GFXRECON_BEGIN_NAMESPACE(gfxrecon)
GFXRECON_BEGIN_NAMESPACE(decode)

size_t DecodePNextStruct(const uint8_t* parameter_buffer, size_t buffer_size, PNextNode** pNext)
size_t DecodePNextStruct(const uint8_t* parameter_buffer, size_t buffer_size, PNextNode** pNext)
{
assert(pNext != nullptr);

Expand Down
2 changes: 1 addition & 1 deletion framework/generated/generated_encode_pnext_struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void EncodePNextStruct(ParameterEncoder* encoder, const void* value)

auto base = reinterpret_cast<const VkBaseInStructure*>(value);

// Ignore the structures added to the pnext chain by the loader.
// Ignore the structures added to the pNext chain by the loader.
while ((base != nullptr) && ((base->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO) ||
(base->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO)))
{
Expand Down
89 changes: 0 additions & 89 deletions framework/generated/generated_vulkan_replay_dump_resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2229,15 +2229,6 @@ void VulkanReplayDumpResources::Process_vkCmdPushDescriptorSetWithTemplate2(
}
}










void VulkanReplayDumpResources::Process_vkCmdBeginVideoCodingKHR(
const ApiCallInfo& call_info,
PFN_vkCmdBeginVideoCodingKHR func,
Expand Down Expand Up @@ -2365,7 +2356,6 @@ void VulkanReplayDumpResources::Process_vkCmdEndRenderingKHR(
}
}


void VulkanReplayDumpResources::Process_vkCmdSetDeviceMaskKHR(
const ApiCallInfo& call_info,
PFN_vkCmdSetDeviceMaskKHR func,
Expand Down Expand Up @@ -2423,14 +2413,6 @@ void VulkanReplayDumpResources::Process_vkCmdDispatchBaseKHR(
}
}









void VulkanReplayDumpResources::Process_vkCmdPushDescriptorSetKHR(
const ApiCallInfo& call_info,
PFN_vkCmdPushDescriptorSetKHR func,
Expand Down Expand Up @@ -2490,7 +2472,6 @@ void VulkanReplayDumpResources::Process_vkCmdPushDescriptorSetWithTemplateKHR(
}
}


void VulkanReplayDumpResources::Process_vkCmdBeginRenderPass2KHR(
const ApiCallInfo& call_info,
PFN_vkCmdBeginRenderPass2KHR func,
Expand Down Expand Up @@ -2529,17 +2510,6 @@ void VulkanReplayDumpResources::Process_vkCmdEndRenderPass2KHR(
}
}












void VulkanReplayDumpResources::Process_vkCmdDrawIndirectCountKHR(
const ApiCallInfo& call_info,
PFN_vkCmdDrawIndirectCountKHR func,
Expand Down Expand Up @@ -2574,7 +2544,6 @@ void VulkanReplayDumpResources::Process_vkCmdDrawIndexedIndirectCountKHR(
}
}


void VulkanReplayDumpResources::Process_vkCmdSetFragmentShadingRateKHR(
const ApiCallInfo& call_info,
PFN_vkCmdSetFragmentShadingRateKHR func,
Expand Down Expand Up @@ -2654,11 +2623,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetRenderingInputAttachmentIndicesK
}
}






void VulkanReplayDumpResources::Process_vkCmdEncodeVideoKHR(
const ApiCallInfo& call_info,
PFN_vkCmdEncodeVideoKHR func,
Expand Down Expand Up @@ -2989,7 +2953,6 @@ void VulkanReplayDumpResources::Process_vkCmdTraceRaysIndirect2KHR(
}
}


void VulkanReplayDumpResources::Process_vkCmdBindIndexBuffer2KHR(
const ApiCallInfo& call_info,
PFN_vkCmdBindIndexBuffer2KHR func,
Expand All @@ -3005,8 +2968,6 @@ void VulkanReplayDumpResources::Process_vkCmdBindIndexBuffer2KHR(
}
}



void VulkanReplayDumpResources::Process_vkCmdSetLineStippleKHR(
const ApiCallInfo& call_info,
PFN_vkCmdSetLineStippleKHR func,
Expand Down Expand Up @@ -3034,7 +2995,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetLineStippleKHR(
}
}


void VulkanReplayDumpResources::Process_vkCmdBindDescriptorSets2KHR(
const ApiCallInfo& call_info,
PFN_vkCmdBindDescriptorSets2KHR func,
Expand Down Expand Up @@ -3191,8 +3151,6 @@ void VulkanReplayDumpResources::Process_vkCmdBindDescriptorBufferEmbeddedSampler
}
}



void VulkanReplayDumpResources::Process_vkCmdDebugMarkerBeginEXT(
const ApiCallInfo& call_info,
PFN_vkCmdDebugMarkerBeginEXT func,
Expand Down Expand Up @@ -3446,7 +3404,6 @@ void VulkanReplayDumpResources::Process_vkCmdDrawIndirectByteCountEXT(
}
}


void VulkanReplayDumpResources::Process_vkCmdDrawIndirectCountAMD(
const ApiCallInfo& call_info,
PFN_vkCmdDrawIndirectCountAMD func,
Expand Down Expand Up @@ -3509,11 +3466,6 @@ void VulkanReplayDumpResources::Process_vkCmdDrawIndexedIndirectCountAMD(
}
}






void VulkanReplayDumpResources::Process_vkCmdBeginConditionalRenderingEXT(
const ApiCallInfo& call_info,
PFN_vkCmdBeginConditionalRenderingEXT func,
Expand Down Expand Up @@ -3593,11 +3545,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetViewportWScalingNV(
}
}






void VulkanReplayDumpResources::Process_vkCmdSetDiscardRectangleEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetDiscardRectangleEXT func,
Expand Down Expand Up @@ -3678,9 +3625,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetDiscardRectangleModeEXT(
}
}




void VulkanReplayDumpResources::Process_vkCmdBeginDebugUtilsLabelEXT(
const ApiCallInfo& call_info,
PFN_vkCmdBeginDebugUtilsLabelEXT func,
Expand Down Expand Up @@ -3758,7 +3702,6 @@ void VulkanReplayDumpResources::Process_vkCmdInsertDebugUtilsLabelEXT(
}
}


void VulkanReplayDumpResources::Process_vkCmdSetSampleLocationsEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetSampleLocationsEXT func,
Expand All @@ -3785,8 +3728,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetSampleLocationsEXT(
}
}



void VulkanReplayDumpResources::Process_vkCmdBindShadingRateImageNV(
const ApiCallInfo& call_info,
PFN_vkCmdBindShadingRateImageNV func,
Expand Down Expand Up @@ -4000,7 +3941,6 @@ void VulkanReplayDumpResources::Process_vkCmdWriteAccelerationStructuresProperti
}
}


void VulkanReplayDumpResources::Process_vkCmdWriteBufferMarkerAMD(
const ApiCallInfo& call_info,
PFN_vkCmdWriteBufferMarkerAMD func,
Expand Down Expand Up @@ -4059,7 +3999,6 @@ void VulkanReplayDumpResources::Process_vkCmdWriteBufferMarker2AMD(
}
}


void VulkanReplayDumpResources::Process_vkCmdDrawMeshTasksNV(
const ApiCallInfo& call_info,
PFN_vkCmdDrawMeshTasksNV func,
Expand Down Expand Up @@ -4310,15 +4249,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetPerformanceOverrideINTEL(
}
}










void VulkanReplayDumpResources::Process_vkCmdSetLineStippleEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetLineStippleEXT func,
Expand Down Expand Up @@ -4346,7 +4276,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetLineStippleEXT(
}
}


void VulkanReplayDumpResources::Process_vkCmdSetCullModeEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetCullModeEXT func,
Expand Down Expand Up @@ -4670,8 +4599,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetStencilOpEXT(
}
}



void VulkanReplayDumpResources::Process_vkCmdPreprocessGeneratedCommandsNV(
const ApiCallInfo& call_info,
PFN_vkCmdPreprocessGeneratedCommandsNV func,
Expand Down Expand Up @@ -4779,8 +4706,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetDepthBias2EXT(
}
}



void VulkanReplayDumpResources::Process_vkCmdSetFragmentShadingRateEnumNV(
const ApiCallInfo& call_info,
PFN_vkCmdSetFragmentShadingRateEnumNV func,
Expand Down Expand Up @@ -4808,9 +4733,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetFragmentShadingRateEnumNV(
}
}




void VulkanReplayDumpResources::Process_vkCmdSetVertexInputEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetVertexInputEXT func,
Expand All @@ -4826,8 +4748,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetVertexInputEXT(
}
}



void VulkanReplayDumpResources::Process_vkCmdBindInvocationMaskHUAWEI(
const ApiCallInfo& call_info,
PFN_vkCmdBindInvocationMaskHUAWEI func,
Expand Down Expand Up @@ -4855,7 +4775,6 @@ void VulkanReplayDumpResources::Process_vkCmdBindInvocationMaskHUAWEI(
}
}


void VulkanReplayDumpResources::Process_vkCmdSetPatchControlPointsEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetPatchControlPointsEXT func,
Expand Down Expand Up @@ -4986,7 +4905,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetPrimitiveRestartEnableEXT(
}
}


void VulkanReplayDumpResources::Process_vkCmdSetColorWriteEnableEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetColorWriteEnableEXT func,
Expand Down Expand Up @@ -5265,8 +5183,6 @@ void VulkanReplayDumpResources::Process_vkCmdDrawClusterIndirectHUAWEI(
}
}



void VulkanReplayDumpResources::Process_vkCmdUpdatePipelineIndirectBufferNV(
const ApiCallInfo& call_info,
PFN_vkCmdUpdatePipelineIndirectBufferNV func,
Expand Down Expand Up @@ -6112,7 +6028,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetCoverageReductionModeNV(
}
}


void VulkanReplayDumpResources::Process_vkCmdOpticalFlowExecuteNV(
const ApiCallInfo& call_info,
PFN_vkCmdOpticalFlowExecuteNV func,
Expand Down Expand Up @@ -6140,7 +6055,6 @@ void VulkanReplayDumpResources::Process_vkCmdOpticalFlowExecuteNV(
}
}


void VulkanReplayDumpResources::Process_vkCmdBindShadersEXT(
const ApiCallInfo& call_info,
PFN_vkCmdBindShadersEXT func,
Expand Down Expand Up @@ -6196,8 +6110,6 @@ void VulkanReplayDumpResources::Process_vkCmdSetDepthClampRangeEXT(
}
}



void VulkanReplayDumpResources::Process_vkCmdSetAttachmentFeedbackLoopEnableEXT(
const ApiCallInfo& call_info,
PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT func,
Expand Down Expand Up @@ -6278,7 +6190,6 @@ void VulkanReplayDumpResources::Process_vkCmdExecuteGeneratedCommandsEXT(
}
}


void VulkanReplayDumpResources::Process_vkCmdBuildAccelerationStructuresKHR(
const ApiCallInfo& call_info,
PFN_vkCmdBuildAccelerationStructuresKHR func,
Expand Down
Loading
Loading