From e86bc83eeebd6cbe7779bac769a44b7942020c07 Mon Sep 17 00:00:00 2001 From: emoose Date: Sat, 13 Apr 2019 19:58:06 +0100 Subject: [PATCH 1/6] [Kernel] Add ObReferenceObjectByName --- src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc index 7ac5d5377..45bcb3355 100644 --- a/src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc +++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc @@ -144,6 +144,21 @@ dword_result_t ObReferenceObjectByHandle(dword_t handle, } DECLARE_XBOXKRNL_EXPORT1(ObReferenceObjectByHandle, kNone, kImplemented); +dword_result_t ObReferenceObjectByName(lpstring_t name, dword_t attributes, + dword_t object_type_ptr, + lpvoid_t parse_context, + lpdword_t out_object_ptr) { + X_HANDLE handle = X_INVALID_HANDLE_VALUE; + X_STATUS result = + kernel_state()->object_table()->GetObjectByName(name.value(), &handle); + if (XSUCCEEDED(result)) { + return ObReferenceObjectByHandle(handle, object_type_ptr, out_object_ptr); + } + + return result; +} +DECLARE_XBOXKRNL_EXPORT1(ObReferenceObjectByName, kNone, kImplemented); + dword_result_t ObDereferenceObject(dword_t native_ptr) { // Check if a dummy value from ObReferenceObjectByHandle. if (native_ptr == 0xDEADF00D) { From f4c2dcf1a222247e2c4db63996f903ae870117c9 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Mon, 6 May 2019 15:29:25 -0700 Subject: [PATCH 2/6] [AppVeyor] Ignore .github --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 2ac5b4996..d031e82a4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,6 +18,7 @@ skip_tags: true skip_commits: files: - docs/* + - .github/* - LICENSE - README.md - .travis.yml From 24c290e8a98be4a8b0a12a5c9ba9980d46e1d299 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Wed, 8 May 2019 08:31:04 -0700 Subject: [PATCH 3/6] Fix/remove OpenGL leftovers --- premake5.lua | 3 --- tools/gpu-trace-diff | 2 +- xenia-build | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/premake5.lua b/premake5.lua index 0ff17be1e..cbced3139 100644 --- a/premake5.lua +++ b/premake5.lua @@ -206,9 +206,6 @@ if not os.isdir("scratch") then flags_file:write("#--flush_stdout=false\n") flags_file:write("\n") flags_file:write("#--vsync=false\n") - flags_file:write("#--gl_debug\n") - flags_file:write("#--gl_debug_output\n") - flags_file:write("#--gl_debug_output_synchronous\n") flags_file:write("#--trace_gpu_prefix=scratch/gpu/gpu_trace_\n") flags_file:write("#--trace_gpu_stream\n") flags_file:write("#--disable_framebuffer_readback\n") diff --git a/tools/gpu-trace-diff b/tools/gpu-trace-diff index 1098aa671..a2dcf67b9 100644 --- a/tools/gpu-trace-diff +++ b/tools/gpu-trace-diff @@ -44,7 +44,7 @@ def main(): description='Run and diff GPU traces.') parser.add_argument( '-x', '--executable', - default='build/bin/Windows/Debug/xenia-gpu-gl4-trace-dump.exe') + default='build/bin/Windows/Debug/xenia-gpu-vulkan-trace-dump.exe') parser.add_argument('-t', '--trace_file', action='append') parser.add_argument('-p', '--trace_path') parser.add_argument('-o', '--output_path', default='') diff --git a/xenia-build b/xenia-build index 2199c12de..439210dcf 100755 --- a/xenia-build +++ b/xenia-build @@ -958,7 +958,7 @@ class GpuTestCommand(BaseBuildCommand): # The test executables that will be built and run. test_targets = args['target'] or [ - 'xenia-gpu-gl4-trace-dump', + 'xenia-gpu-vulkan-trace-dump', ] args['target'] = test_targets From eb5baa41bb2973e594d57ae33df5b35ec1485655 Mon Sep 17 00:00:00 2001 From: Jonathan Goyvaerts Date: Fri, 19 Apr 2019 13:31:34 +0200 Subject: [PATCH 4/6] Shutdown logging when a fatal error occurs, this fixes the error not showing up in the log file --- src/xenia/base/logging.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenia/base/logging.cc b/src/xenia/base/logging.cc index 72b04a1f8..124fe6f30 100644 --- a/src/xenia/base/logging.cc +++ b/src/xenia/base/logging.cc @@ -325,7 +325,7 @@ void FatalError(const char* fmt, ...) { MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND); } #endif // WIN32 - + ShutdownLogging(); exit(1); } From 7247c2672593da5de730053c20c7758cd266e712 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Sun, 12 May 2019 05:37:56 -0700 Subject: [PATCH 5/6] Update README and issue template. --- .github/ISSUE_TEMPLATE.md | 6 ++++-- README.md | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 866b52421..2633c3360 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,5 +1,7 @@