mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-07-15 13:52:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: update to latest glslang (swizzle and vec2/vec3/vec4 implicit casting to float)

Browse Source
This commit is contained in:
Almamu 2025-04-05 06:03:01 +02:00
parent c41cac19fb
commit b00531e647
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/External/glslang-WallpaperEngine vendored

@ -1 +1 @@
Subproject commit 1956e16ffa8d107f09d65be7deaa53eb2af95ed5 Subproject commit 268813c3c883856e4b390b2d456285addfff722b

21
src/WallpaperEngine/Render/Shaders/CCompiler.cpp
View File

@ -172,21 +172,26 @@ void CCompiler::compile () {
size_t quoteStart = precompile.find_first_of ('"', start) + 1; size_t quoteStart = precompile.find_first_of ('"', start) + 1;
size_t quoteEnd = precompile.find_first_of('"', quoteStart); size_t quoteEnd = precompile.find_first_of('"', quoteStart);
std::string filename = precompile.substr(quoteStart, quoteEnd - quoteStart); std::string filename = precompile.substr(quoteStart, quoteEnd - quoteStart);
std::string content = this->lookupShaderFile (filename);
this->m_includeContent += "// begin of include from file " + filename + "\n" + std::string content = "// begin of include from file ";
content + content += filename;
"\n// end of included from file " + filename + "\n"; content += "\n";
content += this->lookupShaderFile (filename);
content += "\n// end of included from file ";
content += filename;
content += "\n";
// replace the first two letters with a comment so the filelength doesn't change // replace the first two letters with a comment so the filelength doesn't change
precompile = precompile.replace (start, 2, "//"); precompile = precompile.replace (start, 1 + quoteEnd - start, content);
//precompile = precompile.replace(start, 2, "//");
//this->m_includeContent += content;
// go to the end of the line // go to the end of the line
end = quoteEnd + 1; end = start;
} }
// include content might have more includes, so also handle those // include content might have more includes, so also handle those
end = 0; /*end = 0;
// then apply includes in-place // then apply includes in-place
while((start = this->m_includeContent.find("#include", end)) != std::string::npos) { while((start = this->m_includeContent.find("#include", end)) != std::string::npos) {
@ -226,7 +231,7 @@ void CCompiler::compile () {
precompile.insert (previousLine + 1, this->m_includeContent + '\n'); precompile.insert (previousLine + 1, this->m_includeContent + '\n');
// keep the iterator after the found function to prevent a loop // keep the iterator after the found function to prevent a loop
end = end + this->m_includeContent.length () + 1; end = end + this->m_includeContent.length () + 1;
} }*/
// content should be ready, finally ask glslang to compile the shader // content should be ready, finally ask glslang to compile the shader
this->m_compiledContent = CGLSLContext::get().toGlsl (precompile, this->m_type); this->m_compiledContent = CGLSLContext::get().toGlsl (precompile, this->m_type);