Merge branch 'master' into vulkan

2020-12-13 18:41:07 +03:00
parent c14e3770a2
commit 4617dc5569
115 changed files with 4290 additions and 3872 deletions
--- a/src/xenia/vfs/virtual_file_system.h
+++ b/src/xenia/vfs/virtual_file_system.h
@@ -43,7 +43,8 @@ class VirtualFileSystem {

  X_STATUS OpenFile(Entry* root_entry, const std::string_view path,
                    FileDisposition creation_disposition,
-                    uint32_t desired_access, bool is_directory, File** out_file,
+                    uint32_t desired_access, bool is_directory,
+                    bool is_non_directory, File** out_file,
                    FileAction* out_action);

 private: