From 75b354136ee3d49f871bc3f089787f0098f7608a Mon Sep 17 00:00:00 2001 From: Moeta Yuko Date: Sun, 1 Sep 2024 22:05:59 +0800 Subject: [PATCH] Add sampler2DComparison and uint to known types --- src/WallpaperEngine/Render/Shaders/Compiler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/WallpaperEngine/Render/Shaders/Compiler.cpp b/src/WallpaperEngine/Render/Shaders/Compiler.cpp index 63e4348..b90907c 100644 --- a/src/WallpaperEngine/Render/Shaders/Compiler.cpp +++ b/src/WallpaperEngine/Render/Shaders/Compiler.cpp @@ -694,7 +694,7 @@ void Compiler::parseParameterConfiguration (const std::string& type, const std:: value = *constant->second->as ()->getValue (); parameter = new Variables::CShaderVariableInteger (value); - } else if (type == "sampler2D") { + } else if (type == "sampler2D" || type == "sampler2DComparison") { // samplers can have special requirements, check what sampler we're working with and create definitions // if needed const auto textureName = data.find ("default"); @@ -755,7 +755,8 @@ const std::map& Compiler::getTextures () const { return this->m_textures; } -std::vector Compiler::sTypes = { - "vec4", "uvec4", "ivec4", "dvec4", "bvec4", "vec3", "uvec3", "ivec3", "dvec3", "bvec3", "vec2", - "uvec2", "ivec2", "dvec2", "bvec2", "float", "sampler2D", "mat4x3", "mat4", "mat3", "uint4", "void"}; +std::vector Compiler::sTypes = {"vec4", "uvec4", "ivec4", "dvec4", "bvec4", "vec3", + "uvec3", "ivec3", "dvec3", "bvec3", "vec2", "uvec2", + "ivec2", "dvec2", "bvec2", "float", "sampler2D", "sampler2DComparison", + "mat4x3", "mat4", "mat3", "uint", "uint4", "void"}; } // namespace WallpaperEngine::Render::Shaders