From c86121b2d9661b073418e981ad3e8cbd2311d495 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Tue, 29 Jun 2021 22:28:21 +0200
Subject: [PATCH] [#56] Fixed initialization problem for MSVC
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/material/src/vkcv/material/Material.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/material/src/vkcv/material/Material.cpp b/modules/material/src/vkcv/material/Material.cpp
index ba6411cc..d16555ad 100644
--- a/modules/material/src/vkcv/material/Material.cpp
+++ b/modules/material/src/vkcv/material/Material.cpp
@@ -21,10 +21,11 @@ namespace vkcv::material {
const std::vector<DescriptorBinding>& Material::getDescriptorBindings(MaterialType type)
{
+ static std::vector<DescriptorBinding> pbr_bindings;
+ static std::vector<DescriptorBinding> default_bindings;
+
switch (type) {
case MaterialType::PBR_MATERIAL:
- static std::vector<DescriptorBinding> pbr_bindings;
-
if (pbr_bindings.empty()) {
pbr_bindings.emplace_back(0, DescriptorType::IMAGE_SAMPLED, 1, ShaderStage::FRAGMENT);
pbr_bindings.emplace_back(1, DescriptorType::SAMPLER, 1, ShaderStage::FRAGMENT);
@@ -40,7 +41,6 @@ namespace vkcv::material {
return pbr_bindings;
default:
- static std::vector<DescriptorBinding> default_bindings;
return default_bindings;
}
}
--
GitLab