diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-10-20 11:28:02 -0700 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-10-20 12:53:13 -0700 |
| commit | 7567470f0563474fdf4bb87ad2e1c185b981b3c0 (patch) | |
| tree | 63beb8074de393fb6c00e67db36ce5d1fbc40848 /layers/object_tracker_utils.cpp | |
| parent | c72c1265abf94c5dde536653d9e13d043a9aeadf (diff) | |
| download | usermoji-7567470f0563474fdf4bb87ad2e1c185b981b3c0.tar.xz | |
layers: Use shared rules for OT CmdPushDescriptorSetKHR
Diffstat (limited to 'layers/object_tracker_utils.cpp')
| -rw-r--r-- | layers/object_tracker_utils.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/layers/object_tracker_utils.cpp b/layers/object_tracker_utils.cpp index 6cad036c..93c325fb 100644 --- a/layers/object_tracker_utils.cpp +++ b/layers/object_tracker_utils.cpp @@ -246,31 +246,7 @@ VKAPI_ATTR void VKAPI_CALL CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer VALIDATION_ERROR_1be00009); if (pDescriptorWrites) { for (uint32_t index0 = 0; index0 < descriptorWriteCount; ++index0) { - if (pDescriptorWrites[index0].pImageInfo) { - - for (uint32_t index1 = 0; index1 < pDescriptorWrites[index0].descriptorCount; ++index1) { - skip |= - ValidateObject(commandBuffer, pDescriptorWrites[index0].pImageInfo[index1].sampler, - kVulkanObjectTypeSampler, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_04600009); - skip |= ValidateObject(commandBuffer, pDescriptorWrites[index0].pImageInfo[index1].imageView, - kVulkanObjectTypeImageView, false, VALIDATION_ERROR_UNDEFINED, - VALIDATION_ERROR_04600009); - } - } - if (pDescriptorWrites[index0].pBufferInfo) { - for (uint32_t index1 = 0; index1 < pDescriptorWrites[index0].descriptorCount; ++index1) { - skip |= - ValidateObject(commandBuffer, pDescriptorWrites[index0].pBufferInfo[index1].buffer, - kVulkanObjectTypeBuffer, false, VALIDATION_ERROR_04401a01, VALIDATION_ERROR_UNDEFINED); - } - } - if (pDescriptorWrites[index0].pTexelBufferView) { - for (uint32_t index1 = 0; index1 < pDescriptorWrites[index0].descriptorCount; ++index1) { - skip |= ValidateObject(commandBuffer, pDescriptorWrites[index0].pTexelBufferView[index1], - kVulkanObjectTypeBufferView, false, VALIDATION_ERROR_UNDEFINED, - VALIDATION_ERROR_15c00009); - } - } + skip |= ValidateDescriptorWrite(commandBuffer, &pDescriptorWrites[index0], true); } } } |