commit a94b60b6fe8607edc86e3fb1878838ed4d433954
author Chris Forbes <chrisforbes@google.com> Fri Oct 20 11:28:02 2017 -0700
committer Chris Forbes <chrisf@ijw.co.nz> Fri Oct 20 12:53:13 2017 -0700
tree b10ffad33dd4eae85affd767aeba56f8aaa3e821
parent 2c600e90e2fefe9aecfc7b94649b31ffef6f4051

layers: Use shared rules for OT CmdPushDescriptorSetKHR

layers/object_tracker_utils.cpp

diff --git a/layers/object_tracker_utils.cpp b/layers/object_tracker_utils.cpp
index 6cad036..93c325f 100644
--- a/layers/object_tracker_utils.cpp
+++ b/layers/object_tracker_utils.cpp
@@ -246,31 +246,7 @@
                                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);
             }
         }
     }