File vita3k-issue664.patch of Package vita3k

Overview Repositories Revisions Requests Users Attributes Meta

File vita3k-issue664.patch of Package vita3k (Revision 59874eab5033f7ccf7a635914bc0ff63)

Currently displaying revision 59874eab5033f7ccf7a635914bc0ff63 , Show latest

diff --git a/vita3k/config/src/config.cpp b/vita3k/config/src/config.cpp
index 4bb5e5b5..498fc77c 100644
--- a/vita3k/config/src/config.cpp
+++ b/vita3k/config/src/config.cpp
@@ -27,6 +27,11 @@
 #include <exception>
 #include <iostream>
 
+
+fs::path user_home = getenv("HOME");
+fs::path config_path = "/.config/Vita3k/";
+fs::path output_path = user_home / config_path;
+
 namespace po = boost::program_options;
 
 namespace config {
@@ -95,13 +100,13 @@ ExitCode serialize_config(Config &cfg, const fs::path &output_path) {
 ExitCode init_config(Config &cfg, int argc, char **argv, const Root &root_paths) {
     // Always generate the default configuration file
     Config command_line{};
-    serialize_config(command_line, root_paths.get_base_path() / "data/config/default.yml");
+    serialize_config(command_line, output_path / "data/config/default.yml");
 
     // Load base path configuration by default; otherwise, move the default to the base path
-    if (fs::exists(check_path(root_paths.get_base_path())))
-        parse(cfg, root_paths.get_base_path(), root_paths.get_pref_path_string());
+    if (fs::exists(check_path(output_path)))
+        parse(cfg, output_path, root_paths.get_pref_path_string());
     else
-        fs::copy(root_paths.get_base_path() / "data/config/default.yml", root_paths.get_base_path() / "config.yml");
+        fs::copy(output_path / "data/config/default.yml", output_path / "config.yml");
 
     try {
         // Declare all options
@@ -168,9 +173,9 @@ ExitCode init_config(Config &cfg, int argc, char **argv, const Root &root_paths)
             cfg.recompile_shader_path = std::move(command_line.recompile_shader_path);
             return QuitRequested;
         }
-        if (command_line.load_config || command_line.config_path != root_paths.get_base_path()) {
+        if (command_line.load_config || command_line.config_path != output_path) {
             if (command_line.config_path.empty()) {
-                command_line.config_path = root_paths.get_base_path();
+                command_line.config_path = output_path;
             } else {
                 if (parse(command_line, command_line.config_path, root_paths.get_pref_path_string()) != Success)
                     return InitConfigFailed;
diff --git a/vita3k/io/src/io.cpp b/vita3k/io/src/io.cpp
index 3decef1b..31123105 100644
--- a/vita3k/io/src/io.cpp
+++ b/vita3k/io/src/io.cpp
@@ -40,6 +40,8 @@
 #include <iterator>
 #include <string>
 
+fs::path shaderlog_path = output_path;
+
 // ****************************
 // * Utility functions *
 // ****************************
@@ -86,7 +88,7 @@ SpaceInfo get_space_info(const VitaIoDevice device, const std::string &vfs_path,
 // * End utility functions *
 // ****************************
 
-bool init(IOState &io, const fs::path &base_path, const fs::path &pref_path) {
+bool init(IOState &io, const fs::path &shader_path, const fs::path &pref_path) {
     // Iterate through the entire list of devices and create the subdirectories if they do not exist
     for (auto i : VitaIoDevice::_names()) {
         if (!device::is_valid_output_path(i))
@@ -115,7 +117,7 @@ bool init(IOState &io, const fs::path &base_path, const fs::path &pref_path) {
     if (!fs::exists(uma0_data))
         fs::create_directory(uma0_data);
 
-    fs::create_directory(base_path / "shaderlog");
+    fs::create_directory(shaderlog_path / "shaderlog");
 
     return true;
 }
diff --git a/vita3k/renderer/src/gl/load_shaders.cpp b/vita3k/renderer/src/gl/load_shaders.cpp
index e426e541..2c308a4f 100644
--- a/vita3k/renderer/src/gl/load_shaders.cpp
+++ b/vita3k/renderer/src/gl/load_shaders.cpp
@@ -11,9 +11,11 @@
 
 #include <utility>
 
+fs::path local_shader_base_path = output_path;
+
 namespace renderer::gl {
-static std::string load_shader(const char *hash, const char *extension, const char *base_path) {
-    const auto shader_path = fs_utils::construct_file_name(base_path, "shaders", hash, extension);
+static std::string load_shader(const char *hash, const char *extension, const char *local_shader_base_path) {
+    const auto shader_path = fs_utils::construct_file_name(local_shader_base_path, "shaders", hash, extension);
     fs::ifstream is(shader_path, fs::ifstream::binary);
     if (!is) {
         return std::string();
@@ -30,15 +32,15 @@ static std::string load_shader(const char *hash, const char *extension, const ch
 }
 
 static void dump_missing_shader(const char *hash, const char *extension, const SceGxmProgram &program, const char *source, const char *spirv,
-    const char *disasm, const char *base_path, const char *title_id) {
+    const char *disasm, const char *local_shader_base_path, const char *title_id) {
     const fs::path shader_base_dir{ fs::path("shaderlog") / title_id };
-    if (!fs::exists(base_path / shader_base_dir))
-        fs::create_directories(base_path / shader_base_dir);
+    if (!fs::exists(local_shader_base_path / shader_base_dir))
+        fs::create_directories(local_shader_base_path / shader_base_dir);
 
-    const auto shader_base_path = fs_utils::construct_file_name(base_path, shader_base_dir, hash, extension);
+    const auto shader_local_shader_base_path = fs_utils::construct_file_name(local_shader_base_path, shader_base_dir, hash, extension);
 
     // Dump missing shader GLSL.
-    fs::ofstream glsl_file(shader_base_path);
+    fs::ofstream glsl_file(shader_local_shader_base_path);
     if (glsl_file) {
         glsl_file << source;
         glsl_file.close();
@@ -46,7 +48,7 @@ static void dump_missing_shader(const char *hash, const char *extension, const S
 
     const auto write_data_with_ext = [&](const char *ext, const char *data, const std::int64_t size) {
         // Dump missing shader binary.
-        fs::path out_path{ shader_base_path };
+        fs::path out_path{ shader_local_shader_base_path };
         out_path.replace_extension(ext);
 
         if (size == -1) {
@@ -69,7 +71,7 @@ static void dump_missing_shader(const char *hash, const char *extension, const S
     write_data_with_ext(".spt", spirv, -1);
 }
 
-std::string load_shader(const SceGxmProgram &program, const FeatureState &features, const char *base_path, const char *title_id) {
+std::string load_shader(const SceGxmProgram &program, const FeatureState &features, const char *local_shader_base_path, const char *title_id) {
     const Sha256Hash hash_bytes = sha256(&program, program.size);
     auto shader_type_to_str = [](SceGxmProgramType type) {
         return type == Vertex ? "vert" : type == Fragment ? "frag" : "unknown";
@@ -80,7 +82,7 @@ std::string load_shader(const SceGxmProgram &program, const FeatureState &featur
 
     const Sha256HashText hash_text = hex(hash_bytes);
 
-    std::string source = load_shader(hash_text.data(), shader_type_str, base_path);
+    std::string source = load_shader(hash_text.data(), shader_type_str, local_shader_base_path);
     if (source.empty()) {
         LOG_INFO("Generating {} shader {}", shader_type_str, hash_text.data());
 
@@ -90,7 +92,7 @@ std::string load_shader(const SceGxmProgram &program, const FeatureState &featur
         source = shader::convert_gxp_to_glsl(program, hash_text.data(), features, false, &spirv_dump, &disasm_dump);
 
         dump_missing_shader(hash_text.data(), shader_type_str, program, source.c_str(), spirv_dump.c_str(), disasm_dump.c_str(),
-            base_path, title_id);
+            local_shader_base_path, title_id);
     }
 
     return source;
diff --git a/vita3k/util/include/util/fs.h b/vita3k/util/include/util/fs.h
index 3e417883..fbf5bc4f 100644
--- a/vita3k/util/include/util/fs.h
+++ b/vita3k/util/include/util/fs.h
@@ -51,6 +51,13 @@ public:
     }
 }; // class root
 
+extern fs::path user_home;
+extern fs::path user_config_path;
+extern fs::path log_path;
+extern fs::path output_path;
+extern fs::path shaderlog_path;
+extern fs::path local_shader_base_path;
+
 namespace fs_utils {
 
 /**
diff --git a/vita3k/util/src/util.cpp b/vita3k/util/src/util.cpp
index 8f9b4ad6..e5c19bd9 100644
--- a/vita3k/util/src/util.cpp
+++ b/vita3k/util/src/util.cpp
@@ -33,16 +33,34 @@
 
 #include <immintrin.h>
 
+fs::path log_path = output_path;
+
 namespace logging {
 
 static const fs::path &LOG_FILE_NAME = "vita3k.log";
 static const char *LOG_PATTERN = "%^[%H:%M:%S.%e] |%L| [%!]: %v%$";
 std::vector<spdlog::sink_ptr> sinks;
 
+static fs::path check_path(const fs::path &output_path) {
+    if (output_path.filename() != LOG_FILE_NAME) {
+        if (!output_path.has_extension()) // assume it is a folder
+            return output_path / LOG_FILE_NAME;
+        if (output_path.extension() != ".log")
+            return "";
+    }
+    return output_path;
+}
+
 ExitCode init(const Root &root_paths) {
+    const auto output = check_path(log_path);
+    if (output.empty())
+        return InvalidApplicationPath;
+    if (!fs::exists(output.parent_path()))
+        fs::create_directories(output.parent_path());
+
     sinks.push_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
 
-    if (add_sink(root_paths.get_base_path_string() / LOG_FILE_NAME) != Success)
+    if (add_sink(log_path.string() / LOG_FILE_NAME) != Success)
         return InitConfigFailed;
 
     spdlog::set_error_handler([](const std::string &msg) {

Places

File vita3k-issue664.patch of Package vita3k (Revision 59874eab5033f7ccf7a635914bc0ff63)

Places