From 358be1a3572718db550305a853c482fcd2f3020a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 5 Jul 2017 22:06:00 +0100
Subject: [PATCH] Search for the ISA plugins in the arch-specific folders

---
 renderdoc/driver/ihv/amd/amd_isa.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp
index 07532070f..0837e5c71 100644
--- a/renderdoc/driver/ihv/amd/amd_isa.cpp
+++ b/renderdoc/driver/ihv/amd/amd_isa.cpp
@@ -61,6 +61,19 @@ std::string LocatePlugin(const std::string &fileName)
   paths.push_back(exepath + "/plugins");
   // linux installation
   paths.push_back(exepath + "/../share/renderdoc/plugins");
+// also search the appropriate OS-specific location in the root
+#if ENABLED(RDOC_WIN32) && ENABLED(RDOC_X64)
+  paths.push_back(exepath + "/../../plugins-win64");
+#endif
+
+#if ENABLED(RDOC_WIN32) && DISABLED(RDOC_X64)
+  paths.push_back(exepath + "/../../plugins-win32");
+#endif
+
+#if ENABLED(RDOC_LINUX)
+  paths.push_back(exepath + "/../../plugins-linux64");
+#endif
+
   // there is no standard path for local builds as we don't provide these plugins in the repository
   // directly. As a courtesy we search the root of the build, from the executable. The user can
   // always put the plugins folder relative to the exe where it would be in an installation too.