From df9b1274ab7e3dfd59b2ba075039819d7cacc3cb Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Sun, 22 Aug 2021 16:09:50 +0200
Subject: [PATCH] [#106] Fixed stringstream problem
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp b/modules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp
index 198c1344..16067aeb 100644
--- a/modules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp
+++ b/modules/shader_compiler/src/vkcv/shader/GLSLCompiler.cpp
@@ -219,12 +219,10 @@ namespace vkcv::shader {
std::string source (shaderSource);
if (!m_defines.empty()) {
- std::stringstream defines;
+ std::ostringstream defines;
for (const auto& define : m_defines) {
defines << "#define " << define.first << " " << define.second << std::endl;
}
-
- defines << '\0';
size_t pos = source.find("#version") + 8;
if (pos >= source.length()) {
@@ -236,8 +234,10 @@ namespace vkcv::shader {
pos = epos;
}
+ const auto defines_str = defines.str();
+
pos = source.find('\n', pos) + 1;
- source = source.insert(pos, defines.str());
+ source = source.insert(pos, defines_str);
}
const char *shaderStrings [1];
--
GitLab