commit 255cdef09c81e25ff19bdc6f3f2830ac58984a58
author Mark Lobodzinski <mark@lunarg.com> Mon Nov 28 13:58:59 2016 -0700
committer Mark Lobodzinski <mark@lunarg.com> Wed Nov 30 06:58:05 2016 -0700
tree e24da2288639993cd41b0240a10da5456cbb2121
parent 23a6b0fe249c9a2c1babe55987584cb28089e263

tests: Fix NonCoherentMemoryMapping test

New validation checks caused failures in this older LVT.
Updated to use better Vulkan.

Change-Id: I2e29f8ba9dde248c45275efee61a329b2847a391

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index c8fd258..3c7fab0 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -16644,12 +16644,13 @@
     VkDeviceMemory mem;
     VkMemoryRequirements mem_reqs;
     mem_reqs.memoryTypeBits = 0xFFFFFFFF;
+    const VkDeviceSize atom_size = m_device->props.limits.nonCoherentAtomSize;
     VkMemoryAllocateInfo alloc_info = {};
     alloc_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
     alloc_info.pNext = NULL;
     alloc_info.memoryTypeIndex = 0;
 
-    static const VkDeviceSize allocation_size = 0x1000;
+    static const VkDeviceSize allocation_size = 32 * atom_size;
     alloc_info.allocationSize = allocation_size;
 
     // Find a memory configurations WITHOUT a COHERENT bit, otherwise exit
@@ -16673,8 +16674,7 @@
     err = vkAllocateMemory(m_device->device(), &alloc_info, NULL, &mem);
     ASSERT_VK_SUCCESS(err);
 
-    // Map/Flush/Invalidate using WHOLE_SIZE and zero offsets and entire
-    // mapped range
+    // Map/Flush/Invalidate using WHOLE_SIZE and zero offsets and entire mapped range
     m_errorMonitor->ExpectSuccess();
     err = vkMapMemory(m_device->device(), mem, 0, VK_WHOLE_SIZE, 0, (void **)&pData);
     ASSERT_VK_SUCCESS(err);
@@ -16690,14 +16690,13 @@
     m_errorMonitor->VerifyNotFound();
     vkUnmapMemory(m_device->device(), mem);
 
-    // Map/Flush/Invalidate using WHOLE_SIZE and a prime offset and entire
-    // mapped range
+    // Map/Flush/Invalidate using WHOLE_SIZE and an offset and entire mapped range
     m_errorMonitor->ExpectSuccess();
-    err = vkMapMemory(m_device->device(), mem, 13, VK_WHOLE_SIZE, 0, (void **)&pData);
+    err = vkMapMemory(m_device->device(), mem, 5 * atom_size, VK_WHOLE_SIZE, 0, (void **)&pData);
     ASSERT_VK_SUCCESS(err);
     mmr.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
     mmr.memory = mem;
-    mmr.offset = 13;
+    mmr.offset = 6 * atom_size;
     mmr.size = VK_WHOLE_SIZE;
     err = vkFlushMappedMemoryRanges(m_device->device(), 1, &mmr);
     ASSERT_VK_SUCCESS(err);
@@ -16706,15 +16705,15 @@
     m_errorMonitor->VerifyNotFound();
     vkUnmapMemory(m_device->device(), mem);
 
-    // Map with prime offset and size
-    // Flush/Invalidate subrange of mapped area with prime offset and size
+    // Map with offset and size
+    // Flush/Invalidate subrange of mapped area with offset and size
     m_errorMonitor->ExpectSuccess();
-    err = vkMapMemory(m_device->device(), mem, allocation_size - 137, 109, 0, (void **)&pData);
+    err = vkMapMemory(m_device->device(), mem, 3 * atom_size, 9 * atom_size, 0, (void **)&pData);
     ASSERT_VK_SUCCESS(err);
     mmr.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
     mmr.memory = mem;
-    mmr.offset = allocation_size - 107;
-    mmr.size = 61;
+    mmr.offset = 4 * atom_size;
+    mmr.size = 2 * atom_size;
     err = vkFlushMappedMemoryRanges(m_device->device(), 1, &mmr);
     ASSERT_VK_SUCCESS(err);
     err = vkInvalidateMappedMemoryRanges(m_device->device(), 1, &mmr);
@@ -16728,11 +16727,11 @@
     ASSERT_VK_SUCCESS(err);
     mmr.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
     mmr.memory = mem;
-    mmr.offset = allocation_size - 100;
+    mmr.offset = allocation_size - (4 * atom_size);
     mmr.size = VK_WHOLE_SIZE;
     err = vkFlushMappedMemoryRanges(m_device->device(), 1, &mmr);
     ASSERT_VK_SUCCESS(err);
-    mmr.offset = allocation_size - 200;
+    mmr.offset = allocation_size - (6 * atom_size);
     mmr.size = VK_WHOLE_SIZE;
     err = vkFlushMappedMemoryRanges(m_device->device(), 1, &mmr);
     ASSERT_VK_SUCCESS(err);