MASK_WHD = (1 | 2 | 4 | 0),
};
+enum AllocationKind
+{
+ ALLOCATION_KIND_SUBALLOCATED = 0,
+ ALLOCATION_KIND_DEDICATED,
+};
+
static const float REFERENCE_DEPTH_VALUE = 1.0f;
static const Vec4 COLOR_TABLE[] =
{
IVec4 imageSizeHint; //!< (w, h, d, layers), a component may have a symbolic value MAX_SIZE
VkFormat colorFormat;
VkFormat depthStencilFormat; //! A depth/stencil format, or UNDEFINED if not used
+ AllocationKind allocationKind;
};
template<typename T>
return deMax32(size.z(), size.w());
}
+de::MovePtr<Allocation> bindBuffer (const InstanceInterface& vki,
+ const DeviceInterface& vkd,
+ const VkPhysicalDevice& physDevice,
+ const VkDevice device,
+ const VkBuffer& buffer,
+ const MemoryRequirement requirement,
+ Allocator& allocator,
+ AllocationKind allocationKind)
+{
+ switch (allocationKind)
+ {
+ case ALLOCATION_KIND_SUBALLOCATED:
+ {
+ return ::vkt::pipeline::bindBuffer(vkd, device, allocator, buffer, requirement);
+ }
+
+ case ALLOCATION_KIND_DEDICATED:
+ {
+ return bindBufferDedicated(vki, vkd, physDevice, device, buffer, requirement);
+ }
+
+ default:
+ {
+ TCU_THROW(InternalError, "Invalid allocation kind");
+ }
+ }
+}
+
+de::MovePtr<Allocation> bindImage (const InstanceInterface& vki,
+ const DeviceInterface& vkd,
+ const VkPhysicalDevice& physDevice,
+ const VkDevice device,
+ const VkImage& image,
+ const MemoryRequirement requirement,
+ Allocator& allocator,
+ AllocationKind allocationKind)
+{
+ switch (allocationKind)
+ {
+ case ALLOCATION_KIND_SUBALLOCATED:
+ {
+ return ::vkt::pipeline::bindImage(vkd, device, allocator, image, requirement);
+ }
+
+ case ALLOCATION_KIND_DEDICATED:
+ {
+ return bindImageDedicated(vki, vkd, physDevice, device, image, requirement);
+ }
+
+ default:
+ {
+ TCU_THROW(InternalError, "Invalid allocation kind");
+ }
+ }
+}
+
// This is very test specific, so be careful if you want to reuse this code.
Move<VkPipeline> makeGraphicsPipeline (const DeviceInterface& vk,
const VkDevice device,
// Only make enough space for the check region
const VkDeviceSize colorBufferSize = product(checkSize) * tcu::getPixelSize(mapVkFormat(caseDef.colorFormat));
const Unique<VkBuffer> colorBuffer (makeBuffer(vk, device, colorBufferSize, VK_BUFFER_USAGE_TRANSFER_DST_BIT));
- const UniquePtr<Allocation> colorBufferAlloc (bindBuffer(vk, device, allocator, *colorBuffer, MemoryRequirement::HostVisible));
+ const UniquePtr<Allocation> colorBufferAlloc (bindBuffer(vki, vk, physDevice, device, *colorBuffer, MemoryRequirement::HostVisible, allocator, caseDef.allocationKind));
{
deMemset(colorBufferAlloc->getHostPtr(), 0, static_cast<std::size_t>(colorBufferSize));
colorImage = makeImage(vk, device, getImageCreateFlags(caseDef.viewType), getImageType(caseDef.viewType), caseDef.colorFormat,
imageSize.swizzle(0, 1, 2), 1u, imageSize.w(), imageUsage);
- colorImageAlloc = bindImage(vk, device, allocator, *colorImage, MemoryRequirement::Any);
+ colorImageAlloc = bindImage(vki, vk, physDevice, device, *colorImage, MemoryRequirement::Any, allocator, caseDef.allocationKind);
}
// Create a depth/stencil image (always a 2D image, optionally layered)
depthStencilImage = makeImage(vk, device, (VkImageCreateFlags)0, VK_IMAGE_TYPE_2D, caseDef.depthStencilFormat,
IVec3(imageSize.x(), imageSize.y(), 1), 1u, numSlices, imageUsage);
- depthStencilImageAlloc = bindImage(vk, device, allocator, *depthStencilImage, MemoryRequirement::Any);
+ depthStencilImageAlloc = bindImage(vki, vk, physDevice, device, *depthStencilImage, MemoryRequirement::Any, allocator, caseDef.allocationKind);
}
// Create a vertex buffer
const VkDeviceSize vertexBufferSize = sizeInBytes(vertices);
vertexBuffer = makeBuffer(vk, device, vertexBufferSize, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
- vertexBufferAlloc = bindBuffer(vk, device, allocator, *vertexBuffer, MemoryRequirement::HostVisible);
+ vertexBufferAlloc = bindBuffer(vki, vk, physDevice, device, *vertexBuffer, MemoryRequirement::HostVisible, allocator, caseDef.allocationKind);
+
deMemcpy(vertexBufferAlloc->getHostPtr(), &vertices[0], static_cast<std::size_t>(vertexBufferSize));
flushMappedMemoryRange(vk, device, vertexBufferAlloc->getMemory(), vertexBufferAlloc->getOffset(), vertexBufferSize);
}
int sizeReductionIndex = 0;
+ if (caseDef.allocationKind == ALLOCATION_KIND_DEDICATED)
+ {
+ const std::string extensionName("VK_KHR_dedicated_allocation");
+
+ if (!de::contains(context.getDeviceExtensions().begin(), context.getDeviceExtensions().end(), extensionName))
+ TCU_THROW(NotSupportedError, std::string(extensionName + " is not supported").c_str());
+ }
+
for (;;)
{
try
const int numMipLevels = static_cast<int>(mipLevelSizes.size());
const bool useDepthStencil = (caseDef.depthStencilFormat != VK_FORMAT_UNDEFINED);
+ if (caseDef.allocationKind == ALLOCATION_KIND_DEDICATED)
+ {
+ const std::string extensionName("VK_KHR_dedicated_allocation");
+
+ if (!de::contains(context.getDeviceExtensions().begin(), context.getDeviceExtensions().end(), extensionName))
+ TCU_THROW(NotSupportedError, std::string(extensionName + " is not supported").c_str());
+ }
+
if (useDepthStencil && !isDepthStencilFormatSupported(vki, physDevice, caseDef.depthStencilFormat))
TCU_THROW(NotSupportedError, "Unsupported depth/stencil format");
// Create a color buffer big enough to hold all layers and mip levels
const VkDeviceSize colorBufferSize = sum(mipLevelStorageSizes);
const Unique<VkBuffer> colorBuffer (makeBuffer(vk, device, colorBufferSize, VK_BUFFER_USAGE_TRANSFER_DST_BIT));
- const UniquePtr<Allocation> colorBufferAlloc (bindBuffer(vk, device, allocator, *colorBuffer, MemoryRequirement::HostVisible));
+ const UniquePtr<Allocation> colorBufferAlloc (bindBuffer(vki, vk, physDevice, device, *colorBuffer, MemoryRequirement::HostVisible, allocator, caseDef.allocationKind));
{
deMemset(colorBufferAlloc->getHostPtr(), 0, static_cast<std::size_t>(colorBufferSize));
colorImage = makeImage(vk, device, getImageCreateFlags(caseDef.viewType), getImageType(caseDef.viewType), caseDef.colorFormat,
imageSize.swizzle(0, 1, 2), numMipLevels, imageSize.w(), imageUsage);
- colorImageAlloc = bindImage(vk, device, allocator, *colorImage, MemoryRequirement::Any);
+ colorImageAlloc = bindImage(vki, vk, physDevice, device, *colorImage, MemoryRequirement::Any, allocator, caseDef.allocationKind);
}
// Create a depth/stencil image (always a 2D image, optionally layered)
depthStencilImage = makeImage(vk, device, (VkImageCreateFlags)0, VK_IMAGE_TYPE_2D, caseDef.depthStencilFormat,
IVec3(imageSize.x(), imageSize.y(), 1), numMipLevels, numSlices, imageUsage);
- depthStencilImageAlloc = bindImage(vk, device, allocator, *depthStencilImage, MemoryRequirement::Any);
+ depthStencilImageAlloc = bindImage(vki, vk, physDevice, device, *depthStencilImage, MemoryRequirement::Any, allocator, caseDef.allocationKind);
}
// Create a vertex buffer
const VkDeviceSize vertexBufferSize = sizeInBytes(vertices);
vertexBuffer = makeBuffer(vk, device, vertexBufferSize, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
- vertexBufferAlloc = bindBuffer(vk, device, allocator, *vertexBuffer, MemoryRequirement::HostVisible);
+ vertexBufferAlloc = bindBuffer(vki, vk, physDevice, device, *vertexBuffer, MemoryRequirement::HostVisible, allocator, caseDef.allocationKind);
+
deMemcpy(vertexBufferAlloc->getHostPtr(), &vertices[0], static_cast<std::size_t>(vertexBufferSize));
flushMappedMemoryRange(vk, device, vertexBufferAlloc->getMemory(), vertexBufferAlloc->getOffset(), vertexBufferSize);
}
return sizes;
}
-void addTestCasesWithFunctions (tcu::TestCaseGroup* group)
+void addTestCasesWithFunctions (tcu::TestCaseGroup* group, AllocationKind allocationKind)
{
const struct
{
*sizeIter, // IVec4 imageSizeHint;
format[formatNdx], // VkFormat colorFormat;
depthStencilFormat[dsFormatNdx], // VkFormat depthStencilFormat;
+ allocationKind // AllocationKind allocationKind;
};
addFunctionCaseWithPrograms(smallGroup.get(), getFormatString(format[formatNdx], depthStencilFormat[dsFormatNdx]), "", initPrograms, testAttachmentSize, caseDef);
}
}
else // All huge cases go into a separate group
{
- MovePtr<tcu::TestCaseGroup> sizeGroup (new tcu::TestCaseGroup(group->getTestContext(), getSizeDescription(*sizeIter).c_str(), ""));
- const VkFormat colorFormat = VK_FORMAT_R8G8B8A8_UNORM;
-
- // Use the same color format for all cases, to reduce the number of permutations
- for (int dsFormatNdx = 0; dsFormatNdx < DE_LENGTH_OF_ARRAY(depthStencilFormat); ++dsFormatNdx)
+ if (allocationKind != ALLOCATION_KIND_DEDICATED)
{
- const CaseDef caseDef =
+ MovePtr<tcu::TestCaseGroup> sizeGroup (new tcu::TestCaseGroup(group->getTestContext(), getSizeDescription(*sizeIter).c_str(), ""));
+ const VkFormat colorFormat = VK_FORMAT_R8G8B8A8_UNORM;
+
+ // Use the same color format for all cases, to reduce the number of permutations
+ for (int dsFormatNdx = 0; dsFormatNdx < DE_LENGTH_OF_ARRAY(depthStencilFormat); ++dsFormatNdx)
{
- testCase[caseNdx].viewType, // VkImageViewType viewType;
- *sizeIter, // IVec4 imageSizeHint;
- colorFormat, // VkFormat colorFormat;
- depthStencilFormat[dsFormatNdx], // VkFormat depthStencilFormat;
- };
- addFunctionCaseWithPrograms(sizeGroup.get(), getFormatString(colorFormat, depthStencilFormat[dsFormatNdx]), "", initPrograms, testAttachmentSize, caseDef);
+ const CaseDef caseDef =
+ {
+ testCase[caseNdx].viewType, // VkImageViewType viewType;
+ *sizeIter, // IVec4 imageSizeHint;
+ colorFormat, // VkFormat colorFormat;
+ depthStencilFormat[dsFormatNdx], // VkFormat depthStencilFormat;
+ allocationKind // AllocationKind allocationKind;
+ };
+ addFunctionCaseWithPrograms(sizeGroup.get(), getFormatString(colorFormat, depthStencilFormat[dsFormatNdx]), "", initPrograms, testAttachmentSize, caseDef);
+ }
+ hugeGroup->addChild(sizeGroup.release());
}
- hugeGroup->addChild(sizeGroup.release());
}
}
smallGroup.release();
testCase[caseNdx].baselineSize, // IVec4 imageSizeHint;
format[formatNdx], // VkFormat colorFormat;
depthStencilFormat[dsFormatNdx], // VkFormat depthStencilFormat;
+ allocationKind // AllocationKind allocationKind;
};
addFunctionCaseWithPrograms(mipmapGroup.get(), getFormatString(format[formatNdx], depthStencilFormat[dsFormatNdx]), "", initPrograms, testRenderToMipMaps, caseDef);
}
}
}
+void addCoreRenderToImageTests (tcu::TestCaseGroup* group)
+{
+ addTestCasesWithFunctions(group, ALLOCATION_KIND_SUBALLOCATED);
+}
+
+void addDedicatedAllocationRenderToImageTests (tcu::TestCaseGroup* group)
+{
+ addTestCasesWithFunctions(group, ALLOCATION_KIND_DEDICATED);
+}
+
} // anonymous ns
tcu::TestCaseGroup* createRenderToImageTests (tcu::TestContext& testCtx)
{
- return createTestGroup(testCtx, "render_to_image", "Render to image tests", addTestCasesWithFunctions);
+ de::MovePtr<tcu::TestCaseGroup> renderToImageTests (new tcu::TestCaseGroup(testCtx, "render_to_image", "Render to image tests"));
+
+ renderToImageTests->addChild(createTestGroup(testCtx, "core", "Core render to image tests", addCoreRenderToImageTests));
+ renderToImageTests->addChild(createTestGroup(testCtx, "dedicated_allocation", "Render to image tests for dedicated memory allocation", addDedicatedAllocationRenderToImageTests));
+
+ return renderToImageTests.release();
}
} // pipeline
projects / platform / upstream / VK-GL-CTS.git / blobdiff