Load custom shaders from ms0:/PSP/shaders/.

hrydgard · Oct 12, 2013 · 74db6d4 · 74db6d4
1 parent 49983fa
commit 74db6d4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp
@@ -26,6 +26,7 @@
 #include "file/file_util.h"
 #include "file/vfs.h"
 
+#include "Core/Config.h"
 #include "GPU/Common/PostShader.h"
 
 static std::vector<ShaderInfo> shaderInfo;
@@ -58,7 +59,7 @@ void LoadPostShaderInfo(std::vector<std::string> directories) {
 				name = name.substr(7);
 			if (path.substr(0, 7) == "assets/")
 				path = path.substr(7);
-			if (!ini.LoadFromVFS(name)) {
+			if (!ini.LoadFromVFS(name) && !ini.Load(fileInfo[f].fullName)) {
 				// vsh load. meh.
 			} else {
 				success = true;
@@ -90,6 +91,7 @@ void LoadPostShaderInfo(std::vector<std::string> directories) {
 void LoadAllPostShaderInfo() {
 	std::vector<std::string> directories;
 	directories.push_back("assets/shaders");
+	directories.push_back(g_Config.memCardDirectory + "PSP/shaders");
 	LoadPostShaderInfo(directories);
 }