From 60d17fff2ecf7599b188a10f58dce8a38edafd32 Mon Sep 17 00:00:00 2001 From: prideout Date: Wed, 6 Feb 2019 10:17:13 -0800 Subject: [PATCH] Minor Vulkan fixup. --- README.md | 2 +- filament/docs/Vulkan.md.html | 7 ++----- filament/src/driver/vulkan/VulkanDriverImpl.cpp | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c055ee785f..064cb605c1 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ When building for WebGL, you'll also need to set `EMSDK`. See [WebAssembly](#web ### IDE -We recommend using CLion to develop for Filament. Simply open the root directory's CMakeList.txt +We recommend using CLion to develop for Filament. Simply open the root directory's CMakeLists.txt in CLion to obtain a usable project. ### Easy build diff --git a/filament/docs/Vulkan.md.html b/filament/docs/Vulkan.md.html index 0077926c19..b37ab3340a 100644 --- a/filament/docs/Vulkan.md.html +++ b/filament/docs/Vulkan.md.html @@ -11,7 +11,7 @@ **Vulkan Backend** - *Last updated: 1 Feb 2019* + *Last updated: 6 Feb 2019* ![](../../docs/images/filament_logo.png) @@ -224,7 +224,7 @@ the BlueVK header, which in turn includes the Vulkan headers. Here we list some of the most significant issues and to-be-done items for the Vulkan backend. -- We haven't done any performance analysis yet +- We need to do more performance analysis - We don't have great stress tests, but we should at least: 1. Try sponza on a Pixel 2 2. Capture a systrace @@ -244,9 +244,6 @@ Here we list some of the most significant issues and to-be-done items for the Vu - We don't *quite* have feature parity with the OpenGL backend - No support for streaming camera texture yet - This is possible, even in Android O, just haven't gotten around to it yet - - Some texture format limitations - - No compressed textures yet - - We do not allow 24-bit types - Filament fences don't map well to Vulkan semantics - Higher level timing queries might make more sense diff --git a/filament/src/driver/vulkan/VulkanDriverImpl.cpp b/filament/src/driver/vulkan/VulkanDriverImpl.cpp index aa714cf856..cc18a93f93 100644 --- a/filament/src/driver/vulkan/VulkanDriverImpl.cpp +++ b/filament/src/driver/vulkan/VulkanDriverImpl.cpp @@ -796,11 +796,11 @@ void waitForIdle(VulkanContext& context) { // First, wait for submitted command buffer(s) to finish. if (context.currentSurface) { - VkFence fences[2]; + VkFence fences[4]; uint32_t nfences = 0; auto& surfaceContext = *context.currentSurface; for (auto& swapContext : surfaceContext.swapContexts) { - assert(nfences < 2); + assert(nfences < 4); if (swapContext.submitted && swapContext.fence) { fences[nfences++] = swapContext.fence; swapContext.submitted = false;