diff options
| author | Dustin Graves <dustin@lunarg.com> | 2017-03-30 15:42:16 -0600 |
|---|---|---|
| committer | Dustin Graves <dustin@lunarg.com> | 2017-03-31 10:03:46 -0600 |
| commit | c3e2a36568511e9959391ab5950cb195b1c8d087 (patch) | |
| tree | 252dc56edee85753bde298b0981ac3d3f442827a /layers/parameter_validation.cpp | |
| parent | 66598948c622ec22ba7edfdc241448da2d51dc49 (diff) | |
| download | usermoji-c3e2a36568511e9959391ab5950cb195b1c8d087.tar.xz | |
layers: Fix WriteDescriptorSet::dstSet validation
VkWriteDescriptorSet::dstSet is ignored by vkCmdPushDescriptorSetsKHR,
so the 'must not be a null handle' validation for dstSet has been moved
from the code validating the VkWriteDescriptor struct members to the
code validating the vkUpdateDescriptorSets function parameters.
Change-Id: Ia6f11d33e4d57d4c848aab72cfd91da5d5a15a30
Diffstat (limited to 'layers/parameter_validation.cpp')
| -rw-r--r-- | layers/parameter_validation.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp index bc41f125..0edce558 100644 --- a/layers/parameter_validation.cpp +++ b/layers/parameter_validation.cpp @@ -3792,6 +3792,11 @@ VKAPI_ATTR void VKAPI_CALL UpdateDescriptorSets(VkDevice device, uint32_t descri i, validation_error_map[VALIDATION_ERROR_00957]); } + // dstSet must be a valid VkDescriptorSet handle + skip |= validate_required_handle(report_data, "vkUpdateDescriptorSets", + ParameterName("pDescriptorWrites[%i].dstSet", ParameterName::IndexVector{i}), + pDescriptorWrites[i].dstSet); + if ((pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER) || (pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) || (pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE) || |