mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 00:32:49 +00:00
Code Issues Projects Releases Wiki Activity

includes now work when the same shader has different defines

Browse Source
This commit is contained in:
florent.teppe 2022-08-04 13:00:32 +02:00
parent 7b78bf4b66
commit cc9d436413
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/shader/shadermanager.cpp
View File

@ -366,6 +366,7 @@ namespace Shader
using KeysHolder = std::set<ShaderManager::MapKey>; using KeysHolder = std::set<ShaderManager::MapKey>;
std::unordered_map<std::string, KeysHolder> mShaderFiles; std::unordered_map<std::string, KeysHolder> mShaderFiles;
std::unordered_map<std::string, std::set<std::filesystem::path>> templateIncludedFiles;
std::filesystem::file_time_type mLastAutoRecompileTime; std::filesystem::file_time_type mLastAutoRecompileTime;
bool mHotReloadEnabled; bool mHotReloadEnabled;
@ -375,8 +376,9 @@ namespace Shader
mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now(); mLastAutoRecompileTime = std::filesystem::file_time_type::clock::now();
} }
void addShaderFiles(std::set<std::filesystem::path>& shaderFiles,const osg::ref_ptr<osg::Shader>& shader,const std::string& templateName,const ShaderManager::DefineMap& defines ) void addShaderFiles(const std::string& templateName,const ShaderManager::DefineMap& defines )
{ {
const std::set<std::filesystem::path>& shaderFiles = templateIncludedFiles[templateName];
for (const std::filesystem::path& file : shaderFiles) for (const std::filesystem::path& file : shaderFiles)
{ {
mShaderFiles[file.string()].insert(std::make_pair(templateName, defines)); mShaderFiles[file.string()].insert(std::make_pair(templateName, defines));
@ -468,7 +470,7 @@ namespace Shader
if (!addLineDirectivesAfterConditionalBlocks(source) if (!addLineDirectivesAfterConditionalBlocks(source)
|| !parseIncludes(std::filesystem::path(mPath), source, templateName, fileNumber, {}, insertedPaths)) || !parseIncludes(std::filesystem::path(mPath), source, templateName, fileNumber, {}, insertedPaths))
return nullptr; return nullptr;
mHotReloadManager->templateIncludedFiles[templateName] = insertedPaths;
templateIt = mShaderTemplates.insert(std::make_pair(templateName, source)).first; templateIt = mShaderTemplates.insert(std::make_pair(templateName, source)).first;
} }
@ -491,13 +493,7 @@ namespace Shader
static unsigned int counter = 0; static unsigned int counter = 0;
shader->setName(Misc::StringUtils::format("%u %s", counter++, templateName)); shader->setName(Misc::StringUtils::format("%u %s", counter++, templateName));
if (insertedPaths.size() == 0) mHotReloadManager->addShaderFiles(templateName, defines);
{
int fileNumber = 1;
parseIncludes(std::filesystem::path(mPath), shaderSource, templateName, fileNumber, {}, insertedPaths);
}
mHotReloadManager->addShaderFiles(insertedPaths, shader, templateName, defines);
lock.unlock(); lock.unlock();
getLinkedShaders(shader, linkedShaderNames, defines); getLinkedShaders(shader, linkedShaderNames, defines);