From aa5b089f2d403776b5d3f7f1526543054b1f366b Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Thu, 13 Jul 2023 01:43:57 +0200
Subject: [PATCH] Fix build issues
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
include/vkcv/VertexLayout.hpp | 1 +
src/vkcv/AccelerationStructureManager.cpp | 6 +++++-
src/vkcv/AccelerationStructureManager.hpp | 2 +-
src/vkcv/DescriptorSetManager.cpp | 6 +++++-
src/vkcv/DescriptorSetManager.hpp | 2 +-
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/include/vkcv/VertexLayout.hpp b/include/vkcv/VertexLayout.hpp
index 0e3c872f..783f8e29 100644
--- a/include/vkcv/VertexLayout.hpp
+++ b/include/vkcv/VertexLayout.hpp
@@ -6,6 +6,7 @@
* @brief Structures to handle vertex layout, bindings and attachments.
*/
+#include <cstdint>
#include <iostream>
#include <string>
diff --git a/src/vkcv/AccelerationStructureManager.cpp b/src/vkcv/AccelerationStructureManager.cpp
index 02d3e65b..d3c0f3e3 100644
--- a/src/vkcv/AccelerationStructureManager.cpp
+++ b/src/vkcv/AccelerationStructureManager.cpp
@@ -5,9 +5,13 @@
#include "vkcv/Logger.hpp"
namespace vkcv {
+
+ bool AccelerationStructureManager::init(Core &core) {
+ return HandleManager<AccelerationStructureEntry, AccelerationStructureHandle>::init(core);
+ }
bool AccelerationStructureManager::init(Core &core, BufferManager &bufferManager) {
- if (!HandleManager<AccelerationStructureEntry, AccelerationStructureHandle>::init(core)) {
+ if (!init(core)) {
return false;
}
diff --git a/src/vkcv/AccelerationStructureManager.hpp b/src/vkcv/AccelerationStructureManager.hpp
index 062a1bcf..8dd94798 100644
--- a/src/vkcv/AccelerationStructureManager.hpp
+++ b/src/vkcv/AccelerationStructureManager.hpp
@@ -37,7 +37,7 @@ namespace vkcv {
private:
BufferManager* m_bufferManager;
- using HandleManager<AccelerationStructureEntry, AccelerationStructureHandle>::init;
+ bool init(Core &core) override;
bool init(Core &core, BufferManager &bufferManager);
[[nodiscard]] uint64_t getIdFrom(const AccelerationStructureHandle &handle) const override;
diff --git a/src/vkcv/DescriptorSetManager.cpp b/src/vkcv/DescriptorSetManager.cpp
index 5304031f..2b71e527 100644
--- a/src/vkcv/DescriptorSetManager.cpp
+++ b/src/vkcv/DescriptorSetManager.cpp
@@ -4,9 +4,13 @@
namespace vkcv {
+ bool DescriptorSetManager::init(Core &core) {
+ return HandleManager<DescriptorSetEntry, DescriptorSetHandle>::init(core);
+ }
+
bool DescriptorSetManager::init(Core &core,
DescriptorSetLayoutManager &descriptorSetLayoutManager) {
- if (!HandleManager<DescriptorSetEntry, DescriptorSetHandle>::init(core)) {
+ if (!init(core)) {
return false;
}
diff --git a/src/vkcv/DescriptorSetManager.hpp b/src/vkcv/DescriptorSetManager.hpp
index 4b0d307b..74cf75d9 100644
--- a/src/vkcv/DescriptorSetManager.hpp
+++ b/src/vkcv/DescriptorSetManager.hpp
@@ -39,7 +39,7 @@ namespace vkcv {
Vector<vk::DescriptorPoolSize> m_PoolSizes;
vk::DescriptorPoolCreateInfo m_PoolInfo;
- using HandleManager<DescriptorSetEntry, DescriptorSetHandle>::init;
+ bool init(Core &core) override;
bool init(Core &core, DescriptorSetLayoutManager &descriptorSetLayoutManager);
[[nodiscard]] uint64_t getIdFrom(const DescriptorSetHandle &handle) const override;
--
GitLab