layers: Pass unique error codes through descriptor validation
Descriptor validation builds up error strings at multiple levels such as
UpdateError->WriteUpdate->BufferUpdate->BufferOffset. The final error is
then reported via a log_msg() call at the top level.
In order for this design to allow for the new unique error codes, we need
to pass error codes down the chain in the same way we pass error strings
down the chain.
This change adds error msg passing for descriptor updates. Many error
codes are added in as well as comments for codes that are missing or need
to be updated.
The database file is also updated to account for all of the checks that
were updated and/or reviewed.
diff --git a/layers/descriptor_sets.h b/layers/descriptor_sets.h
index 4345154..2ea8388 100644
--- a/layers/descriptor_sets.h
+++ b/layers/descriptor_sets.h
@@ -168,7 +168,8 @@
// Shared helper functions - These are useful because the shared sampler image descriptor type
// performs common functions with both sampler and image descriptors so they can share their common functions
bool ValidateSampler(const VkSampler, const core_validation::layer_data *);
-bool ValidateImageUpdate(VkImageView, VkImageLayout, VkDescriptorType, const core_validation::layer_data *, std::string *);
+bool ValidateImageUpdate(VkImageView, VkImageLayout, VkDescriptorType, const core_validation::layer_data *,
+ UNIQUE_VALIDATION_ERROR_CODE *, std::string *);
class SamplerDescriptor : public Descriptor {
public:
@@ -330,11 +331,13 @@
// Descriptor Update functions. These functions validate state and perform update separately
// Validate contents of a WriteUpdate
- bool ValidateWriteUpdate(const debug_report_data *, const VkWriteDescriptorSet *, std::string *);
+ bool ValidateWriteUpdate(const debug_report_data *, const VkWriteDescriptorSet *, UNIQUE_VALIDATION_ERROR_CODE *,
+ std::string *);
// Perform a WriteUpdate whose contents were just validated using ValidateWriteUpdate
void PerformWriteUpdate(const VkWriteDescriptorSet *);
// Validate contents of a CopyUpdate
- bool ValidateCopyUpdate(const debug_report_data *, const VkCopyDescriptorSet *, const DescriptorSet *, std::string *);
+ bool ValidateCopyUpdate(const debug_report_data *, const VkCopyDescriptorSet *, const DescriptorSet *,
+ UNIQUE_VALIDATION_ERROR_CODE *, std::string *);
// Perform a CopyUpdate whose contents were just validated using ValidateCopyUpdate
void PerformCopyUpdate(const VkCopyDescriptorSet *, const DescriptorSet *);
@@ -360,11 +363,13 @@
bool IsUpdated() const { return some_update_; };
private:
- bool VerifyWriteUpdateContents(const VkWriteDescriptorSet *, const uint32_t, std::string *) const;
+ bool VerifyWriteUpdateContents(const VkWriteDescriptorSet *, const uint32_t, UNIQUE_VALIDATION_ERROR_CODE *,
+ std::string *) const;
bool VerifyCopyUpdateContents(const VkCopyDescriptorSet *, const DescriptorSet *, VkDescriptorType, uint32_t,
- std::string *) const;
- bool ValidateBufferUsage(BUFFER_NODE const *, VkDescriptorType, std::string *) const;
- bool ValidateBufferUpdate(VkDescriptorBufferInfo const *, VkDescriptorType, std::string *) const;
+ UNIQUE_VALIDATION_ERROR_CODE *, std::string *) const;
+ bool ValidateBufferUsage(BUFFER_NODE const *, VkDescriptorType, UNIQUE_VALIDATION_ERROR_CODE *, std::string *) const;
+ bool ValidateBufferUpdate(VkDescriptorBufferInfo const *, VkDescriptorType, UNIQUE_VALIDATION_ERROR_CODE *,
+ std::string *) const;
// Private helper to set all bound cmd buffers to INVALID state
void InvalidateBoundCmdBuffers();
bool some_update_; // has any part of the set ever been updated?