1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: vulkan: Enable features on the device

Browse Source 
The silly fine-grained enabling of features on the VkDevice
seems to be ignored in practice by the implementations, but
wideLines becomes relevant because the validation layers warns
if a line width is set on the pipeline without enabling the feature
on the device. So to play nice, enable the features we care about.

Change-Id: I0c64a0d10a8279fe43d899118b0d6f0e4f875d41
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2020-08-30 15:55:51 +02:00
parent fb4760bb21
commit 67faf0641d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/rhi/qrhivulkan.cpp
View File

@ -442,6 +442,7 @@ bool QRhiVulkan::create(QRhi::Flags flags)
return false; return false;
} }
physDev = physDevs[physDevIndex]; physDev = physDevs[physDevIndex];
f->vkGetPhysicalDeviceProperties(physDev, &physDevProperties);
} else { } else {
f->vkGetPhysicalDeviceProperties(physDev, &physDevProperties); f->vkGetPhysicalDeviceProperties(physDev, &physDevProperties);
qCDebug(QRHI_LOG_INFO, "Using imported physical device '%s' %d.%d.%d (api %d.%d.%d vendor 0x%X device 0x%X type %d)", qCDebug(QRHI_LOG_INFO, "Using imported physical device '%s' %d.%d.%d (api %d.%d.%d vendor 0x%X device 0x%X type %d)",
@ -457,6 +458,8 @@ bool QRhiVulkan::create(QRhi::Flags flags)
physDevProperties.deviceType); physDevProperties.deviceType);
} }
f->vkGetPhysicalDeviceFeatures(physDev, &physDevFeatures);
// Choose queue and create device, unless the device was specified in importParams. // Choose queue and create device, unless the device was specified in importParams.
if (!importedDevice) { if (!importedDevice) {
// We only support combined graphics+present queues. When it comes to // We only support combined graphics+present queues. When it comes to
@ -562,6 +565,20 @@ bool QRhiVulkan::create(QRhi::Flags flags)
devInfo.enabledExtensionCount = uint32_t(requestedDevExts.count()); devInfo.enabledExtensionCount = uint32_t(requestedDevExts.count());
devInfo.ppEnabledExtensionNames = requestedDevExts.constData(); devInfo.ppEnabledExtensionNames = requestedDevExts.constData();
VkPhysicalDeviceFeatures features;
memset(&features, 0, sizeof(features));
if (physDevFeatures.wideLines)
features.wideLines = VK_TRUE;
if (physDevFeatures.largePoints)
features.largePoints = VK_TRUE;
if (physDevFeatures.textureCompressionETC2)
features.textureCompressionETC2 = VK_TRUE;
if (physDevFeatures.textureCompressionASTC_LDR)
features.textureCompressionASTC_LDR = VK_TRUE;
if (physDevFeatures.textureCompressionBC)
features.textureCompressionBC = VK_TRUE;
devInfo.pEnabledFeatures = &features;
VkResult err = f->vkCreateDevice(physDev, &devInfo, nullptr, &dev); VkResult err = f->vkCreateDevice(physDev, &devInfo, nullptr, &dev);
if (err != VK_SUCCESS) { if (err != VK_SUCCESS) {
qWarning("Failed to create device: %d", err); qWarning("Failed to create device: %d", err);
@ -599,13 +616,11 @@ bool QRhiVulkan::create(QRhi::Flags flags)
hasCompute = (queueFamilyProps[gfxQueueFamilyIdx].queueFlags & VK_QUEUE_COMPUTE_BIT) != 0; hasCompute = (queueFamilyProps[gfxQueueFamilyIdx].queueFlags & VK_QUEUE_COMPUTE_BIT) != 0;
timestampValidBits = queueFamilyProps[gfxQueueFamilyIdx].timestampValidBits; timestampValidBits = queueFamilyProps[gfxQueueFamilyIdx].timestampValidBits;
f->vkGetPhysicalDeviceProperties(physDev, &physDevProperties);
ubufAlign = physDevProperties.limits.minUniformBufferOffsetAlignment; ubufAlign = physDevProperties.limits.minUniformBufferOffsetAlignment;
// helps little with an optimal offset of 1 (on some drivers) when the spec // helps little with an optimal offset of 1 (on some drivers) when the spec
// elsewhere states that the minimum bufferOffset is 4... // elsewhere states that the minimum bufferOffset is 4...
texbufAlign = qMax<VkDeviceSize>(4, physDevProperties.limits.optimalBufferCopyOffsetAlignment); texbufAlign = qMax<VkDeviceSize>(4, physDevProperties.limits.optimalBufferCopyOffsetAlignment);
f->vkGetPhysicalDeviceFeatures(physDev, &physDevFeatures);
hasWideLines = physDevFeatures.wideLines; hasWideLines = physDevFeatures.wideLines;
if (!importedAllocator) { if (!importedAllocator) {