From 3ae5949126a6d39371edba26e84a7bfd32c13047 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 18 Jan 2018 10:28:31 +0000 Subject: [PATCH] Search local plugin folders on windows too for spirv plugins --- qrenderdoc/Code/Interface/PersistantConfig.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/qrenderdoc/Code/Interface/PersistantConfig.cpp b/qrenderdoc/Code/Interface/PersistantConfig.cpp index 47a7cb6dd..f5b380464 100644 --- a/qrenderdoc/Code/Interface/PersistantConfig.cpp +++ b/qrenderdoc/Code/Interface/PersistantConfig.cpp @@ -353,8 +353,21 @@ bool PersistantConfig::Load(const rdcstr &filename) } // try to find it in our plugins folder - path = QStandardPaths::findExecutable( - exe, {QDir(QApplication::applicationDirPath()).absoluteFilePath(lit("plugins/spirv/"))}); + QDir appDir(QApplication::applicationDirPath()); + + QStringList searchPaths = {appDir.absoluteFilePath(lit("plugins/spirv/"))}; + +#if defined(Q_OS_WIN64) + searchPaths << appDir.absoluteFilePath(lit("../../plugins-win64/spirv/")); +#elif defined(Q_OS_WIN64) + searchPaths << appDir.absoluteFilePath(lit("../../plugins-win32/spirv/")); +#elif defined(Q_OS_LINUX) + searchPaths << appDir.absoluteFilePath(lit("../../plugins-linux64/spirv/")); +#endif + + searchPaths << appDir.absoluteFilePath(lit("../../plugins/")); + + path = QStandardPaths::findExecutable(exe, searchPaths); if(!path.isEmpty()) {