scripts: First phase of refactoring Stateless codegen

spencer-lunarg · Jun 28, 2023 · f09fed2 · f09fed2
1 parent c49d8e9
commit f09fed2
Show file tree

Hide file tree

Showing 24 changed files with 1,017 additions and 1,079 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -222,8 +222,8 @@ object_lifetimes_sources = [
 ]
 
 stateless_validation_sources = [
-  "layers/vulkan/generated/parameter_validation.cpp",
-  "layers/vulkan/generated/parameter_validation.h",
+  "layers/vulkan/generated/stateless_validation_helper.cpp",
+  "layers/vulkan/generated/stateless_validation_helper.h",
   "layers/vulkan/generated/enum_flag_bits.h",
   "layers/stateless/parameter_name.h",
   "layers/stateless/sl_buffer.cpp",
@@ -288,8 +288,8 @@ chassis_sources = [
   "$vulkan_headers_dir/include/vulkan/vk_layer.h",
   "$vulkan_headers_dir/include/vulkan/vulkan.h",
   "layers/vulkan/generated/chassis.cpp",
-  "layers/vulkan/generated/valid_param_values.cpp",
-  "layers/vulkan/generated/valid_param_values.h",
+  "layers/vulkan/generated/valid_enum_values.cpp",
+  "layers/vulkan/generated/valid_enum_values.h",
   "layers/vulkan/generated/chassis.h",
   "layers/vulkan/generated/chassis_dispatch_helper.h",
   "layers/vulkan/generated/layer_chassis_dispatch.cpp",

diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
@@ -112,14 +112,14 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/sync/sync_validation.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/utils/convert_utils.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vulkan/generated/layer_chassis_dispatch.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vulkan/generated/chassis.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vulkan/generated/valid_param_values.cpp
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vulkan/generated/valid_enum_values.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/layer_options.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_checks/cc_query.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_checks/cc_queue.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_checks/cc_ray_tracing.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_checks/cc_wsi.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_checks/cc_ycbcr.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vulkan/generated/parameter_validation.cpp
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vulkan/generated/stateless_validation_helper.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/stateless/sl_buffer.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/stateless/sl_cmd_buffer_dynamic.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/stateless/sl_cmd_buffer.cpp

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
@@ -243,17 +243,18 @@ target_sources(vvl PRIVATE
     ${API_TYPE}/generated/best_practices.cpp
     ${API_TYPE}/generated/best_practices.h
     ${API_TYPE}/generated/chassis.cpp
-    ${API_TYPE}/generated/valid_param_values.cpp
+    ${API_TYPE}/generated/valid_enum_values.cpp
+    ${API_TYPE}/generated/valid_enum_values.h
     ${API_TYPE}/generated/command_validation.cpp
     ${API_TYPE}/generated/dynamic_state_helper.cpp
     ${API_TYPE}/generated/enum_flag_bits.h
     ${API_TYPE}/generated/layer_chassis_dispatch.cpp
     ${API_TYPE}/generated/object_tracker.cpp
     ${API_TYPE}/generated/object_tracker.h
-    ${API_TYPE}/generated/parameter_validation.cpp
-    ${API_TYPE}/generated/parameter_validation.h
     ${API_TYPE}/generated/spirv_grammar_helper.cpp
     ${API_TYPE}/generated/spirv_validation_helper.cpp
+    ${API_TYPE}/generated/stateless_validation_helper.cpp
+    ${API_TYPE}/generated/stateless_validation_helper.h
     ${API_TYPE}/generated/sync_validation_types.cpp
     ${API_TYPE}/generated/thread_safety.cpp
     ${API_TYPE}/generated/thread_safety_commands.h

diff --git a/layers/stateless/sl_ray_tracing.cpp b/layers/stateless/sl_ray_tracing.cpp
@@ -167,7 +167,7 @@ bool StatelessValidation::ValidateAccelerationStructureInfoNV(const VkAccelerati
         }
     }
     skip |=
-        ValidateFlags(func_name, "info.flags", "VkBuildAccelerationStructureFlagBitsNV", AllVkBuildAccelerationStructureFlagBitsNV,
+        ValidateFlags(func_name, "info.flags", "VkBuildAccelerationStructureFlagBitsNV", AllVkBuildAccelerationStructureFlagBitsKHR,
                       info.flags, kOptionalFlags, "VUID-VkAccelerationStructureInfoNV-flags-parameter");
     return skip;
 }

diff --git a/layers/stateless/stateless_validation.h b/layers/stateless/stateless_validation.h
@@ -1140,5 +1140,5 @@ class StatelessValidation : public ValidationObject {
     bool manual_PreCallValidateExportMetalObjectsEXT(VkDevice device, VkExportMetalObjectsInfoEXT *pMetalObjectsInfo) const;
 #endif  // VK_USE_PLATFORM_METAL_EXT
 
-#include "generated/parameter_validation.h"
+#include "generated/stateless_validation_helper.h"
 };  // Class StatelessValidation
diff --git a/layers/vulkan/generated/chassis.h b/layers/vulkan/generated/chassis.h
@@ -6302,4 +6302,4 @@ class ValidationObject {
 };
 
 extern small_unordered_map<void*, ValidationObject*, 2> layer_data_map;
-#include "valid_param_values.h"
+#include "valid_enum_values.h"
diff --git a/layers/vulkan/generated/enum_flag_bits.h b/layers/vulkan/generated/enum_flag_bits.h
diff --git a/...vulkan/generated/parameter_validation.cpp → ...generated/stateless_validation_helper.cpp b/...vulkan/generated/parameter_validation.cpp → ...generated/stateless_validation_helper.cpp
@@ -16603,7 +16603,7 @@ bool StatelessValidation::PreCallValidateCreateAccelerationStructureNV(
 
         skip |= ValidateRangedEnum("vkCreateAccelerationStructureNV", "pCreateInfo->info.type", "VkAccelerationStructureTypeNV", pCreateInfo->info.type, "VUID-VkAccelerationStructureInfoNV-type-parameter");
 
-        skip |= ValidateFlags("vkCreateAccelerationStructureNV", "pCreateInfo->info.flags", "VkBuildAccelerationStructureFlagBitsNV", AllVkBuildAccelerationStructureFlagBitsNV, pCreateInfo->info.flags, kOptionalFlags, "VUID-VkAccelerationStructureInfoNV-flags-parameter");
+        skip |= ValidateFlags("vkCreateAccelerationStructureNV", "pCreateInfo->info.flags", "VkBuildAccelerationStructureFlagBitsKHR", AllVkBuildAccelerationStructureFlagBitsKHR, pCreateInfo->info.flags, kOptionalFlags, "VUID-VkAccelerationStructureInfoNV-flags-parameter");
 
         skip |= ValidateStructTypeArray("vkCreateAccelerationStructureNV", "pCreateInfo->info.geometryCount", "pCreateInfo->info.pGeometries", "VK_STRUCTURE_TYPE_GEOMETRY_NV", pCreateInfo->info.geometryCount, pCreateInfo->info.pGeometries, VK_STRUCTURE_TYPE_GEOMETRY_NV, false, true, "VUID-VkGeometryNV-sType-sType", "VUID-VkAccelerationStructureInfoNV-pGeometries-parameter", kVUIDUndefined);
 
@@ -16754,7 +16754,7 @@ bool StatelessValidation::PreCallValidateCmdBuildAccelerationStructureNV(
 
         skip |= ValidateRangedEnum("vkCmdBuildAccelerationStructureNV", "pInfo->type", "VkAccelerationStructureTypeNV", pInfo->type, "VUID-VkAccelerationStructureInfoNV-type-parameter");
 
-        skip |= ValidateFlags("vkCmdBuildAccelerationStructureNV", "pInfo->flags", "VkBuildAccelerationStructureFlagBitsNV", AllVkBuildAccelerationStructureFlagBitsNV, pInfo->flags, kOptionalFlags, "VUID-VkAccelerationStructureInfoNV-flags-parameter");
+        skip |= ValidateFlags("vkCmdBuildAccelerationStructureNV", "pInfo->flags", "VkBuildAccelerationStructureFlagBitsKHR", AllVkBuildAccelerationStructureFlagBitsKHR, pInfo->flags, kOptionalFlags, "VUID-VkAccelerationStructureInfoNV-flags-parameter");
 
         skip |= ValidateStructTypeArray("vkCmdBuildAccelerationStructureNV", "pInfo->geometryCount", "pInfo->pGeometries", "VK_STRUCTURE_TYPE_GEOMETRY_NV", pInfo->geometryCount, pInfo->pGeometries, VK_STRUCTURE_TYPE_GEOMETRY_NV, false, true, "VUID-VkGeometryNV-sType-sType", "VUID-VkAccelerationStructureInfoNV-pGeometries-parameter", kVUIDUndefined);