Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vulkan: add note about #1532.

Browse Source
This commit is contained in:
Philip Rideout
2020-06-29 11:06:27 -07:00
parent 92f2004c4b
commit c5acacff67
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
filament/backend/src/vulkan/VulkanContext.cpp
View File

@@ -155,7 +155,7 @@ void selectPhysicalDevice(VulkanContext& context) {
PANIC_POSTCONDITION("Unable to find suitable device.");
}
void createVirtualDevice(VulkanContext& context) {
void createLogicalDevice(VulkanContext& context) {
VkDeviceQueueCreateInfo deviceQueueCreateInfo[1] = {};
const float queuePriority[] = {1.0f};
VkDeviceCreateInfo deviceCreateInfo = {};
@@ -279,7 +279,20 @@ void getPresentationQueue(VulkanContext& context, VulkanSurfaceContext& sc) {
ASSERT_POSTCONDITION(presentQueueFamilyIndex != 0xffff,
"This physical device does not support the presentation queue.");
if (context.graphicsQueueFamilyIndex != presentQueueFamilyIndex) {
// TODO: Strictly speaking, this code path is incorrect. However it is not triggered on any
// Android devices that we've tested with, nor with MoltenVK.
//
// This is incorrect because we created the logical device early on, before we had a handle
// to the rendering surface. Therefore the device was not created with the presentation
// queue family index included in VkDeviceQueueCreateInfo.
//
// This is non-trivial to fix because the driver API allows clients to do certain things
// (e.g. upload a vertex buffer) before the swap chain is created.
//
// https://github.com/google/filament/issues/1532
vkGetDeviceQueue(context.device, presentQueueFamilyIndex, 0, &sc.presentQueue);
} else {
sc.presentQueue = context.graphicsQueue;
}

2
filament/backend/src/vulkan/VulkanContext.h
View File

@@ -143,7 +143,7 @@ struct VulkanSurfaceContext {
};
void selectPhysicalDevice(VulkanContext& context);
void createVirtualDevice(VulkanContext& context);
void createLogicalDevice(VulkanContext& context);
void getPresentationQueue(VulkanContext& context, VulkanSurfaceContext& sc);
void getSurfaceCaps(VulkanContext& context, VulkanSurfaceContext& sc);

2
filament/backend/src/vulkan/VulkanDriver.cpp
View File

@@ -158,7 +158,7 @@ VulkanDriver::VulkanDriver(VulkanPlatform* platform,
selectPhysicalDevice(mContext);
// Initialize device and graphicsQueue.
createVirtualDevice(mContext);
createLogicalDevice(mContext);
mBinder.setDevice(mContext.device);
// Choose a depth format that meets our requirements. Take care not to include stencil formats