Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions layers/vulkansc/generated/command_validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "command_validation.h"
#include "containers/custom_containers.h"

extern const char *kVUIDUndefined;
extern const char* kVUIDUndefined;

using Func = vvl::Func;
// clang-format off
Expand Down Expand Up @@ -2888,7 +2888,7 @@ return kCommandValidationTable;
}
// clang-format on

const CommandValidationInfo &GetCommandValidationInfo(vvl::Func command) {
const CommandValidationInfo& GetCommandValidationInfo(vvl::Func command) {
auto info_it = GetCommandValidationTable().find(command);
assert(info_it != GetCommandValidationTable().end());
return info_it->second;
Expand Down
1,106 changes: 553 additions & 553 deletions layers/vulkansc/generated/device_features.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion layers/vulkansc/generated/device_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,6 @@ struct DeviceFeatures {
bool zeroInitializeDeviceMemory;
};

void GetEnabledDeviceFeatures(const VkDeviceCreateInfo *pCreateInfo, DeviceFeatures *features, const APIVersion &api_version);
void GetEnabledDeviceFeatures(const VkDeviceCreateInfo* pCreateInfo, DeviceFeatures* features, const APIVersion& api_version);

// NOLINTEND
544 changes: 408 additions & 136 deletions layers/vulkansc/generated/dispatch_object.cpp

Large diffs are not rendered by default.

1,114 changes: 557 additions & 557 deletions layers/vulkansc/generated/feature_not_present.cpp

Large diffs are not rendered by default.

1,214 changes: 607 additions & 607 deletions layers/vulkansc/generated/feature_requirements_helper.cpp

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions layers/vulkansc/generated/feature_requirements_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -1155,13 +1155,13 @@ enum class Feature {
};

struct FeatureAndName {
VkBool32 *feature;
const char *name;
VkBool32* feature;
const char* name;
};

// Find or add the correct VkPhysicalDeviceFeature struct in `pnext_chain` based on `feature`,
// a vkt::Feature enum value, and set feature to VK_TRUE
FeatureAndName AddFeature(APIVersion api_version, vkt::Feature feature, void **inout_pnext_chain);
FeatureAndName AddFeature(APIVersion api_version, vkt::Feature feature, void** inout_pnext_chain);

} // namespace vkt

Expand Down
1,742 changes: 871 additions & 871 deletions layers/vulkansc/generated/pnext_chain_extraction.cpp

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions layers/vulkansc/generated/pnext_chain_extraction.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@
namespace vvl {

// Add element to the end of a pNext chain
void *PnextChainAdd(void *chain, void *new_struct);
void* PnextChainAdd(void* chain, void* new_struct);

// Remove last element from a pNext chain
void PnextChainRemoveLast(void *chain);
void PnextChainRemoveLast(void* chain);

// Free dynamically allocated pnext chain structs
void PnextChainFree(void *chain);
void PnextChainFree(void* chain);

// Helper class relying on RAII to help with adding and removing an element from a pNext chain
class PnextChainScopedAdd {
public:
PnextChainScopedAdd(void *chain, void *new_struct) : chain(chain) { PnextChainAdd(chain, new_struct); }
PnextChainScopedAdd(void* chain, void* new_struct) : chain(chain) { PnextChainAdd(chain, new_struct); }
~PnextChainScopedAdd() { PnextChainRemoveLast(chain); }

private:
void *chain = nullptr;
void* chain = nullptr;
};

// clang-format off
Expand Down
4 changes: 2 additions & 2 deletions layers/vulkansc/generated/spirv_validation_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ struct FeaturePointer {
// Default and nullptr constructor to create an empty FeaturePointer
FeaturePointer() : IsEnabled(nullptr) {}
FeaturePointer(std::nullptr_t ptr) : IsEnabled(nullptr) {}
FeaturePointer(bool DeviceFeatures::*ptr) : IsEnabled([=](const DeviceFeatures& features) { return features.*ptr; }) {}
FeaturePointer(bool DeviceFeatures::* ptr) : IsEnabled([=](const DeviceFeatures& features) { return features.*ptr; }) {}
};

// Each instance of the struct will only have a singel field non-null
struct RequiredSpirvInfo {
uint32_t version;
FeaturePointer feature;
ExtEnabled DeviceExtensions::*extension;
ExtEnabled DeviceExtensions::* extension;
const char* property; // For human readability and make some capabilities unique
};

Expand Down
42 changes: 21 additions & 21 deletions layers/vulkansc/generated/vk_extension_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ enum ExtEnabled : unsigned char {
// Map of promoted extension information per version (a separate map exists for instance and device extensions).
// The map is keyed by the version number (e.g. VK_API_VERSION_1_1) and each value is a pair consisting of the
// version string (e.g. "VK_VERSION_1_1") and the set of name of the promoted extensions.
using PromotedExtensionInfoMap = vvl::unordered_map<uint32_t, std::pair<const char *, vvl::unordered_set<vvl::Extension>>>;
const PromotedExtensionInfoMap &GetInstancePromotionInfoMap();
const PromotedExtensionInfoMap &GetDevicePromotionInfoMap();
using PromotedExtensionInfoMap = vvl::unordered_map<uint32_t, std::pair<const char*, vvl::unordered_set<vvl::Extension>>>;
const PromotedExtensionInfoMap& GetInstancePromotionInfoMap();
const PromotedExtensionInfoMap& GetDevicePromotionInfoMap();

/*
This function is a helper to know if the extension is enabled.
Expand Down Expand Up @@ -136,23 +136,23 @@ struct InstanceExtensions {
ExtEnabled vk_sec_ubm_surface{kNotSupported};

struct Requirement {
const ExtEnabled InstanceExtensions::*enabled;
const char *name;
const ExtEnabled InstanceExtensions::* enabled;
const char* name;
};
// Only one requirement needs to be satisfied
using RequirementOrGroup = small_vector<Requirement, 1>;
using RequirementVec = std::vector<RequirementOrGroup>;
struct Info {
Info(ExtEnabled InstanceExtensions::*state_, const RequirementVec requirements_)
Info(ExtEnabled InstanceExtensions::* state_, const RequirementVec requirements_)
: state(state_), requirements(requirements_) {}
ExtEnabled InstanceExtensions::*state;
ExtEnabled InstanceExtensions::* state;
RequirementVec requirements;
};

const Info &GetInfo(vvl::Extension extension_name) const;
const Info& GetInfo(vvl::Extension extension_name) const;

InstanceExtensions() = default;
InstanceExtensions(APIVersion requested_api_version, const VkInstanceCreateInfo *pCreateInfo);
InstanceExtensions(APIVersion requested_api_version, const VkInstanceCreateInfo* pCreateInfo);
};

struct DeviceExtensions : public InstanceExtensions {
Expand Down Expand Up @@ -595,32 +595,32 @@ struct DeviceExtensions : public InstanceExtensions {
ExtEnabled vk_ext_mesh_shader{kNotSupported};

struct Requirement {
const ExtEnabled DeviceExtensions::*enabled;
const char *name;
const ExtEnabled DeviceExtensions::* enabled;
const char* name;
};
// Only one requirement needs to be satisfied
using RequirementOrGroup = std::vector<Requirement>;
using RequirementVec = std::vector<RequirementOrGroup>;
struct Info {
Info(ExtEnabled DeviceExtensions::*state_, const RequirementVec requirements_)
Info(ExtEnabled DeviceExtensions::* state_, const RequirementVec requirements_)
: state(state_), requirements(requirements_) {}
ExtEnabled DeviceExtensions::*state;
ExtEnabled DeviceExtensions::* state;
RequirementVec requirements;
};

const Info &GetInfo(vvl::Extension extension_name) const;
const Info& GetInfo(vvl::Extension extension_name) const;

DeviceExtensions() = default;
DeviceExtensions(const InstanceExtensions &instance_ext) : InstanceExtensions(instance_ext) {}
DeviceExtensions(const InstanceExtensions& instance_ext) : InstanceExtensions(instance_ext) {}

DeviceExtensions(const InstanceExtensions &instance_extensions, APIVersion requested_api_version,
const VkDeviceCreateInfo *pCreateInfo = nullptr);
DeviceExtensions(const InstanceExtensions &instance_ext, APIVersion requested_api_version,
const std::vector<VkExtensionProperties> &props);
DeviceExtensions(const InstanceExtensions& instance_extensions, APIVersion requested_api_version,
const VkDeviceCreateInfo* pCreateInfo = nullptr);
DeviceExtensions(const InstanceExtensions& instance_ext, APIVersion requested_api_version,
const std::vector<VkExtensionProperties>& props);
};

const InstanceExtensions::Info &GetInstanceVersionMap(const char *version);
const DeviceExtensions::Info &GetDeviceVersionMap(const char *version);
const InstanceExtensions::Info& GetInstanceVersionMap(const char* version);
const DeviceExtensions::Info& GetDeviceVersionMap(const char* version);

constexpr bool IsInstanceExtension(vvl::Extension extension) {
switch (extension) {
Expand Down
Loading