From 74db6d4e266f2ebd1d7b61309eab934c21b60a4c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 12 Oct 2013 16:44:46 -0700 Subject: [PATCH] Load custom shaders from ms0:/PSP/shaders/. --- GPU/Common/PostShader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index 0149f9aabf..f6dc43c5f9 100644 --- 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; @@ -58,7 +59,7 @@ void LoadPostShaderInfo(std::vector 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 directories) { void LoadAllPostShaderInfo() { std::vector directories; directories.push_back("assets/shaders"); + directories.push_back(g_Config.memCardDirectory + "PSP/shaders"); LoadPostShaderInfo(directories); }