From 1e400a4030ff659583d25323430cded0c7dfa30e Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 21 Jul 2024 12:48:20 +0200 Subject: [PATCH] Fix some warnings --- openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp | 2 +- openVulkanoCpp/Scene/PlaneCameraController.hpp | 1 + openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp b/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp index 09d2a65..0d514d0 100644 --- a/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp +++ b/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp @@ -30,7 +30,7 @@ namespace OpenVulkano [[nodiscard]] bool IsInitialized() const { return initialized; } - void Init(); + void Init() override; void Tick() override; diff --git a/openVulkanoCpp/Scene/PlaneCameraController.hpp b/openVulkanoCpp/Scene/PlaneCameraController.hpp index c1bdfac..ef9eb0c 100644 --- a/openVulkanoCpp/Scene/PlaneCameraController.hpp +++ b/openVulkanoCpp/Scene/PlaneCameraController.hpp @@ -34,6 +34,7 @@ namespace OpenVulkano::Scene PlaneCameraController(Camera* camera = nullptr); + void Init(Camera* camera) override { Init(camera, DefaultAxis::OXZ); } void Init(Camera* camera, const Math::Vector3f& planeNormal); void Init(Camera* camera, DefaultAxis axis); void Tick() override; diff --git a/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp b/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp index c49030a..88ac114 100644 --- a/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp +++ b/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp @@ -133,7 +133,11 @@ namespace OpenVulkano::Vulkan { GetCmdBuffer().end(); vk::SubmitInfo si = { 0, nullptr, nullptr, 1, &frameResources[currentBuffer].cmdBuffer, 1, &frameResources[currentBuffer].semaphore }; - transferQueue.submit(1, &si, vk::Fence()); + vk::Result result = transferQueue.submit(1, &si, vk::Fence()); + if (result != vk::Result::eSuccess) [[unlikely]] + { + Logger::RENDER->error("Failed to submit resource manager transfer queue"); + } return frameResources[currentBuffer].semaphore; } @@ -321,10 +325,8 @@ namespace OpenVulkano::Vulkan VulkanUniformBuffer* vkBuffer; ManagedBuffer::Ptr mBuffer; const vk::DeviceSize allocSize = Utils::Align(buffer->size, uniformBufferAlignment); - vk::DeviceSize frameSize = 0; if (buffer->GetUpdateFrequency() != Scene::UpdateFrequency::Never) { - frameSize = allocSize; vkBuffer = new VulkanUniformBufferDynamic(); const uint32_t imgs = context->swapChain.GetImageCount(); mBuffer = memPool.CreateBuffer(imgs * allocSize, vk::BufferUsageFlagBits::eUniformBuffer, vk::MemoryPropertyFlagBits::eHostCoherent | vk::MemoryPropertyFlagBits::eHostVisible);