*//*--------------------------------------------------------------------*/
#include "vktApiFillBufferTests.hpp"
+#include "vktApiBufferAndImageAllocationUtil.hpp"
#include "deStringUtil.hpp"
#include "deUniquePtr.hpp"
#include "tcuTexture.hpp"
#include "tcuTextureUtil.hpp"
#include "tcuVectorType.hpp"
+#include "deSharedPtr.hpp"
namespace vkt
{
struct TestParams
{
- enum { TEST_DATA_SIZE = 256 };
+ enum
+ {
+ TEST_DATA_SIZE = 256
+ };
- VkDeviceSize dstSize;
- VkDeviceSize dstOffset;
- VkDeviceSize size;
- deUint32 testData[TEST_DATA_SIZE];
+ VkDeviceSize dstSize;
+ VkDeviceSize dstOffset;
+ VkDeviceSize size;
+ deUint32 testData[TEST_DATA_SIZE];
+ de::SharedPtr<IBufferAllocator> bufferAllocator;
};
class FillBufferTestInstance : public vkt::TestInstance
{
public:
- FillBufferTestInstance (Context& context,
- TestParams testParams);
- virtual tcu::TestStatus iterate (void);
+ FillBufferTestInstance (Context& context,
+ TestParams testParams);
+ virtual tcu::TestStatus iterate (void);
protected:
- const TestParams m_params;
-
- Move<VkCommandPool> m_cmdPool;
- Move<VkCommandBuffer> m_cmdBuffer;
- Move<VkFence> m_fence;
- de::MovePtr<tcu::TextureLevel> m_destinationTextureLevel;
- de::MovePtr<tcu::TextureLevel> m_expectedTextureLevel;
-
- VkCommandBufferBeginInfo m_cmdBufferBeginInfo;
-
- Move<VkBuffer> m_destination;
- de::MovePtr<Allocation> m_destinationBufferAlloc;
-
- void generateBuffer (tcu::PixelBufferAccess buffer, int width, int height, int depth = 1);
- virtual void generateExpectedResult (void);
- void uploadBuffer (tcu::ConstPixelBufferAccess bufferAccess, const Allocation& bufferAlloc);
- virtual tcu::TestStatus checkTestResult (tcu::ConstPixelBufferAccess result);
- deUint32 calculateSize (tcu::ConstPixelBufferAccess src) const
- {
- return src.getWidth() * src.getHeight() * src.getDepth() * tcu::getPixelSize(src.getFormat());
- }
+ const TestParams m_params;
+
+ Move<VkCommandPool> m_cmdPool;
+ Move<VkCommandBuffer> m_cmdBuffer;
+ Move<VkFence> m_fence;
+ de::MovePtr<tcu::TextureLevel> m_destinationTextureLevel;
+ de::MovePtr<tcu::TextureLevel> m_expectedTextureLevel;
+
+ VkCommandBufferBeginInfo m_cmdBufferBeginInfo;
+
+ Move<VkBuffer> m_destination;
+ de::MovePtr<Allocation> m_destinationBufferAlloc;
+
+ void generateBuffer (tcu::PixelBufferAccess buffer,
+ int width,
+ int height,
+ int depth = 1);
+ virtual void generateExpectedResult (void);
+ void uploadBuffer (tcu::ConstPixelBufferAccess
+ bufferAccess,
+ const Allocation& bufferAlloc);
+ virtual tcu::TestStatus checkTestResult (tcu::ConstPixelBufferAccess
+ result);
+ deUint32 calculateSize (tcu::ConstPixelBufferAccess
+ src) const
+ {
+ return src.getWidth() * src.getHeight() * src.getDepth() * tcu::getPixelSize(src.getFormat());
+ }
};
-FillBufferTestInstance::FillBufferTestInstance (Context& context, TestParams testParams)
- : vkt::TestInstance (context)
- , m_params (testParams)
+ FillBufferTestInstance::FillBufferTestInstance
+ (Context& context,
+ TestParams testParams)
+ : vkt::TestInstance (context)
+ , m_params (testParams)
{
- const DeviceInterface& vk = context.getDeviceInterface();
- const VkDevice vkDevice = context.getDevice();
- const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex();
- Allocator& memAlloc = context.getDefaultAllocator();
+ const DeviceInterface& vk = context.getDeviceInterface();
+ const VkDevice vkDevice = context.getDevice();
+ const deUint32 queueFamilyIndex = context.getUniversalQueueFamilyIndex();
+ Allocator& memAlloc = context.getDefaultAllocator();
// Create command pool
m_cmdPool = createCommandPool(vk, vkDevice, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex);
// Create fence
m_fence = createFence(vk, vkDevice);
- // Create desctination buffer
- {
- const VkBufferCreateInfo destinationBufferParams =
- {
- VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- 0u, // VkBufferCreateFlags flags;
- m_params.dstSize, // VkDeviceSize size;
- VK_BUFFER_USAGE_TRANSFER_DST_BIT, // VkBufferUsageFlags usage;
- VK_SHARING_MODE_EXCLUSIVE, // VkSharingMode sharingMode;
- 1u, // deUint32 queueFamilyIndexCount;
- &queueFamilyIndex, // const deUint32* pQueueFamilyIndices;
- };
-
- m_destination = createBuffer(vk, vkDevice, &destinationBufferParams);
- m_destinationBufferAlloc = memAlloc.allocate(getBufferMemoryRequirements(vk, vkDevice, *m_destination), MemoryRequirement::HostVisible);
- VK_CHECK(vk.bindBufferMemory(vkDevice, *m_destination, m_destinationBufferAlloc->getMemory(), m_destinationBufferAlloc->getOffset()));
- }
+ testParams.bufferAllocator->createTestBuffer(m_params.dstSize, VK_BUFFER_USAGE_TRANSFER_DST_BIT, context, memAlloc, m_destination, MemoryRequirement::HostVisible, m_destinationBufferAlloc);
}
-tcu::TestStatus FillBufferTestInstance::iterate (void)
+tcu::TestStatus FillBufferTestInstance::iterate (void)
{
- const int dstLevelWidth = (int)(m_params.dstSize / 4);
- m_destinationTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(mapVkFormat(VK_FORMAT_R8G8B8A8_UINT), dstLevelWidth, 1));
+ const int dstLevelWidth = (int)(m_params.dstSize / 4);
+ m_destinationTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(mapVkFormat(VK_FORMAT_R8G8B8A8_UINT), dstLevelWidth, 1));
generateBuffer(m_destinationTextureLevel->getAccess(), dstLevelWidth, 1, 1);
uploadBuffer(m_destinationTextureLevel->getAccess(), *m_destinationBufferAlloc);
- const DeviceInterface& vk = m_context.getDeviceInterface();
- const VkDevice vkDevice = m_context.getDevice();
- const VkQueue queue = m_context.getUniversalQueue();
+ const DeviceInterface& vk = m_context.getDeviceInterface();
+ const VkDevice vkDevice = m_context.getDevice();
+ const VkQueue queue = m_context.getUniversalQueue();
- const VkBufferMemoryBarrier dstBufferBarrier =
+ const VkBufferMemoryBarrier dstBufferBarrier =
{
- VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- VK_ACCESS_TRANSFER_WRITE_BIT, // VkAccessFlags srcAccessMask;
- VK_ACCESS_HOST_READ_BIT, // VkAccessFlags dstAccessMask;
- VK_QUEUE_FAMILY_IGNORED, // deUint32 srcQueueFamilyIndex;
- VK_QUEUE_FAMILY_IGNORED, // deUint32 dstQueueFamilyIndex;
- *m_destination, // VkBuffer buffer;
- 0u, // VkDeviceSize offset;
- m_params.dstOffset // VkDeviceSize size;
+ VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // VkStructureType sType;
+ DE_NULL, // const void* pNext;
+ VK_ACCESS_TRANSFER_WRITE_BIT, // VkAccessFlags srcAccessMask;
+ VK_ACCESS_HOST_READ_BIT, // VkAccessFlags dstAccessMask;
+ VK_QUEUE_FAMILY_IGNORED, // deUint32 srcQueueFamilyIndex;
+ VK_QUEUE_FAMILY_IGNORED, // deUint32 dstQueueFamilyIndex;
+ *m_destination, // VkBuffer buffer;
+ 0u, // VkDeviceSize offset;
+ m_params.dstOffset // VkDeviceSize size;
};
- const VkCommandBufferBeginInfo cmdBufferBeginInfo =
+ const VkCommandBufferBeginInfo cmdBufferBeginInfo =
{
- VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // VkCommandBufferUsageFlags flags;
+ VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType;
+ DE_NULL, // const void* pNext;
+ VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // VkCommandBufferUsageFlags flags;
(const VkCommandBufferInheritanceInfo*)DE_NULL,
};
vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 1, &dstBufferBarrier, 0, (const VkImageMemoryBarrier*)DE_NULL);
VK_CHECK(vk.endCommandBuffer(*m_cmdBuffer));
- const VkSubmitInfo submitInfo =
+ const VkSubmitInfo submitInfo =
{
- VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- 0u, // deUint32 waitSemaphoreCount;
- DE_NULL, // const VkSemaphore* pWaitSemaphores;
+ VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType;
+ DE_NULL, // const void* pNext;
+ 0u, // deUint32 waitSemaphoreCount;
+ DE_NULL, // const VkSemaphore* pWaitSemaphores;
(const VkPipelineStageFlags*)DE_NULL,
- 1u, // deUint32 commandBufferCount;
- &m_cmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers;
- 0u, // deUint32 signalSemaphoreCount;
- DE_NULL // const VkSemaphore* pSignalSemaphores;
+ 1u, // deUint32 commandBufferCount;
+ &m_cmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers;
+ 0u, // deUint32 signalSemaphoreCount;
+ DE_NULL // const VkSemaphore* pSignalSemaphores;
};
VK_CHECK(vk.resetFences(vkDevice, 1, &m_fence.get()));
return checkTestResult(resultLevel->getAccess());
}
-void FillBufferTestInstance::generateBuffer (tcu::PixelBufferAccess buffer, int width, int height, int depth)
+void FillBufferTestInstance::generateBuffer
+ (tcu::PixelBufferAccess buffer,
+ int width,
+ int height,
+ int depth)
{
for (int z = 0; z < depth; z++)
{
}
}
-void FillBufferTestInstance::uploadBuffer (tcu::ConstPixelBufferAccess bufferAccess, const Allocation& bufferAlloc)
+void FillBufferTestInstance::uploadBuffer
+ (tcu::ConstPixelBufferAccess
+ bufferAccess,
+ const Allocation& bufferAlloc)
{
- const DeviceInterface& vk = m_context.getDeviceInterface();
- const VkDevice vkDevice = m_context.getDevice();
- const deUint32 bufferSize = calculateSize(bufferAccess);
+ const DeviceInterface& vk = m_context.getDeviceInterface();
+ const VkDevice vkDevice = m_context.getDevice();
+ const deUint32 bufferSize = calculateSize(bufferAccess);
// Write buffer data
deMemcpy(bufferAlloc.getHostPtr(), bufferAccess.getDataPtr(), bufferSize);
flushMappedMemoryRange(vk, vkDevice, bufferAlloc.getMemory(), bufferAlloc.getOffset(), bufferSize);
}
-tcu::TestStatus FillBufferTestInstance::checkTestResult (tcu::ConstPixelBufferAccess result)
+tcu::TestStatus FillBufferTestInstance::checkTestResult
+ (tcu::ConstPixelBufferAccess
+ result)
{
- const tcu::ConstPixelBufferAccess expected = m_expectedTextureLevel->getAccess();
- const tcu::UVec4 threshold (0, 0, 0, 0);
+ const tcu::ConstPixelBufferAccess
+ expected = m_expectedTextureLevel->getAccess();
+ const tcu::UVec4 threshold (0, 0, 0, 0);
if (!tcu::intThresholdCompare(m_context.getTestContext().getLog(), "Compare", "Result comparsion", expected, result, threshold, tcu::COMPARE_LOG_RESULT))
+ {
return tcu::TestStatus::fail("Fill and Update Buffer test");
+ }
return tcu::TestStatus::pass("Fill and Update Buffer test");
}
-void FillBufferTestInstance::generateExpectedResult (void)
+void FillBufferTestInstance::generateExpectedResult
+ (void)
{
- const tcu::ConstPixelBufferAccess dst = m_destinationTextureLevel->getAccess();
+ const tcu::ConstPixelBufferAccess
+ dst = m_destinationTextureLevel->getAccess();
m_expectedTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(dst.getFormat(), dst.getWidth(), dst.getHeight(), dst.getDepth()));
tcu::copy(m_expectedTextureLevel->getAccess(), dst);
- deUint32* currentPtr = (deUint32*) m_expectedTextureLevel->getAccess().getDataPtr() + m_params.dstOffset / 4;
- deUint32* endPtr = currentPtr + m_params.size / 4;
+ deUint32* currentPtr = (deUint32*) m_expectedTextureLevel->getAccess().getDataPtr() + m_params.dstOffset / 4;
+ deUint32* endPtr = currentPtr + m_params.size / 4;
while (currentPtr < endPtr)
{
class FillBufferTestCase : public vkt::TestCase
{
public:
- FillBufferTestCase (tcu::TestContext& testCtx,
- const std::string& name,
- const std::string& description,
- const TestParams params)
- : vkt::TestCase (testCtx, name, description)
- , m_params (params)
- {}
-
- virtual TestInstance* createInstance (Context& context) const
- {
- return (TestInstance*) new FillBufferTestInstance(context, m_params);
- }
+ FillBufferTestCase (tcu::TestContext& testCtx,
+ const std::string& name,
+ const std::string& description,
+ const TestParams params)
+ : vkt::TestCase (testCtx, name, description)
+ , m_params (params)
+ {}
+
+ virtual TestInstance* createInstance (Context& context) const
+ {
+ return static_cast<TestInstance*>(new FillBufferTestInstance(context, m_params));
+ }
private:
- const TestParams m_params;
+ const TestParams m_params;
};
// Update Buffer
class UpdateBufferTestInstance : public FillBufferTestInstance
{
public:
- UpdateBufferTestInstance (Context& context,
- TestParams testParams)
- : FillBufferTestInstance(context, testParams)
- {}
- virtual tcu::TestStatus iterate (void);
+ UpdateBufferTestInstance (Context& context,
+ TestParams testParams)
+ : FillBufferTestInstance (context, testParams)
+ {}
+ virtual tcu::TestStatus iterate (void);
protected:
- virtual void generateExpectedResult (void);
+ virtual void generateExpectedResult (void);
};
-tcu::TestStatus UpdateBufferTestInstance::iterate (void)
+tcu::TestStatus UpdateBufferTestInstance::iterate (void)
{
- const int dstLevelWidth = (int)(m_params.dstSize / 4);
- m_destinationTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(mapVkFormat(VK_FORMAT_R8G8B8A8_UINT), dstLevelWidth, 1));
+ const int dstLevelWidth = (int)(m_params.dstSize / 4);
+ m_destinationTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(mapVkFormat(VK_FORMAT_R8G8B8A8_UINT), dstLevelWidth, 1));
generateBuffer(m_destinationTextureLevel->getAccess(), dstLevelWidth, 1, 1);
uploadBuffer(m_destinationTextureLevel->getAccess(), *m_destinationBufferAlloc);
- const DeviceInterface& vk = m_context.getDeviceInterface();
- const VkDevice vkDevice = m_context.getDevice();
- const VkQueue queue = m_context.getUniversalQueue();
+ const DeviceInterface& vk = m_context.getDeviceInterface();
+ const VkDevice vkDevice = m_context.getDevice();
+ const VkQueue queue = m_context.getUniversalQueue();
- const VkBufferMemoryBarrier dstBufferBarrier =
+ const VkBufferMemoryBarrier dstBufferBarrier =
{
- VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- VK_ACCESS_TRANSFER_WRITE_BIT, // VkAccessFlags srcAccessMask;
- VK_ACCESS_HOST_READ_BIT, // VkAccessFlags dstAccessMask;
- VK_QUEUE_FAMILY_IGNORED, // deUint32 srcQueueFamilyIndex;
- VK_QUEUE_FAMILY_IGNORED, // deUint32 dstQueueFamilyIndex;
- *m_destination, // VkBuffer buffer;
- 0u, // VkDeviceSize offset;
- m_params.dstOffset // VkDeviceSize size;
+ VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // VkStructureType sType;
+ DE_NULL, // const void* pNext;
+ VK_ACCESS_TRANSFER_WRITE_BIT, // VkAccessFlags srcAccessMask;
+ VK_ACCESS_HOST_READ_BIT, // VkAccessFlags dstAccessMask;
+ VK_QUEUE_FAMILY_IGNORED, // deUint32 srcQueueFamilyIndex;
+ VK_QUEUE_FAMILY_IGNORED, // deUint32 dstQueueFamilyIndex;
+ *m_destination, // VkBuffer buffer;
+ 0u, // VkDeviceSize offset;
+ m_params.dstOffset // VkDeviceSize size;
};
- const VkCommandBufferBeginInfo cmdBufferBeginInfo =
+ const VkCommandBufferBeginInfo cmdBufferBeginInfo =
{
- VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // VkCommandBufferUsageFlags flags;
+ VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType;
+ DE_NULL, // const void* pNext;
+ VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // VkCommandBufferUsageFlags flags;
(const VkCommandBufferInheritanceInfo*)DE_NULL,
};
vk.cmdPipelineBarrier(*m_cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, (VkDependencyFlags)0, 0, (const VkMemoryBarrier*)DE_NULL, 1, &dstBufferBarrier, 0, (const VkImageMemoryBarrier*)DE_NULL);
VK_CHECK(vk.endCommandBuffer(*m_cmdBuffer));
- const VkSubmitInfo submitInfo =
+ const VkSubmitInfo submitInfo =
{
- VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType;
- DE_NULL, // const void* pNext;
- 0u, // deUint32 waitSemaphoreCount;
- DE_NULL, // const VkSemaphore* pWaitSemaphores;
+ VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType;
+ DE_NULL, // const void* pNext;
+ 0u, // deUint32 waitSemaphoreCount;
+ DE_NULL, // const VkSemaphore* pWaitSemaphores;
(const VkPipelineStageFlags*)DE_NULL,
- 1u, // deUint32 commandBufferCount;
- &m_cmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers;
- 0u, // deUint32 signalSemaphoreCount;
- DE_NULL // const VkSemaphore* pSignalSemaphores;
+ 1u, // deUint32 commandBufferCount;
+ &m_cmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers;
+ 0u, // deUint32 signalSemaphoreCount;
+ DE_NULL // const VkSemaphore* pSignalSemaphores;
};
VK_CHECK(vk.resetFences(vkDevice, 1, &m_fence.get()));
return checkTestResult(resultLevel->getAccess());
}
-void UpdateBufferTestInstance::generateExpectedResult (void)
+void UpdateBufferTestInstance::generateExpectedResult
+ (void)
{
- const tcu::ConstPixelBufferAccess dst = m_destinationTextureLevel->getAccess();
+ const tcu::ConstPixelBufferAccess
+ dst = m_destinationTextureLevel->getAccess();
m_expectedTextureLevel = de::MovePtr<tcu::TextureLevel>(new tcu::TextureLevel(dst.getFormat(), dst.getWidth(), dst.getHeight(), dst.getDepth()));
tcu::copy(m_expectedTextureLevel->getAccess(), dst);
- deUint32* currentPtr = (deUint32*) m_expectedTextureLevel->getAccess().getDataPtr() + m_params.dstOffset / 4;
+ deUint32* currentPtr = (deUint32*) m_expectedTextureLevel->getAccess().getDataPtr() + m_params.dstOffset / 4;
deMemcpy(currentPtr, m_params.testData, (size_t)m_params.size);
}
class UpdateBufferTestCase : public vkt::TestCase
{
public:
- UpdateBufferTestCase (tcu::TestContext& testCtx,
- const std::string& name,
- const std::string& description,
- const TestParams params)
- : vkt::TestCase (testCtx, name, description)
- , m_params (params)
- {}
-
- virtual TestInstance* createInstance (Context& context) const
- {
- return (TestInstance*) new UpdateBufferTestInstance(context, m_params);
- }
+ UpdateBufferTestCase (tcu::TestContext& testCtx,
+ const std::string& name,
+ const std::string& description,
+ const TestParams params)
+ : vkt::TestCase (testCtx, name, description)
+ , m_params (params)
+ {}
+
+ virtual TestInstance* createInstance (Context& context) const
+ {
+ return (TestInstance*) new UpdateBufferTestInstance(context, m_params);
+ }
private:
- TestParams m_params;
+ TestParams m_params;
};
} // anonymous
-tcu::TestCaseGroup* createFillAndUpdateBufferTests (tcu::TestContext& testCtx)
+tcu::TestCaseGroup* createFillAndUpdateBufferTests (tcu::TestContext& testCtx)
{
- de::MovePtr<tcu::TestCaseGroup> fillAndUpdateBufferTests (new tcu::TestCaseGroup(testCtx, "fill_and_update_buffer", "Fill and Update Buffer Tests"));
+ const de::SharedPtr<IBufferAllocator>
+ bufferAllocators[] =
+ {
+ de::SharedPtr<BufferSuballocation>(new BufferSuballocation()),
+ de::SharedPtr<BufferDedicatedAllocation>(new BufferDedicatedAllocation())
+ };
+
+ de::MovePtr<tcu::TestCaseGroup> fillAndUpdateBufferTests (new tcu::TestCaseGroup(testCtx, "fill_and_update_buffer", "Fill and Update Buffer Tests"));
+ tcu::TestCaseGroup* bufferViewAllocationGroupTests[]
+ =
+ {
+ new tcu::TestCaseGroup(testCtx, "suballocation", "BufferView Fill and Update Tests for Suballocated Objects"),
+ new tcu::TestCaseGroup(testCtx, "dedicated_alloc", "BufferView Fill and Update Tests for Dedicatedly Allocated Objects")
+ };
+ for (deUint32 subgroupNdx = 0u; subgroupNdx < DE_LENGTH_OF_ARRAY(bufferViewAllocationGroupTests); ++subgroupNdx)
+ {
+ if (bufferViewAllocationGroupTests[subgroupNdx] == DE_NULL)
+ {
+ TCU_THROW(InternalError, "Could not create test subgroup.");
+ }
+ fillAndUpdateBufferTests->addChild(bufferViewAllocationGroupTests[subgroupNdx]);
+ }
TestParams params;
params.dstSize = TestParams::TEST_DATA_SIZE;
- DE_ASSERT(params.dstSize <= TestParams::TEST_DATA_SIZE);
- deMemset(params.testData, 0xFFu, (size_t)params.dstSize);
+ for (deUint32 buffersAllocationNdx = 0u; buffersAllocationNdx < DE_LENGTH_OF_ARRAY(bufferAllocators); ++buffersAllocationNdx)
{
- const std::string description ("whole buffer");
- const std::string testName ("buffer_whole");
+ DE_ASSERT(params.dstSize <= TestParams::TEST_DATA_SIZE);
+ deMemset(params.testData, 0xFFu, (size_t)params.dstSize);
+ params.bufferAllocator = bufferAllocators[buffersAllocationNdx];
+ const deUint32 testCaseGroupNdx = buffersAllocationNdx;
+ tcu::TestCaseGroup* currentTestsGroup = bufferViewAllocationGroupTests[testCaseGroupNdx];
- params.dstOffset = 0;
- params.size = params.dstSize;
+ {
+ const std::string description ("whole buffer");
+ const std::string testName ("buffer_whole");
- fillAndUpdateBufferTests->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
- fillAndUpdateBufferTests->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
- }
+ params.dstOffset = 0;
+ params.size = params.dstSize;
- {
- const std::string description ("first word in buffer");
- const std::string testName ("buffer_first_one");
+ currentTestsGroup->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
+ currentTestsGroup->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
+ }
- params.dstOffset = 0;
- params.size = 4;
+ {
+ const std::string description ("first word in buffer");
+ const std::string testName ("buffer_first_one");
- fillAndUpdateBufferTests->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
- fillAndUpdateBufferTests->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
- }
+ params.dstOffset = 0;
+ params.size = 4;
- {
- const std::string description ("second word in buffer");
- const std::string testName ("buffer_second_one");
+ currentTestsGroup->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
+ currentTestsGroup->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
+ }
- params.dstOffset = 4;
- params.size = 4;
+ {
+ const std::string description ("second word in buffer");
+ const std::string testName ("buffer_second_one");
- fillAndUpdateBufferTests->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
- fillAndUpdateBufferTests->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
- }
+ params.dstOffset = 4;
+ params.size = 4;
- {
- const std::string description ("buffer second part");
- const std::string testName ("buffer_second_part");
+ currentTestsGroup->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
+ currentTestsGroup->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
+ }
+
+ {
+ const std::string description ("buffer second part");
+ const std::string testName ("buffer_second_part");
- params.dstOffset = params.dstSize / 2;
- params.size = params.dstSize / 2;
+ params.dstOffset = params.dstSize / 2;
+ params.size = params.dstSize / 2;
- fillAndUpdateBufferTests->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
- fillAndUpdateBufferTests->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
+ currentTestsGroup->addChild(new FillBufferTestCase(testCtx, "fill_" + testName, "Fill " + description, params));
+ currentTestsGroup->addChild(new UpdateBufferTestCase(testCtx, "update_" + testName, "Update " + description, params));
+ }
}
return fillAndUpdateBufferTests.release();
projects / platform / upstream / VK-GL-CTS.git / blobdiff