GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into navigation-features

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-12 12:04:20 +01:00
parent 153cfad507 d586f828b2
commit 45211fa61c
19 changed files with 125 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
View File

@@ -41,13 +41,6 @@ private:
Array<SemaphoreVulkan*> _waitSemaphores;
Array<SemaphoreVulkan*> _submittedWaitSemaphores;
void MarkSemaphoresAsSubmitted()
{
_waitFlags.Clear();
_submittedWaitSemaphores = _waitSemaphores;
_waitSemaphores.Clear();
}
FenceVulkan* _fence;
#if GPU_ALLOW_PROFILE_EVENTS
int32 _eventsBegin = 0;

2
Source/Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.cpp
View File

@@ -47,7 +47,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXlibPresentationSupportKHR(
extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
void LinuxVulkanPlatform::GetInstanceExtensions(Array<const char*>& outExextensionstensions)
void LinuxVulkanPlatform::GetInstanceExtensions(Array<const char*>& extensions)
{
// Include X11 surface extension
extensions.Add(VK_KHR_SURFACE_EXTENSION_NAME);

5
Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
View File

@@ -50,8 +50,11 @@ void QueueVulkan::Submit(CmdBufferVulkan* cmdBuffer, uint32 numSignalSemaphores,
VALIDATE_VULKAN_RESULT(vkQueueSubmit(_queue, 1, &submitInfo, fence->GetHandle()));
// Mark semaphores as submitted
cmdBuffer->_state = CmdBufferVulkan::State::Submitted;
cmdBuffer->MarkSemaphoresAsSubmitted();
cmdBuffer->_waitFlags.Clear();
cmdBuffer->_submittedWaitSemaphores = cmdBuffer->_waitSemaphores;
cmdBuffer->_waitSemaphores.Clear();
cmdBuffer->_submittedFenceCounter = cmdBuffer->_fenceSignaledCounter;
#if 0