From f7940ecfc0025a67386d6208cdca9753a657d8bf Mon Sep 17 00:00:00 2001 From: Arno Date: Tue, 10 Dec 2024 10:36:51 +0100 Subject: [PATCH] gpuav: Rename gpu folder to gpuav Also rename `cmd_validation` to `validation_cmd`, a name that actually describes one of GPU-AV's feature: inserting validation commands --- BUILD.gn | 172 +++++++++--------- layers/CMakeLists.txt | 112 ++++++------ layers/chassis/dispatch_object.h | 2 +- layers/chassis/validation_object.h | 2 +- layers/{gpu => gpuav}/core/gpuav.h | 6 +- layers/{gpu => gpuav}/core/gpuav_constants.h | 0 layers/{gpu => gpuav}/core/gpuav_record.cpp | 20 +- layers/{gpu => gpuav}/core/gpuav_settings.h | 0 layers/{gpu => gpuav}/core/gpuav_setup.cpp | 10 +- .../debug_printf/debug_printf.cpp | 12 +- .../debug_printf/debug_printf.h | 0 .../gpuav_descriptor_set.cpp | 10 +- .../gpuav_descriptor_set.h | 4 +- .../gpuav_descriptor_validation.cpp | 8 +- .../gpuav_descriptor_validation.h | 0 .../gpuav_image_layout.cpp | 8 +- .../gpuav_image_layout.h | 2 +- .../error_message/gpuav_vuids.cpp | 2 +- .../error_message/gpuav_vuids.h | 2 +- .../instrumentation/gpuav_instrumentation.cpp | 47 +++-- .../instrumentation/gpuav_instrumentation.h | 0 .../gpuav_shader_instrumentor.cpp | 8 +- .../gpuav_shader_instrumentor.h | 2 +- .../resources/gpuav_shader_resources.h | 6 +- .../resources/gpuav_state_trackers.cpp | 18 +- .../resources/gpuav_state_trackers.h | 4 +- .../resources/gpuav_vulkan_objects.cpp | 4 +- .../resources/gpuav_vulkan_objects.h | 0 layers/{gpu => gpuav}/shaders/README.md | 0 .../shaders/gpuav_error_codes.h | 0 .../shaders/gpuav_error_header.h | 0 .../shaders/gpuav_shaders_constants.h | 0 .../buffer_device_address.comp | 0 .../instrumentation/common_descriptor_sets.h | 0 .../descriptor_class_general_buffer.comp | 0 .../descriptor_class_texel_buffer.comp | 0 .../descriptor_indexing_oob_bindless.comp | 0 .../descriptor_indexing_oob_non_bindless.comp | 0 .../post_process_descriptor_index.comp | 0 .../shaders/instrumentation/ray_query.comp | 0 .../shaders/validation_cmd}/common.h | 0 .../validation_cmd}/copy_buffer_to_image.comp | 0 .../shaders/validation_cmd}/count_buffer.comp | 0 .../shaders/validation_cmd}/dispatch.comp | 0 .../shaders/validation_cmd}/draw_indexed.comp | 0 .../draw_indexed_indirect_index_buffer.comp | 0 .../draw_indexed_indirect_vertex_buffer.comp | 0 .../validation_cmd}/draw_mesh_indirect.comp | 0 .../shaders/validation_cmd}/draw_push_data.h | 0 .../validation_cmd}/first_instance.comp | 0 .../shaders/validation_cmd}/trace_rays.rgen | 0 layers/{gpu => gpuav}/spirv/CMakeLists.txt | 0 layers/{gpu => gpuav}/spirv/README.md | 0 .../spirv/buffer_device_address_pass.cpp | 0 .../spirv/buffer_device_address_pass.h | 0 .../spirv/debug_printf_pass.cpp | 2 +- .../{gpu => gpuav}/spirv/debug_printf_pass.h | 0 .../descriptor_class_general_buffer_pass.cpp | 2 +- .../descriptor_class_general_buffer_pass.h | 0 .../descriptor_class_texel_buffer_pass.cpp | 2 +- .../descriptor_class_texel_buffer_pass.h | 0 .../spirv/descriptor_indexing_oob_pass.cpp | 2 +- .../spirv/descriptor_indexing_oob_pass.h | 0 .../spirv/function_basic_block.cpp | 0 .../spirv/function_basic_block.h | 0 .../inject_conditional_function_pass.cpp | 0 .../spirv/inject_conditional_function_pass.h | 0 .../spirv/inject_function_pass.cpp | 0 .../spirv/inject_function_pass.h | 0 layers/{gpu => gpuav}/spirv/instruction.cpp | 0 layers/{gpu => gpuav}/spirv/instruction.h | 0 layers/{gpu => gpuav}/spirv/interface.h | 0 layers/{gpu => gpuav}/spirv/link.h | 0 layers/{gpu => gpuav}/spirv/module.cpp | 2 +- layers/{gpu => gpuav}/spirv/module.h | 0 layers/{gpu => gpuav}/spirv/pass.cpp | 2 +- layers/{gpu => gpuav}/spirv/pass.h | 0 .../post_process_descriptor_indexing.cpp | 2 +- .../spirv/post_process_descriptor_indexing.h | 0 .../{gpu => gpuav}/spirv/ray_query_pass.cpp | 0 layers/{gpu => gpuav}/spirv/ray_query_pass.h | 0 layers/{gpu => gpuav}/spirv/type_manager.cpp | 0 layers/{gpu => gpuav}/spirv/type_manager.h | 0 .../gpuav_copy_buffer_to_image.cpp | 16 +- .../gpuav_copy_buffer_to_image.h | 0 .../validation_cmd}/gpuav_dispatch.cpp | 95 +++++----- .../validation_cmd}/gpuav_dispatch.h | 0 .../validation_cmd}/gpuav_draw.cpp | 58 +++--- .../validation_cmd}/gpuav_draw.h | 0 .../validation_cmd}/gpuav_trace_rays.cpp | 18 +- .../validation_cmd}/gpuav_trace_rays.h | 0 .../gpuav_validation_cmd_common.cpp} | 10 +- .../gpuav_validation_cmd_common.h} | 0 layers/layer_options.cpp | 2 +- layers/vulkan/generated/dispatch_object.cpp | 2 +- layers/vulkan/generated/dispatch_vector.cpp | 2 +- ...idation_cmd_copy_buffer_to_image_comp.cpp} | 6 +- ...alidation_cmd_copy_buffer_to_image_comp.h} | 4 +- ...p => validation_cmd_count_buffer_comp.cpp} | 6 +- ...p.h => validation_cmd_count_buffer_comp.h} | 4 +- ...p.cpp => validation_cmd_dispatch_comp.cpp} | 6 +- ..._comp.h => validation_cmd_dispatch_comp.h} | 4 +- ...p => validation_cmd_draw_indexed_comp.cpp} | 6 +- ...p.h => validation_cmd_draw_indexed_comp.h} | 4 +- ...aw_indexed_indirect_index_buffer_comp.cpp} | 6 +- ...draw_indexed_indirect_index_buffer_comp.h} | 4 +- ...w_indexed_indirect_vertex_buffer_comp.cpp} | 6 +- ...raw_indexed_indirect_vertex_buffer_comp.h} | 4 +- ...alidation_cmd_draw_mesh_indirect_comp.cpp} | 6 +- ... validation_cmd_draw_mesh_indirect_comp.h} | 4 +- ...=> validation_cmd_first_instance_comp.cpp} | 6 +- ...h => validation_cmd_first_instance_comp.h} | 4 +- ...cpp => validation_cmd_trace_rays_rgen.cpp} | 6 +- ...gen.h => validation_cmd_trace_rays_rgen.h} | 4 +- scripts/generate_source.py | 36 ++-- scripts/generate_spirv.py | 10 +- .../generators/dispatch_object_generator.py | 2 +- .../generators/dispatch_vector_generator.py | 2 +- scripts/vk_validation_stats.py | 12 +- tests/spirv/CMakeLists.txt | 2 +- ...gpu_av_descriptor_class_general_buffer.cpp | 2 +- tests/unit/gpu_av_descriptor_indexing.cpp | 2 +- tests/unit/gpu_av_positive.cpp | 2 +- tests/unit/gpu_av_ray_query.cpp | 2 +- 124 files changed, 419 insertions(+), 421 deletions(-) rename layers/{gpu => gpuav}/core/gpuav.h (99%) rename layers/{gpu => gpuav}/core/gpuav_constants.h (100%) rename layers/{gpu => gpuav}/core/gpuav_record.cpp (99%) rename layers/{gpu => gpuav}/core/gpuav_settings.h (100%) rename layers/{gpu => gpuav}/core/gpuav_setup.cpp (99%) rename layers/{gpu => gpuav}/debug_printf/debug_printf.cpp (98%) rename layers/{gpu => gpuav}/debug_printf/debug_printf.h (100%) rename layers/{gpu => gpuav}/descriptor_validation/gpuav_descriptor_set.cpp (98%) rename layers/{gpu => gpuav}/descriptor_validation/gpuav_descriptor_set.h (97%) rename layers/{gpu => gpuav}/descriptor_validation/gpuav_descriptor_validation.cpp (98%) rename layers/{gpu => gpuav}/descriptor_validation/gpuav_descriptor_validation.h (100%) rename layers/{gpu => gpuav}/descriptor_validation/gpuav_image_layout.cpp (99%) rename layers/{gpu => gpuav}/descriptor_validation/gpuav_image_layout.h (98%) rename layers/{gpu => gpuav}/error_message/gpuav_vuids.cpp (99%) rename layers/{gpu => gpuav}/error_message/gpuav_vuids.h (98%) rename layers/{gpu => gpuav}/instrumentation/gpuav_instrumentation.cpp (96%) rename layers/{gpu => gpuav}/instrumentation/gpuav_instrumentation.h (100%) rename layers/{gpu => gpuav}/instrumentation/gpuav_shader_instrumentor.cpp (99%) rename layers/{gpu => gpuav}/instrumentation/gpuav_shader_instrumentor.h (99%) rename layers/{gpu => gpuav}/resources/gpuav_shader_resources.h (97%) rename layers/{gpu => gpuav}/resources/gpuav_state_trackers.cpp (98%) rename layers/{gpu => gpuav}/resources/gpuav_state_trackers.h (98%) rename layers/{gpu => gpuav}/resources/gpuav_vulkan_objects.cpp (99%) rename layers/{gpu => gpuav}/resources/gpuav_vulkan_objects.h (100%) rename layers/{gpu => gpuav}/shaders/README.md (100%) rename layers/{gpu => gpuav}/shaders/gpuav_error_codes.h (100%) rename layers/{gpu => gpuav}/shaders/gpuav_error_header.h (100%) rename layers/{gpu => gpuav}/shaders/gpuav_shaders_constants.h (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/buffer_device_address.comp (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/common_descriptor_sets.h (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/descriptor_class_general_buffer.comp (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/descriptor_class_texel_buffer.comp (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/descriptor_indexing_oob_bindless.comp (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/descriptor_indexing_oob_non_bindless.comp (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/post_process_descriptor_index.comp (100%) rename layers/{gpu => gpuav}/shaders/instrumentation/ray_query.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/common.h (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/copy_buffer_to_image.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/count_buffer.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/dispatch.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/draw_indexed.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/draw_indexed_indirect_index_buffer.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/draw_indexed_indirect_vertex_buffer.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/draw_mesh_indirect.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/draw_push_data.h (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/first_instance.comp (100%) rename layers/{gpu/shaders/cmd_validation => gpuav/shaders/validation_cmd}/trace_rays.rgen (100%) rename layers/{gpu => gpuav}/spirv/CMakeLists.txt (100%) rename layers/{gpu => gpuav}/spirv/README.md (100%) rename layers/{gpu => gpuav}/spirv/buffer_device_address_pass.cpp (100%) rename layers/{gpu => gpuav}/spirv/buffer_device_address_pass.h (100%) rename layers/{gpu => gpuav}/spirv/debug_printf_pass.cpp (99%) rename layers/{gpu => gpuav}/spirv/debug_printf_pass.h (100%) rename layers/{gpu => gpuav}/spirv/descriptor_class_general_buffer_pass.cpp (99%) rename layers/{gpu => gpuav}/spirv/descriptor_class_general_buffer_pass.h (100%) rename layers/{gpu => gpuav}/spirv/descriptor_class_texel_buffer_pass.cpp (99%) rename layers/{gpu => gpuav}/spirv/descriptor_class_texel_buffer_pass.h (100%) rename layers/{gpu => gpuav}/spirv/descriptor_indexing_oob_pass.cpp (99%) rename layers/{gpu => gpuav}/spirv/descriptor_indexing_oob_pass.h (100%) rename layers/{gpu => gpuav}/spirv/function_basic_block.cpp (100%) rename layers/{gpu => gpuav}/spirv/function_basic_block.h (100%) rename layers/{gpu => gpuav}/spirv/inject_conditional_function_pass.cpp (100%) rename layers/{gpu => gpuav}/spirv/inject_conditional_function_pass.h (100%) rename layers/{gpu => gpuav}/spirv/inject_function_pass.cpp (100%) rename layers/{gpu => gpuav}/spirv/inject_function_pass.h (100%) rename layers/{gpu => gpuav}/spirv/instruction.cpp (100%) rename layers/{gpu => gpuav}/spirv/instruction.h (100%) rename layers/{gpu => gpuav}/spirv/interface.h (100%) rename layers/{gpu => gpuav}/spirv/link.h (100%) rename layers/{gpu => gpuav}/spirv/module.cpp (99%) rename layers/{gpu => gpuav}/spirv/module.h (100%) rename layers/{gpu => gpuav}/spirv/pass.cpp (99%) rename layers/{gpu => gpuav}/spirv/pass.h (100%) rename layers/{gpu => gpuav}/spirv/post_process_descriptor_indexing.cpp (99%) rename layers/{gpu => gpuav}/spirv/post_process_descriptor_indexing.h (100%) rename layers/{gpu => gpuav}/spirv/ray_query_pass.cpp (100%) rename layers/{gpu => gpuav}/spirv/ray_query_pass.h (100%) rename layers/{gpu => gpuav}/spirv/type_manager.cpp (100%) rename layers/{gpu => gpuav}/spirv/type_manager.h (100%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_copy_buffer_to_image.cpp (97%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_copy_buffer_to_image.h (100%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_dispatch.cpp (77%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_dispatch.h (100%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_draw.cpp (98%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_draw.h (100%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_trace_rays.cpp (97%) rename layers/{gpu/cmd_validation => gpuav/validation_cmd}/gpuav_trace_rays.h (100%) rename layers/{gpu/cmd_validation/gpuav_cmd_validation_common.cpp => gpuav/validation_cmd/gpuav_validation_cmd_common.cpp} (96%) rename layers/{gpu/cmd_validation/gpuav_cmd_validation_common.h => gpuav/validation_cmd/gpuav_validation_cmd_common.h} (100%) rename layers/vulkan/generated/{cmd_validation_copy_buffer_to_image_comp.cpp => validation_cmd_copy_buffer_to_image_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_copy_buffer_to_image_comp.h => validation_cmd_copy_buffer_to_image_comp.h} (89%) rename layers/vulkan/generated/{cmd_validation_count_buffer_comp.cpp => validation_cmd_count_buffer_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_count_buffer_comp.h => validation_cmd_count_buffer_comp.h} (90%) rename layers/vulkan/generated/{cmd_validation_dispatch_comp.cpp => validation_cmd_dispatch_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_dispatch_comp.h => validation_cmd_dispatch_comp.h} (90%) rename layers/vulkan/generated/{cmd_validation_draw_indexed_comp.cpp => validation_cmd_draw_indexed_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_draw_indexed_comp.h => validation_cmd_draw_indexed_comp.h} (90%) rename layers/vulkan/generated/{cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp => validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp} (98%) rename layers/vulkan/generated/{cmd_validation_draw_indexed_indirect_index_buffer_comp.h => validation_cmd_draw_indexed_indirect_index_buffer_comp.h} (89%) rename layers/vulkan/generated/{cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp => validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h => validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h} (89%) rename layers/vulkan/generated/{cmd_validation_draw_mesh_indirect_comp.cpp => validation_cmd_draw_mesh_indirect_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_draw_mesh_indirect_comp.h => validation_cmd_draw_mesh_indirect_comp.h} (89%) rename layers/vulkan/generated/{cmd_validation_first_instance_comp.cpp => validation_cmd_first_instance_comp.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_first_instance_comp.h => validation_cmd_first_instance_comp.h} (89%) rename layers/vulkan/generated/{cmd_validation_trace_rays_rgen.cpp => validation_cmd_trace_rays_rgen.cpp} (99%) rename layers/vulkan/generated/{cmd_validation_trace_rays_rgen.h => validation_cmd_trace_rays_rgen.h} (90%) diff --git a/BUILD.gn b/BUILD.gn index 0a31c7b9c6e..d4b9ab863f7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -158,74 +158,74 @@ vvl_sources = [ "layers/external/vma/vma.cpp", "layers/external/vma/vma.h", "layers/external/xxhash.h", - "layers/gpu/cmd_validation/gpuav_cmd_validation_common.cpp", - "layers/gpu/cmd_validation/gpuav_cmd_validation_common.h", - "layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.cpp", - "layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.h", - "layers/gpu/cmd_validation/gpuav_dispatch.cpp", - "layers/gpu/cmd_validation/gpuav_dispatch.h", - "layers/gpu/cmd_validation/gpuav_draw.cpp", - "layers/gpu/cmd_validation/gpuav_draw.h", - "layers/gpu/cmd_validation/gpuav_trace_rays.cpp", - "layers/gpu/cmd_validation/gpuav_trace_rays.h", - "layers/gpu/core/gpuav_settings.h", - "layers/gpu/core/gpuav.h", - "layers/gpu/core/gpuav_constants.h", - "layers/gpu/core/gpuav_record.cpp", - "layers/gpu/core/gpuav_setup.cpp", - "layers/gpu/debug_printf/debug_printf.cpp", - "layers/gpu/debug_printf/debug_printf.h", - "layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp", - "layers/gpu/descriptor_validation/gpuav_descriptor_set.h", - "layers/gpu/descriptor_validation/gpuav_descriptor_validation.cpp", - "layers/gpu/descriptor_validation/gpuav_descriptor_validation.h", - "layers/gpu/descriptor_validation/gpuav_image_layout.cpp", - "layers/gpu/descriptor_validation/gpuav_image_layout.h", - "layers/gpu/error_message/gpuav_vuids.cpp", - "layers/gpu/error_message/gpuav_vuids.h", - "layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp", - "layers/gpu/instrumentation/gpuav_shader_instrumentor.h", - "layers/gpu/instrumentation/gpuav_instrumentation.cpp", - "layers/gpu/instrumentation/gpuav_instrumentation.h", - "layers/gpu/resources/gpuav_vulkan_objects.cpp", - "layers/gpu/resources/gpuav_vulkan_objects.h", - "layers/gpu/resources/gpuav_shader_resources.h", - "layers/gpu/resources/gpuav_state_trackers.cpp", - "layers/gpu/resources/gpuav_state_trackers.h", - "layers/gpu/shaders/cmd_validation/draw_push_data.h", - "layers/gpu/shaders/gpuav_error_codes.h", - "layers/gpu/shaders/gpuav_error_header.h", - "layers/gpu/shaders/gpuav_shaders_constants.h", - "layers/gpu/spirv/descriptor_indexing_oob_pass.cpp", - "layers/gpu/spirv/descriptor_indexing_oob_pass.h", - "layers/gpu/spirv/descriptor_class_general_buffer_pass.cpp", - "layers/gpu/spirv/descriptor_class_general_buffer_pass.h", - "layers/gpu/spirv/descriptor_class_texel_buffer_pass.cpp", - "layers/gpu/spirv/descriptor_class_texel_buffer_pass.h", - "layers/gpu/spirv/buffer_device_address_pass.cpp", - "layers/gpu/spirv/buffer_device_address_pass.h", - "layers/gpu/spirv/post_process_descriptor_indexing.cpp", - "layers/gpu/spirv/post_process_descriptor_indexing.h", - "layers/gpu/spirv/function_basic_block.cpp", - "layers/gpu/spirv/function_basic_block.h", - "layers/gpu/spirv/instruction.cpp", - "layers/gpu/spirv/instruction.h", - "layers/gpu/spirv/interface.h", - "layers/gpu/spirv/link.h", - "layers/gpu/spirv/module.cpp", - "layers/gpu/spirv/module.h", - "layers/gpu/spirv/inject_conditional_function_pass.cpp", - "layers/gpu/spirv/inject_conditional_function_pass.h", - "layers/gpu/spirv/inject_function_pass.cpp", - "layers/gpu/spirv/inject_function_pass.h", - "layers/gpu/spirv/pass.cpp", - "layers/gpu/spirv/pass.h", - "layers/gpu/spirv/ray_query_pass.cpp", - "layers/gpu/spirv/ray_query_pass.h", - "layers/gpu/spirv/debug_printf_pass.cpp", - "layers/gpu/spirv/debug_printf_pass.h", - "layers/gpu/spirv/type_manager.cpp", - "layers/gpu/spirv/type_manager.h", + "layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp", + "layers/gpuav/validation_cmd/gpuav_validation_cmd_common.h", + "layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp", + "layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.h", + "layers/gpuav/validation_cmd/gpuav_dispatch.cpp", + "layers/gpuav/validation_cmd/gpuav_dispatch.h", + "layers/gpuav/validation_cmd/gpuav_draw.cpp", + "layers/gpuav/validation_cmd/gpuav_draw.h", + "layers/gpuav/validation_cmd/gpuav_trace_rays.cpp", + "layers/gpuav/validation_cmd/gpuav_trace_rays.h", + "layers/gpuav/core/gpuav_settings.h", + "layers/gpuav/core/gpuav.h", + "layers/gpuav/core/gpuav_constants.h", + "layers/gpuav/core/gpuav_record.cpp", + "layers/gpuav/core/gpuav_setup.cpp", + "layers/gpuav/debug_printf/debug_printf.cpp", + "layers/gpuav/debug_printf/debug_printf.h", + "layers/gpuav/descriptor_validation/gpuav_descriptor_set.cpp", + "layers/gpuav/descriptor_validation/gpuav_descriptor_set.h", + "layers/gpuav/descriptor_validation/gpuav_descriptor_validation.cpp", + "layers/gpuav/descriptor_validation/gpuav_descriptor_validation.h", + "layers/gpuav/descriptor_validation/gpuav_image_layout.cpp", + "layers/gpuav/descriptor_validation/gpuav_image_layout.h", + "layers/gpuav/error_message/gpuav_vuids.cpp", + "layers/gpuav/error_message/gpuav_vuids.h", + "layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp", + "layers/gpuav/instrumentation/gpuav_shader_instrumentor.h", + "layers/gpuav/instrumentation/gpuav_instrumentation.cpp", + "layers/gpuav/instrumentation/gpuav_instrumentation.h", + "layers/gpuav/resources/gpuav_vulkan_objects.cpp", + "layers/gpuav/resources/gpuav_vulkan_objects.h", + "layers/gpuav/resources/gpuav_shader_resources.h", + "layers/gpuav/resources/gpuav_state_trackers.cpp", + "layers/gpuav/resources/gpuav_state_trackers.h", + "layers/gpuav/shaders/validation_cmd/draw_push_data.h", + "layers/gpuav/shaders/gpuav_error_codes.h", + "layers/gpuav/shaders/gpuav_error_header.h", + "layers/gpuav/shaders/gpuav_shaders_constants.h", + "layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp", + "layers/gpuav/spirv/descriptor_indexing_oob_pass.h", + "layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp", + "layers/gpuav/spirv/descriptor_class_general_buffer_pass.h", + "layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp", + "layers/gpuav/spirv/descriptor_class_texel_buffer_pass.h", + "layers/gpuav/spirv/buffer_device_address_pass.cpp", + "layers/gpuav/spirv/buffer_device_address_pass.h", + "layers/gpuav/spirv/post_process_descriptor_indexing.cpp", + "layers/gpuav/spirv/post_process_descriptor_indexing.h", + "layers/gpuav/spirv/function_basic_block.cpp", + "layers/gpuav/spirv/function_basic_block.h", + "layers/gpuav/spirv/instruction.cpp", + "layers/gpuav/spirv/instruction.h", + "layers/gpuav/spirv/interface.h", + "layers/gpuav/spirv/link.h", + "layers/gpuav/spirv/module.cpp", + "layers/gpuav/spirv/module.h", + "layers/gpuav/spirv/inject_conditional_function_pass.cpp", + "layers/gpuav/spirv/inject_conditional_function_pass.h", + "layers/gpuav/spirv/inject_function_pass.cpp", + "layers/gpuav/spirv/inject_function_pass.h", + "layers/gpuav/spirv/pass.cpp", + "layers/gpuav/spirv/pass.h", + "layers/gpuav/spirv/ray_query_pass.cpp", + "layers/gpuav/spirv/ray_query_pass.h", + "layers/gpuav/spirv/debug_printf_pass.cpp", + "layers/gpuav/spirv/debug_printf_pass.h", + "layers/gpuav/spirv/type_manager.cpp", + "layers/gpuav/spirv/type_manager.h", "layers/layer_options.cpp", "layers/layer_options.h", "layers/object_tracker/object_lifetime_validation.h", @@ -354,24 +354,24 @@ vvl_sources = [ "layers/vulkan/generated/best_practices.cpp", "layers/vulkan/generated/best_practices.h", "layers/vulkan/generated/chassis.cpp", - "layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.cpp", - "layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.h", - "layers/vulkan/generated/cmd_validation_dispatch_comp.cpp", - "layers/vulkan/generated/cmd_validation_dispatch_comp.h", - "layers/vulkan/generated/cmd_validation_count_buffer_comp.h", - "layers/vulkan/generated/cmd_validation_count_buffer_comp.cpp", - "layers/vulkan/generated/cmd_validation_first_instance_comp.h", - "layers/vulkan/generated/cmd_validation_first_instance_comp.cpp", - "layers/vulkan/generated/cmd_validation_draw_indexed_comp.h", - "layers/vulkan/generated/cmd_validation_draw_indexed_comp.cpp", - "layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.h", - "layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp", - "layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h", - "layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp", - "layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.h", - "layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.cpp", - "layers/vulkan/generated/cmd_validation_trace_rays_rgen.cpp", - "layers/vulkan/generated/cmd_validation_trace_rays_rgen.h", + "layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp", + "layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h", + "layers/vulkan/generated/validation_cmd_dispatch_comp.cpp", + "layers/vulkan/generated/validation_cmd_dispatch_comp.h", + "layers/vulkan/generated/validation_cmd_count_buffer_comp.h", + "layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp", + "layers/vulkan/generated/validation_cmd_first_instance_comp.h", + "layers/vulkan/generated/validation_cmd_first_instance_comp.cpp", + "layers/vulkan/generated/validation_cmd_draw_indexed_comp.h", + "layers/vulkan/generated/validation_cmd_draw_indexed_comp.cpp", + "layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h", + "layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp", + "layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h", + "layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp", + "layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h", + "layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp", + "layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp", + "layers/vulkan/generated/validation_cmd_trace_rays_rgen.h", "layers/vulkan/generated/command_validation.cpp", "layers/vulkan/generated/device_features.cpp", "layers/vulkan/generated/device_features.h", diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 69d04acb9a3..19b3b8735f8 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -113,7 +113,7 @@ elseif(MSVC) ) endif() -add_subdirectory(gpu/spirv) +add_subdirectory(gpuav/spirv) if(IOS) add_library(vvl SHARED) @@ -218,61 +218,61 @@ target_sources(vvl PRIVATE ${API_TYPE}/generated/thread_safety_counter_bodies.h ${API_TYPE}/generated/thread_safety_counter_definitions.h ${API_TYPE}/generated/thread_safety_counter_instances.h - ${API_TYPE}/generated/cmd_validation_copy_buffer_to_image_comp.h - ${API_TYPE}/generated/cmd_validation_copy_buffer_to_image_comp.cpp - ${API_TYPE}/generated/cmd_validation_dispatch_comp.h - ${API_TYPE}/generated/cmd_validation_dispatch_comp.cpp - ${API_TYPE}/generated/cmd_validation_count_buffer_comp.h - ${API_TYPE}/generated/cmd_validation_count_buffer_comp.cpp - ${API_TYPE}/generated/cmd_validation_first_instance_comp.h - ${API_TYPE}/generated/cmd_validation_first_instance_comp.cpp - ${API_TYPE}/generated/cmd_validation_draw_indexed_comp.h - ${API_TYPE}/generated/cmd_validation_draw_indexed_comp.cpp - ${API_TYPE}/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.h - ${API_TYPE}/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp - ${API_TYPE}/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h - ${API_TYPE}/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp - ${API_TYPE}/generated/cmd_validation_draw_mesh_indirect_comp.h - ${API_TYPE}/generated/cmd_validation_draw_mesh_indirect_comp.cpp - ${API_TYPE}/generated/cmd_validation_trace_rays_rgen.h - ${API_TYPE}/generated/cmd_validation_trace_rays_rgen.cpp - gpu/core/gpuav_settings.h - gpu/core/gpuav_constants.h - gpu/cmd_validation/gpuav_cmd_validation_common.h - gpu/cmd_validation/gpuav_cmd_validation_common.cpp - gpu/cmd_validation/gpuav_draw.h - gpu/cmd_validation/gpuav_draw.cpp - gpu/cmd_validation/gpuav_dispatch.h - gpu/cmd_validation/gpuav_dispatch.cpp - gpu/cmd_validation/gpuav_trace_rays.h - gpu/cmd_validation/gpuav_trace_rays.cpp - gpu/cmd_validation/gpuav_copy_buffer_to_image.h - gpu/cmd_validation/gpuav_copy_buffer_to_image.cpp - gpu/descriptor_validation/gpuav_descriptor_validation.h - gpu/descriptor_validation/gpuav_descriptor_validation.cpp - gpu/descriptor_validation/gpuav_descriptor_set.cpp - gpu/descriptor_validation/gpuav_descriptor_set.h - gpu/descriptor_validation/gpuav_image_layout.h - gpu/descriptor_validation/gpuav_image_layout.cpp - gpu/core/gpuav.h - gpu/core/gpuav_record.cpp - gpu/core/gpuav_setup.cpp - gpu/debug_printf/debug_printf.cpp - gpu/debug_printf/debug_printf.h - gpu/error_message/gpuav_vuids.cpp - gpu/error_message/gpuav_vuids.h - gpu/instrumentation/gpuav_shader_instrumentor.cpp - gpu/instrumentation/gpuav_shader_instrumentor.h - gpu/instrumentation/gpuav_instrumentation.h - gpu/instrumentation/gpuav_instrumentation.cpp - gpu/resources/gpuav_state_trackers.cpp - gpu/resources/gpuav_state_trackers.h - gpu/resources/gpuav_shader_resources.h - gpu/resources/gpuav_vulkan_objects.h - gpu/resources/gpuav_vulkan_objects.cpp - gpu/shaders/gpuav_error_codes.h - gpu/shaders/gpuav_error_header.h - gpu/shaders/gpuav_shaders_constants.h + ${API_TYPE}/generated/validation_cmd_copy_buffer_to_image_comp.h + ${API_TYPE}/generated/validation_cmd_copy_buffer_to_image_comp.cpp + ${API_TYPE}/generated/validation_cmd_dispatch_comp.h + ${API_TYPE}/generated/validation_cmd_dispatch_comp.cpp + ${API_TYPE}/generated/validation_cmd_count_buffer_comp.h + ${API_TYPE}/generated/validation_cmd_count_buffer_comp.cpp + ${API_TYPE}/generated/validation_cmd_first_instance_comp.h + ${API_TYPE}/generated/validation_cmd_first_instance_comp.cpp + ${API_TYPE}/generated/validation_cmd_draw_indexed_comp.h + ${API_TYPE}/generated/validation_cmd_draw_indexed_comp.cpp + ${API_TYPE}/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h + ${API_TYPE}/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp + ${API_TYPE}/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h + ${API_TYPE}/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp + ${API_TYPE}/generated/validation_cmd_draw_mesh_indirect_comp.h + ${API_TYPE}/generated/validation_cmd_draw_mesh_indirect_comp.cpp + ${API_TYPE}/generated/validation_cmd_trace_rays_rgen.h + ${API_TYPE}/generated/validation_cmd_trace_rays_rgen.cpp + gpuav/core/gpuav_settings.h + gpuav/core/gpuav_constants.h + gpuav/validation_cmd/gpuav_validation_cmd_common.h + gpuav/validation_cmd/gpuav_validation_cmd_common.cpp + gpuav/validation_cmd/gpuav_draw.h + gpuav/validation_cmd/gpuav_draw.cpp + gpuav/validation_cmd/gpuav_dispatch.h + gpuav/validation_cmd/gpuav_dispatch.cpp + gpuav/validation_cmd/gpuav_trace_rays.h + gpuav/validation_cmd/gpuav_trace_rays.cpp + gpuav/validation_cmd/gpuav_copy_buffer_to_image.h + gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp + gpuav/descriptor_validation/gpuav_descriptor_validation.h + gpuav/descriptor_validation/gpuav_descriptor_validation.cpp + gpuav/descriptor_validation/gpuav_descriptor_set.cpp + gpuav/descriptor_validation/gpuav_descriptor_set.h + gpuav/descriptor_validation/gpuav_image_layout.h + gpuav/descriptor_validation/gpuav_image_layout.cpp + gpuav/core/gpuav.h + gpuav/core/gpuav_record.cpp + gpuav/core/gpuav_setup.cpp + gpuav/debug_printf/debug_printf.cpp + gpuav/debug_printf/debug_printf.h + gpuav/error_message/gpuav_vuids.cpp + gpuav/error_message/gpuav_vuids.h + gpuav/instrumentation/gpuav_shader_instrumentor.cpp + gpuav/instrumentation/gpuav_shader_instrumentor.h + gpuav/instrumentation/gpuav_instrumentation.h + gpuav/instrumentation/gpuav_instrumentation.cpp + gpuav/resources/gpuav_state_trackers.cpp + gpuav/resources/gpuav_state_trackers.h + gpuav/resources/gpuav_shader_resources.h + gpuav/resources/gpuav_vulkan_objects.h + gpuav/resources/gpuav_vulkan_objects.cpp + gpuav/shaders/gpuav_error_codes.h + gpuav/shaders/gpuav_error_header.h + gpuav/shaders/gpuav_shaders_constants.h object_tracker/object_lifetime_validation.h object_tracker/object_tracker_utils.cpp state_tracker/buffer_state.cpp diff --git a/layers/chassis/dispatch_object.h b/layers/chassis/dispatch_object.h index 28363984b20..7eee7bd3593 100644 --- a/layers/chassis/dispatch_object.h +++ b/layers/chassis/dispatch_object.h @@ -30,7 +30,7 @@ #include "error_message/logging.h" #include "utils/vk_layer_utils.h" #include "layer_options.h" -#include "gpu/core/gpuav_settings.h" +#include "gpuav/core/gpuav_settings.h" #include "sync/sync_settings.h" #include "generated/dispatch_vector.h" #include "generated/vk_api_version.h" diff --git a/layers/chassis/validation_object.h b/layers/chassis/validation_object.h index 18983c647a6..1a56c6740db 100644 --- a/layers/chassis/validation_object.h +++ b/layers/chassis/validation_object.h @@ -47,7 +47,7 @@ #include "generated/vk_dispatch_table_helper.h" #include "chassis/dispatch_object.h" #include "generated/vk_extension_helper.h" -#include "gpu/core/gpuav_settings.h" +#include "gpuav/core/gpuav_settings.h" #include "sync/sync_settings.h" namespace chassis { diff --git a/layers/gpu/core/gpuav.h b/layers/gpuav/core/gpuav.h similarity index 99% rename from layers/gpu/core/gpuav.h rename to layers/gpuav/core/gpuav.h index 74211d01c28..f9d00bf1ac3 100644 --- a/layers/gpu/core/gpuav.h +++ b/layers/gpuav/core/gpuav.h @@ -17,9 +17,9 @@ #pragma once -#include "gpu/descriptor_validation/gpuav_descriptor_set.h" -#include "gpu/resources/gpuav_vulkan_objects.h" -#include "gpu/instrumentation/gpuav_shader_instrumentor.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_set.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" +#include "gpuav/instrumentation/gpuav_shader_instrumentor.h" #include diff --git a/layers/gpu/core/gpuav_constants.h b/layers/gpuav/core/gpuav_constants.h similarity index 100% rename from layers/gpu/core/gpuav_constants.h rename to layers/gpuav/core/gpuav_constants.h diff --git a/layers/gpu/core/gpuav_record.cpp b/layers/gpuav/core/gpuav_record.cpp similarity index 99% rename from layers/gpu/core/gpuav_record.cpp rename to layers/gpuav/core/gpuav_record.cpp index 673b43e2b0f..c8b3bccf1dd 100644 --- a/layers/gpu/core/gpuav_record.cpp +++ b/layers/gpuav/core/gpuav_record.cpp @@ -16,16 +16,16 @@ */ #include -#include "gpu/core/gpuav.h" -#include "gpu/cmd_validation/gpuav_draw.h" -#include "gpu/cmd_validation/gpuav_dispatch.h" -#include "gpu/cmd_validation/gpuav_trace_rays.h" -#include "gpu/cmd_validation/gpuav_copy_buffer_to_image.h" -#include "gpu/descriptor_validation/gpuav_descriptor_validation.h" -#include "gpu/descriptor_validation/gpuav_image_layout.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/instrumentation/gpuav_instrumentation.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/validation_cmd/gpuav_draw.h" +#include "gpuav/validation_cmd/gpuav_dispatch.h" +#include "gpuav/validation_cmd/gpuav_trace_rays.h" +#include "gpuav/validation_cmd/gpuav_copy_buffer_to_image.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_validation.h" +#include "gpuav/descriptor_validation/gpuav_image_layout.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/instrumentation/gpuav_instrumentation.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" #include "chassis/chassis_modification_state.h" namespace gpuav { diff --git a/layers/gpu/core/gpuav_settings.h b/layers/gpuav/core/gpuav_settings.h similarity index 100% rename from layers/gpu/core/gpuav_settings.h rename to layers/gpuav/core/gpuav_settings.h diff --git a/layers/gpu/core/gpuav_setup.cpp b/layers/gpuav/core/gpuav_setup.cpp similarity index 99% rename from layers/gpu/core/gpuav_setup.cpp rename to layers/gpuav/core/gpuav_setup.cpp index 763921ce555..cb67f0c7391 100644 --- a/layers/gpu/core/gpuav_setup.cpp +++ b/layers/gpuav/core/gpuav_setup.cpp @@ -21,12 +21,12 @@ #if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__GNU__) #include #endif -#include "gpu/core/gpuav_constants.h" -#include "gpu/core/gpuav.h" -#include "gpu/resources/gpuav_state_trackers.h" +#include "gpuav/core/gpuav_constants.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/resources/gpuav_state_trackers.h" #include "chassis/dispatch_object.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" namespace gpuav { std::shared_ptr Validator::CreateBufferState(VkBuffer handle, const VkBufferCreateInfo *create_info) { diff --git a/layers/gpu/debug_printf/debug_printf.cpp b/layers/gpuav/debug_printf/debug_printf.cpp similarity index 98% rename from layers/gpu/debug_printf/debug_printf.cpp rename to layers/gpuav/debug_printf/debug_printf.cpp index 72972efaa70..bb12c887019 100644 --- a/layers/gpu/debug_printf/debug_printf.cpp +++ b/layers/gpuav/debug_printf/debug_printf.cpp @@ -16,12 +16,12 @@ */ #include -#include "gpu/debug_printf/debug_printf.h" +#include "gpuav/debug_printf/debug_printf.h" #include "chassis/dispatch_object.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/shaders/gpuav_shaders_constants.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/core/gpuav.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/core/gpuav.h" #include "state_tracker/shader_instruction.h" #include @@ -180,7 +180,7 @@ struct OutputRecord { uint32_t shader_id; uint32_t instruction_position; uint32_t format_string_id; - uint32_t double_bitmask; // used to distinguish if float is 1 or 2 dwords + uint32_t double_bitmask; // used to distinguish if float is 1 or 2 dwords uint32_t signed_8_bitmask; // used to distinguish if signed int is a int8_t uint32_t signed_16_bitmask; // used to distinguish if signed int is a int16_t uint32_t stage_id; diff --git a/layers/gpu/debug_printf/debug_printf.h b/layers/gpuav/debug_printf/debug_printf.h similarity index 100% rename from layers/gpu/debug_printf/debug_printf.h rename to layers/gpuav/debug_printf/debug_printf.h diff --git a/layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp b/layers/gpuav/descriptor_validation/gpuav_descriptor_set.cpp similarity index 98% rename from layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp rename to layers/gpuav/descriptor_validation/gpuav_descriptor_set.cpp index c81c68f693e..84db76145d3 100644 --- a/layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp +++ b/layers/gpuav/descriptor_validation/gpuav_descriptor_set.cpp @@ -15,12 +15,12 @@ * limitations under the License. */ -#include "gpu/descriptor_validation/gpuav_descriptor_set.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_set.h" -#include "gpu/core/gpuav.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/resources/gpuav_shader_resources.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/resources/gpuav_shader_resources.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" #include "state_tracker/descriptor_sets.h" using vvl::DescriptorClass; diff --git a/layers/gpu/descriptor_validation/gpuav_descriptor_set.h b/layers/gpuav/descriptor_validation/gpuav_descriptor_set.h similarity index 97% rename from layers/gpu/descriptor_validation/gpuav_descriptor_set.h rename to layers/gpuav/descriptor_validation/gpuav_descriptor_set.h index 0048bcb85ed..96b620b8261 100644 --- a/layers/gpu/descriptor_validation/gpuav_descriptor_set.h +++ b/layers/gpuav/descriptor_validation/gpuav_descriptor_set.h @@ -20,8 +20,8 @@ #include #include #include "state_tracker/descriptor_sets.h" -#include "gpu/resources/gpuav_vulkan_objects.h" -#include "gpu/spirv/interface.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" +#include "gpuav/spirv/interface.h" namespace gpuav { class Validator; diff --git a/layers/gpu/descriptor_validation/gpuav_descriptor_validation.cpp b/layers/gpuav/descriptor_validation/gpuav_descriptor_validation.cpp similarity index 98% rename from layers/gpu/descriptor_validation/gpuav_descriptor_validation.cpp rename to layers/gpuav/descriptor_validation/gpuav_descriptor_validation.cpp index 1e6a30834d6..cbd9bd44875 100644 --- a/layers/gpu/descriptor_validation/gpuav_descriptor_validation.cpp +++ b/layers/gpuav/descriptor_validation/gpuav_descriptor_validation.cpp @@ -15,12 +15,12 @@ * limitations under the License. */ -#include "gpu/descriptor_validation/gpuav_descriptor_validation.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_validation.h" #include "drawdispatch/descriptor_validator.h" -#include "gpu/core/gpuav.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/resources/gpuav_shader_resources.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/resources/gpuav_shader_resources.h" #include "state_tracker/shader_module.h" namespace gpuav { diff --git a/layers/gpu/descriptor_validation/gpuav_descriptor_validation.h b/layers/gpuav/descriptor_validation/gpuav_descriptor_validation.h similarity index 100% rename from layers/gpu/descriptor_validation/gpuav_descriptor_validation.h rename to layers/gpuav/descriptor_validation/gpuav_descriptor_validation.h diff --git a/layers/gpu/descriptor_validation/gpuav_image_layout.cpp b/layers/gpuav/descriptor_validation/gpuav_image_layout.cpp similarity index 99% rename from layers/gpu/descriptor_validation/gpuav_image_layout.cpp rename to layers/gpuav/descriptor_validation/gpuav_image_layout.cpp index 70aef691250..97abc786d8e 100644 --- a/layers/gpu/descriptor_validation/gpuav_image_layout.cpp +++ b/layers/gpuav/descriptor_validation/gpuav_image_layout.cpp @@ -16,11 +16,11 @@ * limitations under the License. */ -#include "gpu/descriptor_validation/gpuav_image_layout.h" +#include "gpuav/descriptor_validation/gpuav_image_layout.h" -#include "gpu/core/gpuav.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/cmd_validation/gpuav_copy_buffer_to_image.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/validation_cmd/gpuav_copy_buffer_to_image.h" #include "utils/image_layout_utils.h" #include "drawdispatch/drawdispatch_vuids.h" #include "error_message/error_strings.h" diff --git a/layers/gpu/descriptor_validation/gpuav_image_layout.h b/layers/gpuav/descriptor_validation/gpuav_image_layout.h similarity index 98% rename from layers/gpu/descriptor_validation/gpuav_image_layout.h rename to layers/gpuav/descriptor_validation/gpuav_image_layout.h index ddbfc4092d7..5bf71fa38d4 100644 --- a/layers/gpu/descriptor_validation/gpuav_image_layout.h +++ b/layers/gpuav/descriptor_validation/gpuav_image_layout.h @@ -21,7 +21,7 @@ namespace vvl { class CommandBuffer; class RenderPass; -} +} // namespace vvl namespace gpuav { class Validator; diff --git a/layers/gpu/error_message/gpuav_vuids.cpp b/layers/gpuav/error_message/gpuav_vuids.cpp similarity index 99% rename from layers/gpu/error_message/gpuav_vuids.cpp rename to layers/gpuav/error_message/gpuav_vuids.cpp index 2b2d5c827be..247021acbf6 100644 --- a/layers/gpu/error_message/gpuav_vuids.cpp +++ b/layers/gpuav/error_message/gpuav_vuids.cpp @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "gpu/error_message/gpuav_vuids.h" +#include "gpuav/error_message/gpuav_vuids.h" namespace gpuav { diff --git a/layers/gpu/error_message/gpuav_vuids.h b/layers/gpuav/error_message/gpuav_vuids.h similarity index 98% rename from layers/gpu/error_message/gpuav_vuids.h rename to layers/gpuav/error_message/gpuav_vuids.h index 0432d8f0c46..1fe9eef2691 100644 --- a/layers/gpu/error_message/gpuav_vuids.h +++ b/layers/gpuav/error_message/gpuav_vuids.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "gpu/core/gpuav.h" +#include "gpuav/core/gpuav.h" #pragma once diff --git a/layers/gpu/instrumentation/gpuav_instrumentation.cpp b/layers/gpuav/instrumentation/gpuav_instrumentation.cpp similarity index 96% rename from layers/gpu/instrumentation/gpuav_instrumentation.cpp rename to layers/gpuav/instrumentation/gpuav_instrumentation.cpp index 43d1a02b66c..dc949b1d2e6 100644 --- a/layers/gpu/instrumentation/gpuav_instrumentation.cpp +++ b/layers/gpuav/instrumentation/gpuav_instrumentation.cpp @@ -15,15 +15,15 @@ * limitations under the License. */ -#include "gpu/instrumentation/gpuav_instrumentation.h" +#include "gpuav/instrumentation/gpuav_instrumentation.h" #include "chassis/chassis_modification_state.h" -#include "gpu/core/gpuav.h" -#include "gpu/error_message/gpuav_vuids.h" -#include "gpu/resources/gpuav_shader_resources.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/debug_printf/debug_printf.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/error_message/gpuav_vuids.h" +#include "gpuav/resources/gpuav_shader_resources.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/debug_printf/debug_printf.h" #include "state_tracker/cmd_buffer_state.h" #include "state_tracker/shader_object_state.h" @@ -434,23 +434,22 @@ void PreCallSetupShaderInstrumentationResources(Validator &gpuav, CommandBuffer const uint32_t last_label_command_i = !cb_state.GetLabelCommands().empty() ? uint32_t(cb_state.GetLabelCommands().size() - 1) : vvl::kU32Max; - CommandBuffer::ErrorLoggerFunc error_logger = [loc, descriptor_binding_index, - descriptor_binding_list = &cb_state.descriptor_command_bindings, bind_point, - last_label_command_i, operation_index, uses_shader_object, - uses_robustness](Validator &gpuav, const CommandBuffer &cb_state, - const uint32_t *error_record, const LogObjectList &objlist, - const std::vector &initial_label_stack) { - bool skip = false; - - const DescriptorCommandBinding *descriptor_command_binding = - descriptor_binding_index != vvl::kU32Max ? &(*descriptor_binding_list)[descriptor_binding_index] : nullptr; - skip |= LogInstrumentationError(gpuav, cb_state, objlist, initial_label_stack, last_label_command_i, operation_index, - error_record, - descriptor_command_binding ? descriptor_command_binding->bound_descriptor_sets - : std::vector>(), - bind_point, uses_shader_object, uses_robustness, loc); - return skip; - }; + CommandBuffer::ErrorLoggerFunc error_logger = + [loc, descriptor_binding_index, descriptor_binding_list = &cb_state.descriptor_command_bindings, bind_point, + last_label_command_i, operation_index, uses_shader_object, + uses_robustness](Validator &gpuav, const CommandBuffer &cb_state, const uint32_t *error_record, + const LogObjectList &objlist, const std::vector &initial_label_stack) { + bool skip = false; + + const DescriptorCommandBinding *descriptor_command_binding = + descriptor_binding_index != vvl::kU32Max ? &(*descriptor_binding_list)[descriptor_binding_index] : nullptr; + skip |= LogInstrumentationError(gpuav, cb_state, objlist, initial_label_stack, last_label_command_i, operation_index, + error_record, + descriptor_command_binding ? descriptor_command_binding->bound_descriptor_sets + : std::vector>(), + bind_point, uses_shader_object, uses_robustness, loc); + return skip; + }; cb_state.per_command_error_loggers.emplace_back(error_logger); } diff --git a/layers/gpu/instrumentation/gpuav_instrumentation.h b/layers/gpuav/instrumentation/gpuav_instrumentation.h similarity index 100% rename from layers/gpu/instrumentation/gpuav_instrumentation.h rename to layers/gpuav/instrumentation/gpuav_instrumentation.h diff --git a/layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp b/layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp similarity index 99% rename from layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp rename to layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp index cae328a2f4b..2c9150d7b27 100644 --- a/layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp +++ b/layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "gpu/instrumentation/gpuav_shader_instrumentor.h" +#include "gpuav/instrumentation/gpuav_shader_instrumentor.h" #include #include #include @@ -23,10 +23,10 @@ #include "error_message/error_location.h" #include "generated/vk_extension_helper.h" #include "generated/dispatch_functions.h" -#include "gpu/shaders/gpuav_shaders_constants.h" -#include "gpu/spirv/module.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" +#include "gpuav/spirv/module.h" #include "chassis/chassis_modification_state.h" -#include "gpu/shaders/gpuav_error_codes.h" +#include "gpuav/shaders/gpuav_error_codes.h" #include "utils/vk_layer_utils.h" #include "sync/sync_utils.h" #include "state_tracker/pipeline_state.h" diff --git a/layers/gpu/instrumentation/gpuav_shader_instrumentor.h b/layers/gpuav/instrumentation/gpuav_shader_instrumentor.h similarity index 99% rename from layers/gpu/instrumentation/gpuav_shader_instrumentor.h rename to layers/gpuav/instrumentation/gpuav_shader_instrumentor.h index c274233ec69..e76811d4e30 100644 --- a/layers/gpu/instrumentation/gpuav_shader_instrumentor.h +++ b/layers/gpuav/instrumentation/gpuav_shader_instrumentor.h @@ -20,7 +20,7 @@ #include "error_message/error_location.h" #include "state_tracker/shader_instruction.h" #include "state_tracker/state_tracker.h" -#include "gpu/spirv/interface.h" +#include "gpuav/spirv/interface.h" #include diff --git a/layers/gpu/resources/gpuav_shader_resources.h b/layers/gpuav/resources/gpuav_shader_resources.h similarity index 97% rename from layers/gpu/resources/gpuav_shader_resources.h rename to layers/gpuav/resources/gpuav_shader_resources.h index c8f69d485f3..e8e7c349231 100644 --- a/layers/gpu/resources/gpuav_shader_resources.h +++ b/layers/gpuav/resources/gpuav_shader_resources.h @@ -21,9 +21,9 @@ #include -#include "gpu/descriptor_validation/gpuav_descriptor_set.h" -#include "gpu/shaders/gpuav_shaders_constants.h" -#include "gpu/resources/gpuav_vulkan_objects.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_set.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" namespace gpuav { diff --git a/layers/gpu/resources/gpuav_state_trackers.cpp b/layers/gpuav/resources/gpuav_state_trackers.cpp similarity index 98% rename from layers/gpu/resources/gpuav_state_trackers.cpp rename to layers/gpuav/resources/gpuav_state_trackers.cpp index 0263a1792c9..14ed1d1985d 100644 --- a/layers/gpu/resources/gpuav_state_trackers.cpp +++ b/layers/gpuav/resources/gpuav_state_trackers.cpp @@ -15,15 +15,15 @@ * limitations under the License. */ -#include "gpu/resources/gpuav_state_trackers.h" - -#include "gpu/resources/gpuav_shader_resources.h" -#include "gpu/core/gpuav.h" -#include "gpu/core/gpuav_constants.h" -#include "gpu/descriptor_validation/gpuav_image_layout.h" -#include "gpu/descriptor_validation/gpuav_descriptor_validation.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/debug_printf/debug_printf.h" +#include "gpuav/resources/gpuav_state_trackers.h" + +#include "gpuav/resources/gpuav_shader_resources.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/core/gpuav_constants.h" +#include "gpuav/descriptor_validation/gpuav_image_layout.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_validation.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/debug_printf/debug_printf.h" namespace gpuav { diff --git a/layers/gpu/resources/gpuav_state_trackers.h b/layers/gpuav/resources/gpuav_state_trackers.h similarity index 98% rename from layers/gpu/resources/gpuav_state_trackers.h rename to layers/gpuav/resources/gpuav_state_trackers.h index 1a424f53a73..09a293c8b8f 100644 --- a/layers/gpu/resources/gpuav_state_trackers.h +++ b/layers/gpuav/resources/gpuav_state_trackers.h @@ -20,8 +20,8 @@ #include #include "external/inplace_function.h" -#include "gpu/descriptor_validation/gpuav_descriptor_set.h" -#include "gpu/resources/gpuav_vulkan_objects.h" +#include "gpuav/descriptor_validation/gpuav_descriptor_set.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" // We pull in most the core state tracking files // gpuav_state_trackers.h should NOT be included by any other header file diff --git a/layers/gpu/resources/gpuav_vulkan_objects.cpp b/layers/gpuav/resources/gpuav_vulkan_objects.cpp similarity index 99% rename from layers/gpu/resources/gpuav_vulkan_objects.cpp rename to layers/gpuav/resources/gpuav_vulkan_objects.cpp index a3570092d68..7c7c536b238 100644 --- a/layers/gpu/resources/gpuav_vulkan_objects.cpp +++ b/layers/gpuav/resources/gpuav_vulkan_objects.cpp @@ -15,9 +15,9 @@ * limitations under the License. */ -#include "gpu/resources/gpuav_vulkan_objects.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" -#include "gpu/core/gpuav.h" +#include "gpuav/core/gpuav.h" #include "generated/dispatch_functions.h" #include diff --git a/layers/gpu/resources/gpuav_vulkan_objects.h b/layers/gpuav/resources/gpuav_vulkan_objects.h similarity index 100% rename from layers/gpu/resources/gpuav_vulkan_objects.h rename to layers/gpuav/resources/gpuav_vulkan_objects.h diff --git a/layers/gpu/shaders/README.md b/layers/gpuav/shaders/README.md similarity index 100% rename from layers/gpu/shaders/README.md rename to layers/gpuav/shaders/README.md diff --git a/layers/gpu/shaders/gpuav_error_codes.h b/layers/gpuav/shaders/gpuav_error_codes.h similarity index 100% rename from layers/gpu/shaders/gpuav_error_codes.h rename to layers/gpuav/shaders/gpuav_error_codes.h diff --git a/layers/gpu/shaders/gpuav_error_header.h b/layers/gpuav/shaders/gpuav_error_header.h similarity index 100% rename from layers/gpu/shaders/gpuav_error_header.h rename to layers/gpuav/shaders/gpuav_error_header.h diff --git a/layers/gpu/shaders/gpuav_shaders_constants.h b/layers/gpuav/shaders/gpuav_shaders_constants.h similarity index 100% rename from layers/gpu/shaders/gpuav_shaders_constants.h rename to layers/gpuav/shaders/gpuav_shaders_constants.h diff --git a/layers/gpu/shaders/instrumentation/buffer_device_address.comp b/layers/gpuav/shaders/instrumentation/buffer_device_address.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/buffer_device_address.comp rename to layers/gpuav/shaders/instrumentation/buffer_device_address.comp diff --git a/layers/gpu/shaders/instrumentation/common_descriptor_sets.h b/layers/gpuav/shaders/instrumentation/common_descriptor_sets.h similarity index 100% rename from layers/gpu/shaders/instrumentation/common_descriptor_sets.h rename to layers/gpuav/shaders/instrumentation/common_descriptor_sets.h diff --git a/layers/gpu/shaders/instrumentation/descriptor_class_general_buffer.comp b/layers/gpuav/shaders/instrumentation/descriptor_class_general_buffer.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/descriptor_class_general_buffer.comp rename to layers/gpuav/shaders/instrumentation/descriptor_class_general_buffer.comp diff --git a/layers/gpu/shaders/instrumentation/descriptor_class_texel_buffer.comp b/layers/gpuav/shaders/instrumentation/descriptor_class_texel_buffer.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/descriptor_class_texel_buffer.comp rename to layers/gpuav/shaders/instrumentation/descriptor_class_texel_buffer.comp diff --git a/layers/gpu/shaders/instrumentation/descriptor_indexing_oob_bindless.comp b/layers/gpuav/shaders/instrumentation/descriptor_indexing_oob_bindless.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/descriptor_indexing_oob_bindless.comp rename to layers/gpuav/shaders/instrumentation/descriptor_indexing_oob_bindless.comp diff --git a/layers/gpu/shaders/instrumentation/descriptor_indexing_oob_non_bindless.comp b/layers/gpuav/shaders/instrumentation/descriptor_indexing_oob_non_bindless.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/descriptor_indexing_oob_non_bindless.comp rename to layers/gpuav/shaders/instrumentation/descriptor_indexing_oob_non_bindless.comp diff --git a/layers/gpu/shaders/instrumentation/post_process_descriptor_index.comp b/layers/gpuav/shaders/instrumentation/post_process_descriptor_index.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/post_process_descriptor_index.comp rename to layers/gpuav/shaders/instrumentation/post_process_descriptor_index.comp diff --git a/layers/gpu/shaders/instrumentation/ray_query.comp b/layers/gpuav/shaders/instrumentation/ray_query.comp similarity index 100% rename from layers/gpu/shaders/instrumentation/ray_query.comp rename to layers/gpuav/shaders/instrumentation/ray_query.comp diff --git a/layers/gpu/shaders/cmd_validation/common.h b/layers/gpuav/shaders/validation_cmd/common.h similarity index 100% rename from layers/gpu/shaders/cmd_validation/common.h rename to layers/gpuav/shaders/validation_cmd/common.h diff --git a/layers/gpu/shaders/cmd_validation/copy_buffer_to_image.comp b/layers/gpuav/shaders/validation_cmd/copy_buffer_to_image.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/copy_buffer_to_image.comp rename to layers/gpuav/shaders/validation_cmd/copy_buffer_to_image.comp diff --git a/layers/gpu/shaders/cmd_validation/count_buffer.comp b/layers/gpuav/shaders/validation_cmd/count_buffer.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/count_buffer.comp rename to layers/gpuav/shaders/validation_cmd/count_buffer.comp diff --git a/layers/gpu/shaders/cmd_validation/dispatch.comp b/layers/gpuav/shaders/validation_cmd/dispatch.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/dispatch.comp rename to layers/gpuav/shaders/validation_cmd/dispatch.comp diff --git a/layers/gpu/shaders/cmd_validation/draw_indexed.comp b/layers/gpuav/shaders/validation_cmd/draw_indexed.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/draw_indexed.comp rename to layers/gpuav/shaders/validation_cmd/draw_indexed.comp diff --git a/layers/gpu/shaders/cmd_validation/draw_indexed_indirect_index_buffer.comp b/layers/gpuav/shaders/validation_cmd/draw_indexed_indirect_index_buffer.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/draw_indexed_indirect_index_buffer.comp rename to layers/gpuav/shaders/validation_cmd/draw_indexed_indirect_index_buffer.comp diff --git a/layers/gpu/shaders/cmd_validation/draw_indexed_indirect_vertex_buffer.comp b/layers/gpuav/shaders/validation_cmd/draw_indexed_indirect_vertex_buffer.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/draw_indexed_indirect_vertex_buffer.comp rename to layers/gpuav/shaders/validation_cmd/draw_indexed_indirect_vertex_buffer.comp diff --git a/layers/gpu/shaders/cmd_validation/draw_mesh_indirect.comp b/layers/gpuav/shaders/validation_cmd/draw_mesh_indirect.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/draw_mesh_indirect.comp rename to layers/gpuav/shaders/validation_cmd/draw_mesh_indirect.comp diff --git a/layers/gpu/shaders/cmd_validation/draw_push_data.h b/layers/gpuav/shaders/validation_cmd/draw_push_data.h similarity index 100% rename from layers/gpu/shaders/cmd_validation/draw_push_data.h rename to layers/gpuav/shaders/validation_cmd/draw_push_data.h diff --git a/layers/gpu/shaders/cmd_validation/first_instance.comp b/layers/gpuav/shaders/validation_cmd/first_instance.comp similarity index 100% rename from layers/gpu/shaders/cmd_validation/first_instance.comp rename to layers/gpuav/shaders/validation_cmd/first_instance.comp diff --git a/layers/gpu/shaders/cmd_validation/trace_rays.rgen b/layers/gpuav/shaders/validation_cmd/trace_rays.rgen similarity index 100% rename from layers/gpu/shaders/cmd_validation/trace_rays.rgen rename to layers/gpuav/shaders/validation_cmd/trace_rays.rgen diff --git a/layers/gpu/spirv/CMakeLists.txt b/layers/gpuav/spirv/CMakeLists.txt similarity index 100% rename from layers/gpu/spirv/CMakeLists.txt rename to layers/gpuav/spirv/CMakeLists.txt diff --git a/layers/gpu/spirv/README.md b/layers/gpuav/spirv/README.md similarity index 100% rename from layers/gpu/spirv/README.md rename to layers/gpuav/spirv/README.md diff --git a/layers/gpu/spirv/buffer_device_address_pass.cpp b/layers/gpuav/spirv/buffer_device_address_pass.cpp similarity index 100% rename from layers/gpu/spirv/buffer_device_address_pass.cpp rename to layers/gpuav/spirv/buffer_device_address_pass.cpp diff --git a/layers/gpu/spirv/buffer_device_address_pass.h b/layers/gpuav/spirv/buffer_device_address_pass.h similarity index 100% rename from layers/gpu/spirv/buffer_device_address_pass.h rename to layers/gpuav/spirv/buffer_device_address_pass.h diff --git a/layers/gpu/spirv/debug_printf_pass.cpp b/layers/gpuav/spirv/debug_printf_pass.cpp similarity index 99% rename from layers/gpu/spirv/debug_printf_pass.cpp rename to layers/gpuav/spirv/debug_printf_pass.cpp index c78706e60f0..992b1770d3b 100644 --- a/layers/gpu/spirv/debug_printf_pass.cpp +++ b/layers/gpuav/spirv/debug_printf_pass.cpp @@ -15,7 +15,7 @@ #include "debug_printf_pass.h" #include "module.h" -#include "gpu/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_error_header.h" #include #include #include diff --git a/layers/gpu/spirv/debug_printf_pass.h b/layers/gpuav/spirv/debug_printf_pass.h similarity index 100% rename from layers/gpu/spirv/debug_printf_pass.h rename to layers/gpuav/spirv/debug_printf_pass.h diff --git a/layers/gpu/spirv/descriptor_class_general_buffer_pass.cpp b/layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp similarity index 99% rename from layers/gpu/spirv/descriptor_class_general_buffer_pass.cpp rename to layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp index 6986f41cfae..89be19b2fbd 100644 --- a/layers/gpu/spirv/descriptor_class_general_buffer_pass.cpp +++ b/layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp @@ -22,7 +22,7 @@ #include #include "generated/instrumentation_descriptor_class_general_buffer_comp.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" namespace gpuav { namespace spirv { diff --git a/layers/gpu/spirv/descriptor_class_general_buffer_pass.h b/layers/gpuav/spirv/descriptor_class_general_buffer_pass.h similarity index 100% rename from layers/gpu/spirv/descriptor_class_general_buffer_pass.h rename to layers/gpuav/spirv/descriptor_class_general_buffer_pass.h diff --git a/layers/gpu/spirv/descriptor_class_texel_buffer_pass.cpp b/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp similarity index 99% rename from layers/gpu/spirv/descriptor_class_texel_buffer_pass.cpp rename to layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp index 4e8ccfc729a..643b21d595b 100644 --- a/layers/gpu/spirv/descriptor_class_texel_buffer_pass.cpp +++ b/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp @@ -19,7 +19,7 @@ #include #include "generated/instrumentation_descriptor_class_texel_buffer_comp.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" namespace gpuav { namespace spirv { diff --git a/layers/gpu/spirv/descriptor_class_texel_buffer_pass.h b/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.h similarity index 100% rename from layers/gpu/spirv/descriptor_class_texel_buffer_pass.h rename to layers/gpuav/spirv/descriptor_class_texel_buffer_pass.h diff --git a/layers/gpu/spirv/descriptor_indexing_oob_pass.cpp b/layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp similarity index 99% rename from layers/gpu/spirv/descriptor_indexing_oob_pass.cpp rename to layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp index 2686585f45d..52222d5c401 100644 --- a/layers/gpu/spirv/descriptor_indexing_oob_pass.cpp +++ b/layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp @@ -21,7 +21,7 @@ #include "generated/instrumentation_descriptor_indexing_oob_bindless_comp.h" #include "generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" namespace gpuav { namespace spirv { diff --git a/layers/gpu/spirv/descriptor_indexing_oob_pass.h b/layers/gpuav/spirv/descriptor_indexing_oob_pass.h similarity index 100% rename from layers/gpu/spirv/descriptor_indexing_oob_pass.h rename to layers/gpuav/spirv/descriptor_indexing_oob_pass.h diff --git a/layers/gpu/spirv/function_basic_block.cpp b/layers/gpuav/spirv/function_basic_block.cpp similarity index 100% rename from layers/gpu/spirv/function_basic_block.cpp rename to layers/gpuav/spirv/function_basic_block.cpp diff --git a/layers/gpu/spirv/function_basic_block.h b/layers/gpuav/spirv/function_basic_block.h similarity index 100% rename from layers/gpu/spirv/function_basic_block.h rename to layers/gpuav/spirv/function_basic_block.h diff --git a/layers/gpu/spirv/inject_conditional_function_pass.cpp b/layers/gpuav/spirv/inject_conditional_function_pass.cpp similarity index 100% rename from layers/gpu/spirv/inject_conditional_function_pass.cpp rename to layers/gpuav/spirv/inject_conditional_function_pass.cpp diff --git a/layers/gpu/spirv/inject_conditional_function_pass.h b/layers/gpuav/spirv/inject_conditional_function_pass.h similarity index 100% rename from layers/gpu/spirv/inject_conditional_function_pass.h rename to layers/gpuav/spirv/inject_conditional_function_pass.h diff --git a/layers/gpu/spirv/inject_function_pass.cpp b/layers/gpuav/spirv/inject_function_pass.cpp similarity index 100% rename from layers/gpu/spirv/inject_function_pass.cpp rename to layers/gpuav/spirv/inject_function_pass.cpp diff --git a/layers/gpu/spirv/inject_function_pass.h b/layers/gpuav/spirv/inject_function_pass.h similarity index 100% rename from layers/gpu/spirv/inject_function_pass.h rename to layers/gpuav/spirv/inject_function_pass.h diff --git a/layers/gpu/spirv/instruction.cpp b/layers/gpuav/spirv/instruction.cpp similarity index 100% rename from layers/gpu/spirv/instruction.cpp rename to layers/gpuav/spirv/instruction.cpp diff --git a/layers/gpu/spirv/instruction.h b/layers/gpuav/spirv/instruction.h similarity index 100% rename from layers/gpu/spirv/instruction.h rename to layers/gpuav/spirv/instruction.h diff --git a/layers/gpu/spirv/interface.h b/layers/gpuav/spirv/interface.h similarity index 100% rename from layers/gpu/spirv/interface.h rename to layers/gpuav/spirv/interface.h diff --git a/layers/gpu/spirv/link.h b/layers/gpuav/spirv/link.h similarity index 100% rename from layers/gpu/spirv/link.h rename to layers/gpuav/spirv/link.h diff --git a/layers/gpu/spirv/module.cpp b/layers/gpuav/spirv/module.cpp similarity index 99% rename from layers/gpu/spirv/module.cpp rename to layers/gpuav/spirv/module.cpp index 77b533015da..ff6f10e35b9 100644 --- a/layers/gpu/spirv/module.cpp +++ b/layers/gpuav/spirv/module.cpp @@ -15,7 +15,7 @@ #include "module.h" #include -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" #include "error_message/logging.h" #include "error_message/log_message_type.h" diff --git a/layers/gpu/spirv/module.h b/layers/gpuav/spirv/module.h similarity index 100% rename from layers/gpu/spirv/module.h rename to layers/gpuav/spirv/module.h diff --git a/layers/gpu/spirv/pass.cpp b/layers/gpuav/spirv/pass.cpp similarity index 99% rename from layers/gpu/spirv/pass.cpp rename to layers/gpuav/spirv/pass.cpp index c4362015ec6..96ff10555b7 100644 --- a/layers/gpu/spirv/pass.cpp +++ b/layers/gpuav/spirv/pass.cpp @@ -19,7 +19,7 @@ #include "generated/spirv_grammar_helper.h" #include "instruction.h" #include "module.h" -#include "gpu/shaders/gpuav_error_codes.h" +#include "gpuav/shaders/gpuav_error_codes.h" namespace gpuav { namespace spirv { diff --git a/layers/gpu/spirv/pass.h b/layers/gpuav/spirv/pass.h similarity index 100% rename from layers/gpu/spirv/pass.h rename to layers/gpuav/spirv/pass.h diff --git a/layers/gpu/spirv/post_process_descriptor_indexing.cpp b/layers/gpuav/spirv/post_process_descriptor_indexing.cpp similarity index 99% rename from layers/gpu/spirv/post_process_descriptor_indexing.cpp rename to layers/gpuav/spirv/post_process_descriptor_indexing.cpp index fe42ac418d6..8b52d767d8e 100644 --- a/layers/gpu/spirv/post_process_descriptor_indexing.cpp +++ b/layers/gpuav/spirv/post_process_descriptor_indexing.cpp @@ -18,7 +18,7 @@ #include #include "generated/instrumentation_post_process_descriptor_index_comp.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" namespace gpuav { namespace spirv { diff --git a/layers/gpu/spirv/post_process_descriptor_indexing.h b/layers/gpuav/spirv/post_process_descriptor_indexing.h similarity index 100% rename from layers/gpu/spirv/post_process_descriptor_indexing.h rename to layers/gpuav/spirv/post_process_descriptor_indexing.h diff --git a/layers/gpu/spirv/ray_query_pass.cpp b/layers/gpuav/spirv/ray_query_pass.cpp similarity index 100% rename from layers/gpu/spirv/ray_query_pass.cpp rename to layers/gpuav/spirv/ray_query_pass.cpp diff --git a/layers/gpu/spirv/ray_query_pass.h b/layers/gpuav/spirv/ray_query_pass.h similarity index 100% rename from layers/gpu/spirv/ray_query_pass.h rename to layers/gpuav/spirv/ray_query_pass.h diff --git a/layers/gpu/spirv/type_manager.cpp b/layers/gpuav/spirv/type_manager.cpp similarity index 100% rename from layers/gpu/spirv/type_manager.cpp rename to layers/gpuav/spirv/type_manager.cpp diff --git a/layers/gpu/spirv/type_manager.h b/layers/gpuav/spirv/type_manager.h similarity index 100% rename from layers/gpu/spirv/type_manager.h rename to layers/gpuav/spirv/type_manager.h diff --git a/layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.cpp b/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp similarity index 97% rename from layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.cpp rename to layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp index 27250f56fcf..ed43e1cfd32 100644 --- a/layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.cpp +++ b/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp @@ -15,12 +15,12 @@ * limitations under the License. */ -#include "gpu/core/gpuav.h" -#include "gpu/cmd_validation/gpuav_cmd_validation_common.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/shaders/gpuav_shaders_constants.h" -#include "generated/cmd_validation_copy_buffer_to_image_comp.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/validation_cmd/gpuav_validation_cmd_common.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" +#include "generated/validation_cmd_copy_buffer_to_image_comp.h" namespace gpuav { @@ -80,8 +80,8 @@ struct SharedCopyBufferToImageValidationResources final { } VkShaderModuleCreateInfo shader_module_ci = vku::InitStructHelper(); - shader_module_ci.codeSize = cmd_validation_copy_buffer_to_image_comp_size * sizeof(uint32_t); - shader_module_ci.pCode = cmd_validation_copy_buffer_to_image_comp; + shader_module_ci.codeSize = validation_cmd_copy_buffer_to_image_comp_size * sizeof(uint32_t); + shader_module_ci.pCode = validation_cmd_copy_buffer_to_image_comp; VkShaderModule validation_shader = VK_NULL_HANDLE; result = DispatchCreateShaderModule(device, &shader_module_ci, nullptr, &validation_shader); if (result != VK_SUCCESS) { diff --git a/layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.h b/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.h similarity index 100% rename from layers/gpu/cmd_validation/gpuav_copy_buffer_to_image.h rename to layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.h diff --git a/layers/gpu/cmd_validation/gpuav_dispatch.cpp b/layers/gpuav/validation_cmd/gpuav_dispatch.cpp similarity index 77% rename from layers/gpu/cmd_validation/gpuav_dispatch.cpp rename to layers/gpuav/validation_cmd/gpuav_dispatch.cpp index 188dcc8d6eb..b5903699ff8 100644 --- a/layers/gpu/cmd_validation/gpuav_dispatch.cpp +++ b/layers/gpuav/validation_cmd/gpuav_dispatch.cpp @@ -15,16 +15,16 @@ * limitations under the License. */ -#include "gpu/core/gpuav.h" -#include "gpu/cmd_validation/gpuav_cmd_validation_common.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/shaders/gpuav_shaders_constants.h" -#include "generated/cmd_validation_dispatch_comp.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/validation_cmd/gpuav_validation_cmd_common.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" +#include "generated/validation_cmd_dispatch_comp.h" namespace gpuav { -// See gpu/shaders/cmd_validation/dispatch.comp +// See gpuav/shaders/validation_cmd/dispatch.comp constexpr uint32_t kPushConstantDWords = 4u; struct SharedDispatchValidationResources final { @@ -72,8 +72,8 @@ struct SharedDispatchValidationResources final { VkShaderCreateInfoEXT shader_ci = vku::InitStructHelper(); shader_ci.stage = VK_SHADER_STAGE_COMPUTE_BIT; shader_ci.codeType = VK_SHADER_CODE_TYPE_SPIRV_EXT; - shader_ci.codeSize = cmd_validation_dispatch_comp_size * sizeof(uint32_t); - shader_ci.pCode = cmd_validation_dispatch_comp; + shader_ci.codeSize = validation_cmd_dispatch_comp_size * sizeof(uint32_t); + shader_ci.pCode = validation_cmd_dispatch_comp; shader_ci.pName = "main"; shader_ci.setLayoutCount = pipeline_layout_ci.setLayoutCount; shader_ci.pSetLayouts = pipeline_layout_ci.pSetLayouts; @@ -88,8 +88,8 @@ struct SharedDispatchValidationResources final { { VkShaderModuleCreateInfo shader_module_ci = vku::InitStructHelper(); - shader_module_ci.codeSize = cmd_validation_dispatch_comp_size * sizeof(uint32_t); - shader_module_ci.pCode = cmd_validation_dispatch_comp; + shader_module_ci.codeSize = validation_cmd_dispatch_comp_size * sizeof(uint32_t); + shader_module_ci.pCode = validation_cmd_dispatch_comp; VkShaderModule validation_shader = VK_NULL_HANDLE; result = DispatchCreateShaderModule(device, &shader_module_ci, nullptr, &validation_shader); if (result != VK_SUCCESS) { @@ -213,47 +213,46 @@ void InsertIndirectDispatchValidation(Validator &gpuav, const Location &loc, Com glsl::kDiagPerCmdDescriptorSet, 1, &indirect_buffer_desc_set, 0, nullptr); DispatchCmdDispatch(cb_state.VkHandle(), 1, 1, 1); - CommandBuffer::ErrorLoggerFunc error_logger = - [loc](Validator &gpuav, const CommandBuffer &, const uint32_t *error_record, const LogObjectList &objlist, - const std::vector &) { - bool skip = false; - using namespace glsl; + CommandBuffer::ErrorLoggerFunc error_logger = [loc](Validator &gpuav, const CommandBuffer &, const uint32_t *error_record, + const LogObjectList &objlist, const std::vector &) { + bool skip = false; + using namespace glsl; - if (error_record[kHeaderErrorGroupOffset] != kErrorGroupGpuPreDispatch) { - return skip; - } + if (error_record[kHeaderErrorGroupOffset] != kErrorGroupGpuPreDispatch) { + return skip; + } - switch (error_record[kHeaderErrorSubCodeOffset]) { - case kErrorSubCodePreDispatchCountLimitX: { - uint32_t count = error_record[kPreActionParamOffset_0]; - skip |= gpuav.LogError("VUID-VkDispatchIndirectCommand-x-00417", objlist, loc, - "Indirect dispatch VkDispatchIndirectCommand::x of %" PRIu32 - " would exceed maxComputeWorkGroupCount[0] limit of %" PRIu32 ".", - count, gpuav.phys_dev_props.limits.maxComputeWorkGroupCount[0]); - break; - } - case kErrorSubCodePreDispatchCountLimitY: { - uint32_t count = error_record[kPreActionParamOffset_0]; - skip |= gpuav.LogError("VUID-VkDispatchIndirectCommand-y-00418", objlist, loc, - "Indirect dispatch VkDispatchIndirectCommand::y of %" PRIu32 - " would exceed maxComputeWorkGroupCount[1] limit of %" PRIu32 ".", - count, gpuav.phys_dev_props.limits.maxComputeWorkGroupCount[1]); - break; - } - case kErrorSubCodePreDispatchCountLimitZ: { - uint32_t count = error_record[kPreActionParamOffset_0]; - skip |= gpuav.LogError("VUID-VkDispatchIndirectCommand-z-00419", objlist, loc, - "Indirect dispatch VkDispatchIndirectCommand::z of %" PRIu32 - " would exceed maxComputeWorkGroupCount[2] limit of %" PRIu32 ".", - count, gpuav.phys_dev_props.limits.maxComputeWorkGroupCount[0]); - break; - } - default: - break; + switch (error_record[kHeaderErrorSubCodeOffset]) { + case kErrorSubCodePreDispatchCountLimitX: { + uint32_t count = error_record[kPreActionParamOffset_0]; + skip |= gpuav.LogError("VUID-VkDispatchIndirectCommand-x-00417", objlist, loc, + "Indirect dispatch VkDispatchIndirectCommand::x of %" PRIu32 + " would exceed maxComputeWorkGroupCount[0] limit of %" PRIu32 ".", + count, gpuav.phys_dev_props.limits.maxComputeWorkGroupCount[0]); + break; + } + case kErrorSubCodePreDispatchCountLimitY: { + uint32_t count = error_record[kPreActionParamOffset_0]; + skip |= gpuav.LogError("VUID-VkDispatchIndirectCommand-y-00418", objlist, loc, + "Indirect dispatch VkDispatchIndirectCommand::y of %" PRIu32 + " would exceed maxComputeWorkGroupCount[1] limit of %" PRIu32 ".", + count, gpuav.phys_dev_props.limits.maxComputeWorkGroupCount[1]); + break; } + case kErrorSubCodePreDispatchCountLimitZ: { + uint32_t count = error_record[kPreActionParamOffset_0]; + skip |= gpuav.LogError("VUID-VkDispatchIndirectCommand-z-00419", objlist, loc, + "Indirect dispatch VkDispatchIndirectCommand::z of %" PRIu32 + " would exceed maxComputeWorkGroupCount[2] limit of %" PRIu32 ".", + count, gpuav.phys_dev_props.limits.maxComputeWorkGroupCount[0]); + break; + } + default: + break; + } - return skip; - }; + return skip; + }; cb_state.per_command_error_loggers.emplace_back(std::move(error_logger)); } diff --git a/layers/gpu/cmd_validation/gpuav_dispatch.h b/layers/gpuav/validation_cmd/gpuav_dispatch.h similarity index 100% rename from layers/gpu/cmd_validation/gpuav_dispatch.h rename to layers/gpuav/validation_cmd/gpuav_dispatch.h diff --git a/layers/gpu/cmd_validation/gpuav_draw.cpp b/layers/gpuav/validation_cmd/gpuav_draw.cpp similarity index 98% rename from layers/gpu/cmd_validation/gpuav_draw.cpp rename to layers/gpuav/validation_cmd/gpuav_draw.cpp index f6cd38d581c..ac3649392db 100644 --- a/layers/gpu/cmd_validation/gpuav_draw.cpp +++ b/layers/gpuav/validation_cmd/gpuav_draw.cpp @@ -15,26 +15,26 @@ * limitations under the License. */ -#include "gpu/cmd_validation/gpuav_draw.h" +#include "gpuav/validation_cmd/gpuav_draw.h" -#include "gpu/core/gpuav.h" -#include "gpu/cmd_validation/gpuav_cmd_validation_common.h" -#include "gpu/error_message/gpuav_vuids.h" -#include "gpu/resources/gpuav_vulkan_objects.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/validation_cmd/gpuav_validation_cmd_common.h" +#include "gpuav/error_message/gpuav_vuids.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" #include "state_tracker/render_pass_state.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "gpu/shaders/gpuav_shaders_constants.h" -#include "gpu/shaders/cmd_validation/draw_push_data.h" -#include "generated/cmd_validation_draw_mesh_indirect_comp.h" -#include "generated/cmd_validation_first_instance_comp.h" -#include "generated/cmd_validation_count_buffer_comp.h" -#include "generated/cmd_validation_draw_indexed_comp.h" -#include "generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.h" -#include "generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" +#include "gpuav/shaders/validation_cmd/draw_push_data.h" +#include "generated/validation_cmd_draw_mesh_indirect_comp.h" +#include "generated/validation_cmd_first_instance_comp.h" +#include "generated/validation_cmd_count_buffer_comp.h" +#include "generated/validation_cmd_draw_indexed_comp.h" +#include "generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h" +#include "generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h" #include "profiling/profiling.h" @@ -184,8 +184,8 @@ void FlushValidationCmds(Validator &gpuav, CommandBuffer &cb_state) { } struct FirstInstanceValidationShader { - static size_t GetSpirvSize() { return cmd_validation_first_instance_comp_size * sizeof(uint32_t); } - static const uint32_t *GetSpirv() { return cmd_validation_first_instance_comp; } + static size_t GetSpirvSize() { return validation_cmd_first_instance_comp_size * sizeof(uint32_t); } + static const uint32_t *GetSpirv() { return validation_cmd_first_instance_comp; } static const uint32_t desc_set_id = gpuav::glsl::kDiagPerCmdDescriptorSet; @@ -387,8 +387,8 @@ void FirstInstance(Validator &gpuav, CommandBuffer } struct CountBufferValidationShader { - static size_t GetSpirvSize() { return cmd_validation_count_buffer_comp_size * sizeof(uint32_t); } - static const uint32_t *GetSpirv() { return cmd_validation_count_buffer_comp; } + static size_t GetSpirvSize() { return validation_cmd_count_buffer_comp_size * sizeof(uint32_t); } + static const uint32_t *GetSpirv() { return validation_cmd_count_buffer_comp; } static const uint32_t desc_set_id = gpuav::glsl::kDiagPerCmdDescriptorSet; @@ -543,8 +543,8 @@ void CountBuffer(Validator &gpuav, CommandBuffer &cb_state, const Location &loc, } struct MeshValidationShader { - static size_t GetSpirvSize() { return cmd_validation_draw_mesh_indirect_comp_size * sizeof(uint32_t); } - static const uint32_t *GetSpirv() { return cmd_validation_draw_mesh_indirect_comp; } + static size_t GetSpirvSize() { return validation_cmd_draw_mesh_indirect_comp_size * sizeof(uint32_t); } + static const uint32_t *GetSpirv() { return validation_cmd_draw_mesh_indirect_comp; } static const uint32_t desc_set_id = gpuav::glsl::kDiagPerCmdDescriptorSet; @@ -878,8 +878,8 @@ static std::optional SmallestVertexAttributesCount( } struct IndexBufferValidationShader { - static size_t GetSpirvSize() { return cmd_validation_draw_indexed_comp_size * sizeof(uint32_t); } - static const uint32_t *GetSpirv() { return cmd_validation_draw_indexed_comp; } + static size_t GetSpirvSize() { return validation_cmd_draw_indexed_comp_size * sizeof(uint32_t); } + static const uint32_t *GetSpirv() { return validation_cmd_draw_indexed_comp; } static const uint32_t desc_set_id = gpuav::glsl::kDiagPerCmdDescriptorSet; @@ -1098,8 +1098,8 @@ void DrawIndexed(Validator &gpuav, CommandBuffer &cb_state, const Location &loc, } struct DrawIndexedIndirectIndexBufferShader { - static size_t GetSpirvSize() { return cmd_validation_draw_indexed_indirect_index_buffer_comp_size * sizeof(uint32_t); } - static const uint32_t *GetSpirv() { return cmd_validation_draw_indexed_indirect_index_buffer_comp; } + static size_t GetSpirvSize() { return validation_cmd_draw_indexed_indirect_index_buffer_comp_size * sizeof(uint32_t); } + static const uint32_t *GetSpirv() { return validation_cmd_draw_indexed_indirect_index_buffer_comp; } static const uint32_t desc_set_id = gpuav::glsl::kDiagPerCmdDescriptorSet; @@ -1302,8 +1302,8 @@ void DrawIndexedIndirectIndexBuffer(Validator &gpuav, CommandBuffer &cb_state, c } struct DrawIndexedIndirectVertexBufferShader { - static size_t GetSpirvSize() { return cmd_validation_draw_indexed_indirect_vertex_buffer_comp_size * sizeof(uint32_t); } - static const uint32_t *GetSpirv() { return cmd_validation_draw_indexed_indirect_vertex_buffer_comp; } + static size_t GetSpirvSize() { return validation_cmd_draw_indexed_indirect_vertex_buffer_comp_size * sizeof(uint32_t); } + static const uint32_t *GetSpirv() { return validation_cmd_draw_indexed_indirect_vertex_buffer_comp; } static const uint32_t desc_set_id = gpuav::glsl::kDiagPerCmdDescriptorSet; diff --git a/layers/gpu/cmd_validation/gpuav_draw.h b/layers/gpuav/validation_cmd/gpuav_draw.h similarity index 100% rename from layers/gpu/cmd_validation/gpuav_draw.h rename to layers/gpuav/validation_cmd/gpuav_draw.h diff --git a/layers/gpu/cmd_validation/gpuav_trace_rays.cpp b/layers/gpuav/validation_cmd/gpuav_trace_rays.cpp similarity index 97% rename from layers/gpu/cmd_validation/gpuav_trace_rays.cpp rename to layers/gpuav/validation_cmd/gpuav_trace_rays.cpp index c17066c51f1..b4f6a294cf2 100644 --- a/layers/gpu/cmd_validation/gpuav_trace_rays.cpp +++ b/layers/gpuav/validation_cmd/gpuav_trace_rays.cpp @@ -15,15 +15,15 @@ * limitations under the License. */ -#include "gpu/core/gpuav.h" -#include "gpu/cmd_validation/gpuav_cmd_validation_common.h" -#include "gpu/resources/gpuav_vulkan_objects.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/shaders/gpuav_error_header.h" -#include "generated/cmd_validation_trace_rays_rgen.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/validation_cmd/gpuav_validation_cmd_common.h" +#include "gpuav/resources/gpuav_vulkan_objects.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/shaders/gpuav_error_header.h" +#include "generated/validation_cmd_trace_rays_rgen.h" #include "error_message/error_strings.h" -// See gpu/shaders/cmd_validation/trace_rays.rgen +// See gpuav/shaders/validation_cmd/trace_rays.rgen constexpr uint32_t kPushConstantDWords = 6u; namespace gpuav { @@ -61,8 +61,8 @@ struct SharedTraceRaysValidationResources final { } VkShaderModuleCreateInfo shader_module_ci = vku::InitStructHelper(); - shader_module_ci.codeSize = cmd_validation_trace_rays_rgen_size * sizeof(uint32_t); - shader_module_ci.pCode = cmd_validation_trace_rays_rgen; + shader_module_ci.codeSize = validation_cmd_trace_rays_rgen_size * sizeof(uint32_t); + shader_module_ci.pCode = validation_cmd_trace_rays_rgen; VkShaderModule validation_shader = VK_NULL_HANDLE; result = DispatchCreateShaderModule(gpuav.device, &shader_module_ci, nullptr, &validation_shader); if (result != VK_SUCCESS) { diff --git a/layers/gpu/cmd_validation/gpuav_trace_rays.h b/layers/gpuav/validation_cmd/gpuav_trace_rays.h similarity index 100% rename from layers/gpu/cmd_validation/gpuav_trace_rays.h rename to layers/gpuav/validation_cmd/gpuav_trace_rays.h diff --git a/layers/gpu/cmd_validation/gpuav_cmd_validation_common.cpp b/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp similarity index 96% rename from layers/gpu/cmd_validation/gpuav_cmd_validation_common.cpp rename to layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp index 9a9925cf1db..90b418e9433 100644 --- a/layers/gpu/cmd_validation/gpuav_cmd_validation_common.cpp +++ b/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp @@ -15,12 +15,12 @@ * limitations under the License. */ -#include "gpu/cmd_validation/gpuav_cmd_validation_common.h" +#include "gpuav/validation_cmd/gpuav_validation_cmd_common.h" -#include "gpu/core/gpuav.h" -#include "gpu/core/gpuav_constants.h" -#include "gpu/resources/gpuav_state_trackers.h" -#include "gpu/shaders/gpuav_shaders_constants.h" +#include "gpuav/core/gpuav.h" +#include "gpuav/core/gpuav_constants.h" +#include "gpuav/resources/gpuav_state_trackers.h" +#include "gpuav/shaders/gpuav_shaders_constants.h" #include "state_tracker/descriptor_sets.h" #include "state_tracker/render_pass_state.h" diff --git a/layers/gpu/cmd_validation/gpuav_cmd_validation_common.h b/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.h similarity index 100% rename from layers/gpu/cmd_validation/gpuav_cmd_validation_common.h rename to layers/gpuav/validation_cmd/gpuav_validation_cmd_common.h diff --git a/layers/layer_options.cpp b/layers/layer_options.cpp index 0a2dc8cccf8..0f00ca23318 100644 --- a/layers/layer_options.cpp +++ b/layers/layer_options.cpp @@ -30,7 +30,7 @@ #include #include -#include "gpu/core/gpuav_settings.h" +#include "gpuav/core/gpuav_settings.h" #include "sync/sync_settings.h" #include "vk_layer_config.h" diff --git a/layers/vulkan/generated/dispatch_object.cpp b/layers/vulkan/generated/dispatch_object.cpp index ee19678befd..085ebe39f11 100644 --- a/layers/vulkan/generated/dispatch_object.cpp +++ b/layers/vulkan/generated/dispatch_object.cpp @@ -33,7 +33,7 @@ #include "object_tracker/object_lifetime_validation.h" #include "core_checks/core_validation.h" #include "best_practices/best_practices_validation.h" -#include "gpu/core/gpuav.h" +#include "gpuav/core/gpuav.h" #include "sync/sync_validation.h" #define DISPATCH_MAX_STACK_ALLOCATIONS 32 diff --git a/layers/vulkan/generated/dispatch_vector.cpp b/layers/vulkan/generated/dispatch_vector.cpp index 40f10d62751..a6c8609dd1e 100644 --- a/layers/vulkan/generated/dispatch_vector.cpp +++ b/layers/vulkan/generated/dispatch_vector.cpp @@ -41,7 +41,7 @@ #include "object_tracker/object_lifetime_validation.h" #include "core_checks/core_validation.h" #include "best_practices/best_practices_validation.h" -#include "gpu/core/gpuav.h" +#include "gpuav/core/gpuav.h" #include "sync/sync_validation.h" namespace vvl { diff --git a/layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.cpp b/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.cpp rename to layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp index 42a44421db6..f37627883e0 100644 --- a/layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_copy_buffer_to_image_comp.h" +#include "validation_cmd_copy_buffer_to_image_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_copy_buffer_to_image_comp_size = 2424; -[[maybe_unused]] const uint32_t cmd_validation_copy_buffer_to_image_comp[2424] = { +[[maybe_unused]] const uint32_t validation_cmd_copy_buffer_to_image_comp_size = 2424; +[[maybe_unused]] const uint32_t validation_cmd_copy_buffer_to_image_comp[2424] = { 0x07230203, 0x00010000, 0x0008000b, 0x00000196, 0x00000000, 0x00020011, 0x00000001, 0x00020011, 0x00001161, 0x0007000a, 0x5f565053, 0x5f52484b, 0x74696238, 0x6f74735f, 0x65676172, 0x00000000, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0006000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, diff --git a/layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.h b/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h similarity index 89% rename from layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.h rename to layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h index 8f5dd2d3bb1..1e96d5a5b9f 100644 --- a/layers/vulkan/generated/cmd_validation_copy_buffer_to_image_comp.h +++ b/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_copy_buffer_to_image_comp_size; -extern const uint32_t cmd_validation_copy_buffer_to_image_comp[]; +extern const uint32_t validation_cmd_copy_buffer_to_image_comp_size; +extern const uint32_t validation_cmd_copy_buffer_to_image_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_count_buffer_comp.cpp b/layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_count_buffer_comp.cpp rename to layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp index e41fa9fecb1..87821b1e6fc 100644 --- a/layers/vulkan/generated/cmd_validation_count_buffer_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_count_buffer_comp.h" +#include "validation_cmd_count_buffer_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_count_buffer_comp_size = 1375; -[[maybe_unused]] const uint32_t cmd_validation_count_buffer_comp[1375] = { +[[maybe_unused]] const uint32_t validation_cmd_count_buffer_comp_size = 1375; +[[maybe_unused]] const uint32_t validation_cmd_count_buffer_comp[1375] = { 0x07230203, 0x00010000, 0x0008000b, 0x000000cd, 0x00000000, 0x00020011, 0x00000001, 0x00020011, 0x0000000b, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0005000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x00060010, 0x00000004, 0x00000011, 0x00000001, 0x00000001, 0x00000001, 0x00030003, diff --git a/layers/vulkan/generated/cmd_validation_count_buffer_comp.h b/layers/vulkan/generated/validation_cmd_count_buffer_comp.h similarity index 90% rename from layers/vulkan/generated/cmd_validation_count_buffer_comp.h rename to layers/vulkan/generated/validation_cmd_count_buffer_comp.h index ef08a3fe76e..ff50a6c252b 100644 --- a/layers/vulkan/generated/cmd_validation_count_buffer_comp.h +++ b/layers/vulkan/generated/validation_cmd_count_buffer_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_count_buffer_comp_size; -extern const uint32_t cmd_validation_count_buffer_comp[]; +extern const uint32_t validation_cmd_count_buffer_comp_size; +extern const uint32_t validation_cmd_count_buffer_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_dispatch_comp.cpp b/layers/vulkan/generated/validation_cmd_dispatch_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_dispatch_comp.cpp rename to layers/vulkan/generated/validation_cmd_dispatch_comp.cpp index b0d8f35ba7a..05e4e150eb3 100644 --- a/layers/vulkan/generated/cmd_validation_dispatch_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_dispatch_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_dispatch_comp.h" +#include "validation_cmd_dispatch_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_dispatch_comp_size = 1336; -[[maybe_unused]] const uint32_t cmd_validation_dispatch_comp[1336] = { +[[maybe_unused]] const uint32_t validation_cmd_dispatch_comp_size = 1336; +[[maybe_unused]] const uint32_t validation_cmd_dispatch_comp[1336] = { 0x07230203, 0x00010000, 0x0008000b, 0x000000ce, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0005000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x00060010, 0x00000004, 0x00000011, 0x00000001, 0x00000001, 0x00000001, 0x00030003, 0x00000002, 0x000001c2, diff --git a/layers/vulkan/generated/cmd_validation_dispatch_comp.h b/layers/vulkan/generated/validation_cmd_dispatch_comp.h similarity index 90% rename from layers/vulkan/generated/cmd_validation_dispatch_comp.h rename to layers/vulkan/generated/validation_cmd_dispatch_comp.h index f43ef273539..c6a1c4422ea 100644 --- a/layers/vulkan/generated/cmd_validation_dispatch_comp.h +++ b/layers/vulkan/generated/validation_cmd_dispatch_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_dispatch_comp_size; -extern const uint32_t cmd_validation_dispatch_comp[]; +extern const uint32_t validation_cmd_dispatch_comp_size; +extern const uint32_t validation_cmd_dispatch_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_draw_indexed_comp.cpp b/layers/vulkan/generated/validation_cmd_draw_indexed_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_draw_indexed_comp.cpp rename to layers/vulkan/generated/validation_cmd_draw_indexed_comp.cpp index 19b4408edb1..fd74a8998a6 100644 --- a/layers/vulkan/generated/cmd_validation_draw_indexed_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_draw_indexed_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_draw_indexed_comp.h" +#include "validation_cmd_draw_indexed_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_draw_indexed_comp_size = 1570; -[[maybe_unused]] const uint32_t cmd_validation_draw_indexed_comp[1570] = { +[[maybe_unused]] const uint32_t validation_cmd_draw_indexed_comp_size = 1570; +[[maybe_unused]] const uint32_t validation_cmd_draw_indexed_comp[1570] = { 0x07230203, 0x00010000, 0x0008000b, 0x00000104, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0006000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x000000e9, 0x00060010, 0x00000004, 0x00000011, 0x00000040, 0x00000001, 0x00000001, 0x00030003, 0x00000002, diff --git a/layers/vulkan/generated/cmd_validation_draw_indexed_comp.h b/layers/vulkan/generated/validation_cmd_draw_indexed_comp.h similarity index 90% rename from layers/vulkan/generated/cmd_validation_draw_indexed_comp.h rename to layers/vulkan/generated/validation_cmd_draw_indexed_comp.h index 4df70145bc5..b5571dfc183 100644 --- a/layers/vulkan/generated/cmd_validation_draw_indexed_comp.h +++ b/layers/vulkan/generated/validation_cmd_draw_indexed_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_draw_indexed_comp_size; -extern const uint32_t cmd_validation_draw_indexed_comp[]; +extern const uint32_t validation_cmd_draw_indexed_comp_size; +extern const uint32_t validation_cmd_draw_indexed_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp similarity index 98% rename from layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp rename to layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp index 461838fff65..f3641c87334 100644 --- a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_draw_indexed_indirect_index_buffer_comp.h" +#include "validation_cmd_draw_indexed_indirect_index_buffer_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_draw_indexed_indirect_index_buffer_comp_size = 1359; -[[maybe_unused]] const uint32_t cmd_validation_draw_indexed_indirect_index_buffer_comp[1359] = { +[[maybe_unused]] const uint32_t validation_cmd_draw_indexed_indirect_index_buffer_comp_size = 1359; +[[maybe_unused]] const uint32_t validation_cmd_draw_indexed_indirect_index_buffer_comp[1359] = { 0x07230203, 0x00010000, 0x0008000b, 0x000000cb, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0005000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x00060010, 0x00000004, 0x00000011, 0x00000001, 0x00000001, 0x00000001, 0x00030003, 0x00000002, 0x000001c2, diff --git a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.h b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h similarity index 89% rename from layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.h rename to layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h index ee9fd3e4853..d890cb1d89a 100644 --- a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_index_buffer_comp.h +++ b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_draw_indexed_indirect_index_buffer_comp_size; -extern const uint32_t cmd_validation_draw_indexed_indirect_index_buffer_comp[]; +extern const uint32_t validation_cmd_draw_indexed_indirect_index_buffer_comp_size; +extern const uint32_t validation_cmd_draw_indexed_indirect_index_buffer_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp rename to layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp index b2aecd33a5e..10f55378134 100644 --- a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h" +#include "validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_draw_indexed_indirect_vertex_buffer_comp_size = 2058; -[[maybe_unused]] const uint32_t cmd_validation_draw_indexed_indirect_vertex_buffer_comp[2058] = { +[[maybe_unused]] const uint32_t validation_cmd_draw_indexed_indirect_vertex_buffer_comp_size = 2058; +[[maybe_unused]] const uint32_t validation_cmd_draw_indexed_indirect_vertex_buffer_comp[2058] = { 0x07230203, 0x00010000, 0x0008000b, 0x00000153, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0006000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x000000ef, 0x00060010, 0x00000004, 0x00000011, 0x00000040, 0x00000001, 0x00000001, 0x00030003, 0x00000002, diff --git a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h similarity index 89% rename from layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h rename to layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h index b2694556bd9..b00b57cddf9 100644 --- a/layers/vulkan/generated/cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h +++ b/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_draw_indexed_indirect_vertex_buffer_comp_size; -extern const uint32_t cmd_validation_draw_indexed_indirect_vertex_buffer_comp[]; +extern const uint32_t validation_cmd_draw_indexed_indirect_vertex_buffer_comp_size; +extern const uint32_t validation_cmd_draw_indexed_indirect_vertex_buffer_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.cpp b/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.cpp rename to layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp index df3640ec007..b93db6340f0 100644 --- a/layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_draw_mesh_indirect_comp.h" +#include "validation_cmd_draw_mesh_indirect_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_draw_mesh_indirect_comp_size = 1741; -[[maybe_unused]] const uint32_t cmd_validation_draw_mesh_indirect_comp[1741] = { +[[maybe_unused]] const uint32_t validation_cmd_draw_mesh_indirect_comp_size = 1741; +[[maybe_unused]] const uint32_t validation_cmd_draw_mesh_indirect_comp[1741] = { 0x07230203, 0x00010000, 0x0008000b, 0x0000010d, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0006000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x0000008e, 0x00060010, 0x00000004, 0x00000011, 0x00000001, 0x00000001, 0x00000001, 0x00030003, 0x00000002, diff --git a/layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.h b/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h similarity index 89% rename from layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.h rename to layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h index f92ee7e7980..1153f5ed5ca 100644 --- a/layers/vulkan/generated/cmd_validation_draw_mesh_indirect_comp.h +++ b/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_draw_mesh_indirect_comp_size; -extern const uint32_t cmd_validation_draw_mesh_indirect_comp[]; +extern const uint32_t validation_cmd_draw_mesh_indirect_comp_size; +extern const uint32_t validation_cmd_draw_mesh_indirect_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_first_instance_comp.cpp b/layers/vulkan/generated/validation_cmd_first_instance_comp.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_first_instance_comp.cpp rename to layers/vulkan/generated/validation_cmd_first_instance_comp.cpp index 657b2c6aacd..23b54b07588 100644 --- a/layers/vulkan/generated/cmd_validation_first_instance_comp.cpp +++ b/layers/vulkan/generated/validation_cmd_first_instance_comp.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_first_instance_comp.h" +#include "validation_cmd_first_instance_comp.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_first_instance_comp_size = 1411; -[[maybe_unused]] const uint32_t cmd_validation_first_instance_comp[1411] = { +[[maybe_unused]] const uint32_t validation_cmd_first_instance_comp_size = 1411; +[[maybe_unused]] const uint32_t validation_cmd_first_instance_comp[1411] = { 0x07230203, 0x00010000, 0x0008000b, 0x000000d2, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0006000f, 0x00000005, 0x00000004, 0x6e69616d, 0x00000000, 0x0000008e, 0x00060010, 0x00000004, 0x00000011, 0x00000001, 0x00000001, 0x00000001, 0x00030003, 0x00000002, diff --git a/layers/vulkan/generated/cmd_validation_first_instance_comp.h b/layers/vulkan/generated/validation_cmd_first_instance_comp.h similarity index 89% rename from layers/vulkan/generated/cmd_validation_first_instance_comp.h rename to layers/vulkan/generated/validation_cmd_first_instance_comp.h index 633b27b133e..c519164f529 100644 --- a/layers/vulkan/generated/cmd_validation_first_instance_comp.h +++ b/layers/vulkan/generated/validation_cmd_first_instance_comp.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_first_instance_comp_size; -extern const uint32_t cmd_validation_first_instance_comp[]; +extern const uint32_t validation_cmd_first_instance_comp_size; +extern const uint32_t validation_cmd_first_instance_comp[]; diff --git a/layers/vulkan/generated/cmd_validation_trace_rays_rgen.cpp b/layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp similarity index 99% rename from layers/vulkan/generated/cmd_validation_trace_rays_rgen.cpp rename to layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp index 058ce00673f..8952696b52a 100644 --- a/layers/vulkan/generated/cmd_validation_trace_rays_rgen.cpp +++ b/layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp @@ -21,11 +21,11 @@ * ****************************************************************************/ -#include "cmd_validation_trace_rays_rgen.h" +#include "validation_cmd_trace_rays_rgen.h" // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -[[maybe_unused]] const uint32_t cmd_validation_trace_rays_rgen_size = 1755; -[[maybe_unused]] const uint32_t cmd_validation_trace_rays_rgen[1755] = { +[[maybe_unused]] const uint32_t validation_cmd_trace_rays_rgen_size = 1755; +[[maybe_unused]] const uint32_t validation_cmd_trace_rays_rgen[1755] = { 0x07230203, 0x00010500, 0x0008000b, 0x000000fb, 0x00000000, 0x00020011, 0x0000000b, 0x00020011, 0x0000117f, 0x00020011, 0x000014e3, 0x0006000a, 0x5f565053, 0x5f52484b, 0x5f796172, 0x63617274, 0x00676e69, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x000014e4, 0x00000001, 0x000a000f, 0x000014c1, 0x00000004, 0x6e69616d, diff --git a/layers/vulkan/generated/cmd_validation_trace_rays_rgen.h b/layers/vulkan/generated/validation_cmd_trace_rays_rgen.h similarity index 90% rename from layers/vulkan/generated/cmd_validation_trace_rays_rgen.h rename to layers/vulkan/generated/validation_cmd_trace_rays_rgen.h index a17c31cf1da..3bdc4c0ae68 100644 --- a/layers/vulkan/generated/cmd_validation_trace_rays_rgen.h +++ b/layers/vulkan/generated/validation_cmd_trace_rays_rgen.h @@ -26,5 +26,5 @@ #include // To view SPIR-V, copy contents of array and paste in https://www.khronos.org/spir/visualizer/ -extern const uint32_t cmd_validation_trace_rays_rgen_size; -extern const uint32_t cmd_validation_trace_rays_rgen[]; +extern const uint32_t validation_cmd_trace_rays_rgen_size; +extern const uint32_t validation_cmd_trace_rays_rgen[]; diff --git a/scripts/generate_source.py b/scripts/generate_source.py index 9995a1708e0..75023a55cc4 100755 --- a/scripts/generate_source.py +++ b/scripts/generate_source.py @@ -395,24 +395,24 @@ def main(argv): # The shaders requires glslangvalidator, so they are updated manually with generate_spirv when needed verify_exclude = [ '.clang-format', - 'cmd_validation_copy_buffer_to_image_comp.h', - 'cmd_validation_copy_buffer_to_image_comp.cpp', - 'cmd_validation_dispatch_comp.h', - 'cmd_validation_dispatch_comp.cpp', - 'cmd_validation_count_buffer_comp.h', - 'cmd_validation_count_buffer_comp.cpp', - 'cmd_validation_first_instance_comp.h', - 'cmd_validation_first_instance_comp.cpp', - 'cmd_validation_draw_indexed_comp.h', - 'cmd_validation_draw_indexed_comp.cpp', - 'cmd_validation_draw_indexed_indirect_index_buffer_comp.h', - 'cmd_validation_draw_indexed_indirect_index_buffer_comp.cpp', - 'cmd_validation_draw_indexed_indirect_vertex_buffer_comp.h', - 'cmd_validation_draw_indexed_indirect_vertex_buffer_comp.cpp', - 'cmd_validation_draw_mesh_indirect_comp.h', - 'cmd_validation_draw_mesh_indirect_comp.cpp', - 'cmd_validation_trace_rays_rgen.h', - 'cmd_validation_trace_rays_rgen.cpp', + 'validation_cmd_copy_buffer_to_image_comp.h', + 'validation_cmd_copy_buffer_to_image_comp.cpp', + 'validation_cmd_dispatch_comp.h', + 'validation_cmd_dispatch_comp.cpp', + 'validation_cmd_count_buffer_comp.h', + 'validation_cmd_count_buffer_comp.cpp', + 'validation_cmd_first_instance_comp.h', + 'validation_cmd_first_instance_comp.cpp', + 'validation_cmd_draw_indexed_comp.h', + 'validation_cmd_draw_indexed_comp.cpp', + 'validation_cmd_draw_indexed_indirect_index_buffer_comp.h', + 'validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp', + 'validation_cmd_draw_indexed_indirect_vertex_buffer_comp.h', + 'validation_cmd_draw_indexed_indirect_vertex_buffer_comp.cpp', + 'validation_cmd_draw_mesh_indirect_comp.h', + 'validation_cmd_draw_mesh_indirect_comp.cpp', + 'validation_cmd_trace_rays_rgen.h', + 'validation_cmd_trace_rays_rgen.cpp', 'instrumentation_buffer_device_address_comp.h', 'instrumentation_buffer_device_address_comp.cpp', 'instrumentation_descriptor_indexing_oob_bindless_comp.h', diff --git a/scripts/generate_spirv.py b/scripts/generate_spirv.py index 776d70408ba..90a594b0eef 100755 --- a/scripts/generate_spirv.py +++ b/scripts/generate_spirv.py @@ -190,7 +190,7 @@ def write(words, filename, apiname, outdir = None): print(source, end="", file=f) def main(): - parser = argparse.ArgumentParser(description='Generate spirv code for this repository, see layers/gpu/shaders/README.md for more deatils') + parser = argparse.ArgumentParser(description='Generate spirv code for this repository, see layers/gpuav/shaders/README.md for more deatils') parser.add_argument('--api', default='vulkan', choices=['vulkan'], @@ -203,15 +203,15 @@ def main(): args = parser.parse_args() shaders_to_compile = [] - # Get all shaders in gpu/shaders folder + # Get all shaders in gpuav/shaders folder shader_type = ['vert', 'tesc', 'tese', 'geom', 'frag', 'comp', 'mesh', 'task', 'rgen', 'rint', 'rahit', 'rchit', 'rmiss', 'rcall'] - gpu_shaders_dir = common_ci.RepoRelative('layers/gpu/shaders') - diagnostic_shaders = common_ci.RepoRelative('layers/gpu/shaders/cmd_validation') + gpu_shaders_dir = common_ci.RepoRelative('layers/gpuav/shaders') + diagnostic_shaders = common_ci.RepoRelative('layers/gpuav/shaders/validation_cmd') for filename in os.listdir(diagnostic_shaders): if (filename.split(".")[-1] in shader_type): shaders_to_compile.append(os.path.join(diagnostic_shaders, filename)) - instrumentation_shaders = common_ci.RepoRelative('layers/gpu/shaders/instrumentation') + instrumentation_shaders = common_ci.RepoRelative('layers/gpuav/shaders/instrumentation') for filename in os.listdir(instrumentation_shaders): if (filename.split(".")[-1] in shader_type): shaders_to_compile.append(os.path.join(instrumentation_shaders, filename)) diff --git a/scripts/generators/dispatch_object_generator.py b/scripts/generators/dispatch_object_generator.py index 598eb0e34d5..eeda22e624c 100644 --- a/scripts/generators/dispatch_object_generator.py +++ b/scripts/generators/dispatch_object_generator.py @@ -69,7 +69,7 @@ def getValidationLayerList(targetApiName: str) -> list[dict[str, str]]: 'type': 'LayerObjectTypeBestPractices', }, { - 'include': 'gpu/core/gpuav.h', + 'include': 'gpuav/core/gpuav.h', 'class': 'gpuav::Validator', 'enabled': 'settings.enabled[gpu_validation] || settings.enabled[debug_printf_validation]', 'type': 'LayerObjectTypeGpuAssisted', diff --git a/scripts/generators/dispatch_vector_generator.py b/scripts/generators/dispatch_vector_generator.py index fadbc0ee46b..eee843a0ed1 100644 --- a/scripts/generators/dispatch_vector_generator.py +++ b/scripts/generators/dispatch_vector_generator.py @@ -49,7 +49,7 @@ def genInitObjectDispatchVectorSource(targetApiName: str) -> str: #include "object_tracker/object_lifetime_validation.h" #include "core_checks/core_validation.h" #include "best_practices/best_practices_validation.h" -#include "gpu/core/gpuav.h" +#include "gpuav/core/gpuav.h" #include "sync/sync_validation.h" namespace vvl { diff --git a/scripts/vk_validation_stats.py b/scripts/vk_validation_stats.py index 650113b93cd..1fce2f5561f 100755 --- a/scripts/vk_validation_stats.py +++ b/scripts/vk_validation_stats.py @@ -491,12 +491,12 @@ def main(argv): layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/sync/'), '*.cpp'))) layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/object_tracker/'), '*.cpp'))) layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/drawdispatch/'), '*.cpp'))) - layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpu/'), '*.cpp'))) - layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpu/cmd_validation/'), '*.cpp'))) - layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpu/core/'), '*.cpp'))) - layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpu/descriptor_validation/'), '*.cpp'))) - layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpu/error_message/'), '*.cpp'))) - layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpu/instrumentation/'), '*.cpp'))) + layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpuav/'), '*.cpp'))) + layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpuav/validation_cmd/'), '*.cpp'))) + layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpuav/core/'), '*.cpp'))) + layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpuav/descriptor_validation/'), '*.cpp'))) + layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpuav/error_message/'), '*.cpp'))) + layer_source_files.extend(glob.glob(os.path.join(repo_relative('layers/gpuav/instrumentation/'), '*.cpp'))) test_source_files = glob.glob(os.path.join(repo_relative('tests/unit'), '*.cpp')) diff --git a/tests/spirv/CMakeLists.txt b/tests/spirv/CMakeLists.txt index 0778d58b7e0..ae88ac0e0be 100644 --- a/tests/spirv/CMakeLists.txt +++ b/tests/spirv/CMakeLists.txt @@ -23,7 +23,7 @@ target_sources(instrumentation PRIVATE target_include_directories(instrumentation PRIVATE ${CMAKE_SOURCE_DIR}/layers ${CMAKE_SOURCE_DIR}/layers/${API_TYPE} - ${CMAKE_SOURCE_DIR}/layers/gpu/spirv) + ${CMAKE_SOURCE_DIR}/layers/gpuav/spirv) target_link_libraries(instrumentation PRIVATE SPIRV-Headers::SPIRV-Headers diff --git a/tests/unit/gpu_av_descriptor_class_general_buffer.cpp b/tests/unit/gpu_av_descriptor_class_general_buffer.cpp index c8b0e01f669..cc342ef88ad 100644 --- a/tests/unit/gpu_av_descriptor_class_general_buffer.cpp +++ b/tests/unit/gpu_av_descriptor_class_general_buffer.cpp @@ -14,7 +14,7 @@ #include "../framework/layer_validation_tests.h" #include "../framework/pipeline_helper.h" #include "../framework/descriptor_helper.h" -#include "../layers/gpu/shaders/gpuav_shaders_constants.h" +#include "../layers/gpuav/shaders/gpuav_shaders_constants.h" class NegativeGpuAVDescriptorClassGeneralBuffer : public GpuAVDescriptorClassGeneralBuffer { public: diff --git a/tests/unit/gpu_av_descriptor_indexing.cpp b/tests/unit/gpu_av_descriptor_indexing.cpp index 040a88e39b3..bdf207b116e 100644 --- a/tests/unit/gpu_av_descriptor_indexing.cpp +++ b/tests/unit/gpu_av_descriptor_indexing.cpp @@ -16,7 +16,7 @@ #include "../framework/pipeline_helper.h" #include "../framework/descriptor_helper.h" -#include "../layers/gpu/shaders/gpuav_shaders_constants.h" +#include "../layers/gpuav/shaders/gpuav_shaders_constants.h" class NegativeGpuAVDescriptorIndexing : public GpuAVDescriptorIndexingTest {}; diff --git a/tests/unit/gpu_av_positive.cpp b/tests/unit/gpu_av_positive.cpp index 558697c9815..5abea40025f 100644 --- a/tests/unit/gpu_av_positive.cpp +++ b/tests/unit/gpu_av_positive.cpp @@ -19,7 +19,7 @@ #include "../framework/pipeline_helper.h" #include "../framework/descriptor_helper.h" #include "../framework/gpu_av_helper.h" -#include "../../layers/gpu/shaders/gpuav_shaders_constants.h" +#include "../../layers/gpuav/shaders/gpuav_shaders_constants.h" class PositiveGpuAV : public GpuAVTest {}; diff --git a/tests/unit/gpu_av_ray_query.cpp b/tests/unit/gpu_av_ray_query.cpp index 2c6bd5a9e86..c01b90993ec 100644 --- a/tests/unit/gpu_av_ray_query.cpp +++ b/tests/unit/gpu_av_ray_query.cpp @@ -19,7 +19,7 @@ #include "../framework/pipeline_helper.h" #include "../framework/descriptor_helper.h" #include "../framework/ray_tracing_objects.h" -#include "../../layers/gpu/shaders/gpuav_shaders_constants.h" +#include "../../layers/gpuav/shaders/gpuav_shaders_constants.h" class NegativeGpuAVRayQuery : public GpuAVRayQueryTest {};