tests:Fix EmptyDescriptorUpdateTest test
authorTobin Ehlis <tobine@google.com>
Fri, 27 Oct 2017 00:03:12 +0000 (18:03 -0600)
committerTobin Ehlis <tobine@google.com>
Mon, 30 Oct 2017 17:01:05 +0000 (11:01 -0600)
Make sure that allocation for buffer is large enough to accommodate the
buffer's device memory requirements.
This fixes last failing test with mock. Also reran through all tests
and updating unexpected error and skipped test lists.

icd/README.md
tests/layer_validation_tests.cpp

index 8905577..d16d7c6 100644 (file)
@@ -61,32 +61,22 @@ capabilities.
 ## Status
 
 This is a temporary section used for tracking as the mock icd is being developed. Once all tests are passing with the mock, this section can be removed.
-Currently 324/332 tests are passing with the mock icd, but many passing tests have unexpected validation errors that need to be cleaned up.
+Currently 333/333 tests are passing with the mock icd, but many passing tests have unexpected validation errors that need to be cleaned up.
 
 ### Failing Tests
 
-VkPositiveLayerTest.EmptyDescriptorUpdateTest
+NONE
 
 ### Passing Tests With Unexpected Errors
 
-VkLayerTest.InvalidUsageBits
-VkLayerTest.ImageSampleCounts
 VkLayerTest.InvalidCmdBufferBufferDestroyed
 VkLayerTest.RenderPassInUseDestroyedSignaled
-VkLayerTest.BufferMemoryNotBound
 VkLayerTest.InvalidCmdBufferDescriptorSetBufferDestroyed
+VkLayerTest.InvalidDynamicOffsetCases
 VkLayerTest.DSUsageBitsErrors
 VkLayerTest.DSBufferInfoErrors
 VkLayerTest.DSBufferLimitErrors
 VkLayerTest.RenderPassIncompatible
-VkLayerTest.InvalidImageLayout
-VkLayerTest.CopyImageLayerCountMismatch
-VkLayerTest.MiscImageLayerTests
-VkLayerTest.CopyImageTypeExtentMismatchMaintenance1
-VkLayerTest.CopyImageFormatSizeMismatch
-VkLayerTest.CopyImageDepthStencilFormatMismatch
-VkLayerTest.CopyImageAspectMismatch
-
 
 ### Skipped Tests
 
@@ -95,9 +85,8 @@ VkLayerTest.CreatePipelineBadVertexAttributeFormat
 VkLayerTest.MiscBlitImageTests
 VkLayerTest.TemporaryExternalSemaphore
 VkLayerTest.TemporaryExternalFence
-VkLayerTest.InvalidDynamicOffsetCases
 VkLayerTest.PSOViewportScissorCountTests
-VkLayerTest.ImageBufferCopyTests
+VkLayerTest.InvalidBarriers
 VkLayerTest.CommandQueueFlags
 VkPositiveLayerTest.TwoQueuesEnsureCorrectRetirementWithWorkStolen
 VkPositiveLayerTest.ExternalSemaphore
index b974dd9..c57e304 100644 (file)
@@ -21135,6 +21135,10 @@ TEST_F(VkPositiveLayerTest, EmptyDescriptorUpdateTest) {
         vkDestroyBuffer(m_device->device(), buffer, NULL);
         return;
     }
+    // Make sure allocation is sufficiently large to accommodate buffer requirements
+    if (mem_reqs.size > mem_alloc.allocationSize) {
+        mem_alloc.allocationSize = mem_reqs.size;
+    }
 
     VkDeviceMemory mem;
     err = vkAllocateMemory(m_device->device(), &mem_alloc, NULL, &mem);