Skip to content
Snippets Groups Projects
Verified Commit 43b88982 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#101] Fixed bad function calls 


Signed-off-by: default avatarTobias Frisch <tfrisch@uni-koblenz.de>
parent ccd8aa7e
No related branches found
No related tags found
1 merge request!86Resolve "Device feature checks missing"
Pipeline #26943 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
include/vkcv/Features.hpp
+ 4
− 4
View file @ 43b88982
...@@ -29,7 +29,7 @@ namespace vkcv { ...@@ -29,7 +29,7 @@ namespace vkcv {
template<typename T> template<typename T>
void requireExtensionFeature(const std::string& extension, const std::function<void(T&)>& featureFunction) { void requireExtensionFeature(const std::string& extension, const std::function<void(T&)>& featureFunction) {
m_features.emplace_back([extension, &featureFunction](FeatureManager& featureManager) { m_features.emplace_back([extension, featureFunction](FeatureManager& featureManager) {
if (featureManager.useExtension(extension, true)) { if (featureManager.useExtension(extension, true)) {
return featureManager.template useFeatures<T>(featureFunction, true); return featureManager.template useFeatures<T>(featureFunction, true);
} else { } else {
...@@ -42,7 +42,7 @@ namespace vkcv { ...@@ -42,7 +42,7 @@ namespace vkcv {
template<typename T> template<typename T>
void requireFeature(const std::function<void(T&)>& featureFunction) { void requireFeature(const std::function<void(T&)>& featureFunction) {
m_features.emplace_back([&featureFunction](FeatureManager& featureManager) { m_features.emplace_back([featureFunction](FeatureManager& featureManager) {
return featureManager.template useFeatures<T>(featureFunction, true); return featureManager.template useFeatures<T>(featureFunction, true);
}); });
} }
...@@ -54,7 +54,7 @@ namespace vkcv { ...@@ -54,7 +54,7 @@ namespace vkcv {
template<typename T> template<typename T>
void tryExtensionFeature(const std::string& extension, const std::function<void(T&)>& featureFunction) { void tryExtensionFeature(const std::string& extension, const std::function<void(T&)>& featureFunction) {
m_features.emplace_back([extension, &featureFunction](FeatureManager& featureManager) { m_features.emplace_back([extension, featureFunction](FeatureManager& featureManager) {
if (featureManager.useExtension(extension, false)) { if (featureManager.useExtension(extension, false)) {
return featureManager.template useFeatures<T>(featureFunction, false); return featureManager.template useFeatures<T>(featureFunction, false);
} else { } else {
...@@ -67,7 +67,7 @@ namespace vkcv { ...@@ -67,7 +67,7 @@ namespace vkcv {
template<typename T> template<typename T>
void tryFeature(const std::function<void(T&)>& featureFunction) { void tryFeature(const std::function<void(T&)>& featureFunction) {
m_features.emplace_back([&featureFunction](FeatureManager& featureManager) { m_features.emplace_back([featureFunction](FeatureManager& featureManager) {
return featureManager.template useFeatures<T>(featureFunction, false); return featureManager.template useFeatures<T>(featureFunction, false);
}); });
} }
......
src/vkcv/Features.cpp
+ 4
− 4
View file @ 43b88982
...@@ -11,7 +11,7 @@ namespace vkcv { ...@@ -11,7 +11,7 @@ namespace vkcv {
void Features::requireExtensionFeature(const std::string &extension, void Features::requireExtensionFeature(const std::string &extension,
const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) { const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) {
m_features.emplace_back([extension, &featureFunction](FeatureManager& featureManager) { m_features.emplace_back([extension, featureFunction](FeatureManager& featureManager) {
if (featureManager.useExtension(extension, true)) { if (featureManager.useExtension(extension, true)) {
return featureManager.useFeatures(featureFunction, true); return featureManager.useFeatures(featureFunction, true);
} else { } else {
...@@ -21,7 +21,7 @@ namespace vkcv { ...@@ -21,7 +21,7 @@ namespace vkcv {
} }
void Features::requireFeature(const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) { void Features::requireFeature(const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) {
m_features.emplace_back([&featureFunction](FeatureManager& featureManager) { m_features.emplace_back([featureFunction](FeatureManager& featureManager) {
return featureManager.useFeatures(featureFunction, true); return featureManager.useFeatures(featureFunction, true);
}); });
} }
...@@ -34,7 +34,7 @@ namespace vkcv { ...@@ -34,7 +34,7 @@ namespace vkcv {
void Features::tryExtensionFeature(const std::string &extension, void Features::tryExtensionFeature(const std::string &extension,
const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) { const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) {
m_features.emplace_back([extension, &featureFunction](FeatureManager& featureManager) { m_features.emplace_back([extension, featureFunction](FeatureManager& featureManager) {
if (featureManager.useExtension(extension, false)) { if (featureManager.useExtension(extension, false)) {
return featureManager.useFeatures(featureFunction, false); return featureManager.useFeatures(featureFunction, false);
} else { } else {
...@@ -44,7 +44,7 @@ namespace vkcv { ...@@ -44,7 +44,7 @@ namespace vkcv {
} }
void Features::tryFeature(const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) { void Features::tryFeature(const std::function<void(vk::PhysicalDeviceFeatures &)> &featureFunction) {
m_features.emplace_back([&featureFunction](FeatureManager& featureManager) { m_features.emplace_back([featureFunction](FeatureManager& featureManager) {
return featureManager.useFeatures(featureFunction, false); return featureManager.useFeatures(featureFunction, false);
}); });
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment