Merge branch 'master' into d3d12

This commit is contained in:
gibbed 2019-05-12 07:48:18 -05:00
commit 6789873620
8 changed files with 28 additions and 13 deletions

View File

@ -18,6 +18,7 @@ skip_tags: true
skip_commits: skip_commits:
files: files:
- docs/* - docs/*
- .github/*
- LICENSE - LICENSE
- README.md - README.md
- .travis.yml - .travis.yml

View File

@ -1,5 +1,7 @@
<!-- <!--
# IF YOU HAVE A QUESTION THAT ISN'T A BUG REPORT, GO TO https://reddit.com/r/xenia # THIS IS NOT A SUPPORT FORUM! For support go here:
# Xenia Discord (#help) - https://discord.me/xenia-emulator
# /r/xenia (questions thread) - https://www.reddit.com/r/xenia/
# #
# DO NOT CREATE ISSUES ABOUT SPECIFIC GAMES IN THIS REPOSITORY! # DO NOT CREATE ISSUES ABOUT SPECIFIC GAMES IN THIS REPOSITORY!
# a game specific issue would be e.g. "Game X crashes after you hit a character a certain way" # a game specific issue would be e.g. "Game X crashes after you hit a character a certain way"

View File

@ -17,7 +17,7 @@ For developer chat join `#dev` but stay on topic. Lurking is not only fine, but
Please check the [frequently asked questions](https://xenia.jp/faq/) page before Please check the [frequently asked questions](https://xenia.jp/faq/) page before
asking questions. We've got jobs/lives/etc, so don't expect instant answers. asking questions. We've got jobs/lives/etc, so don't expect instant answers.
Discussing illegal activities will get you banned. No warnings. Discussing illegal activities will get you banned.
## Status ## Status
@ -83,10 +83,11 @@ Fixes and optimizations are always welcome (please!), but in addition to
that there are some major work areas still untouched: that there are some major work areas still untouched:
* Help work through [missing functionality/bugs in games](https://github.com/xenia-project/xenia/labels/compat) * Help work through [missing functionality/bugs in games](https://github.com/xenia-project/xenia/labels/compat)
* Add input drivers for [PS4 controllers](https://github.com/xenia-project/xenia/issues/60) (or anything else) * Add input drivers for [DualShock4 (PS4) controllers](https://github.com/xenia-project/xenia/issues/60) (or anything else)
* Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/xenia-project/xenia/labels/cross%20platform) * Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/xenia-project/xenia/labels/cross%20platform)
See more projects [good for contributors](https://github.com/xenia-project/xenia/labels/good%20first%20issue). It's a good idea to ask on Discord/check the issues before beginning work on something. See more projects [good for contributors](https://github.com/xenia-project/xenia/labels/good%20first%20issue). It's a good idea to ask on Discord and check the issues page before beginning work on
something.
## FAQ ## FAQ
@ -94,5 +95,4 @@ For more see the main [frequently asked questions](https://xenia.jp/faq/) page.
### Can I get an exe? ### Can I get an exe?
Check [Appveyor's artifacts](https://ci.appveyor.com/project/benvanik/xenia/build/artifacts) to see [Master (Vulkan)](https://ci.appveyor.com/api/projects/benvanik/xenia/artifacts/xenia-master.zip?branch=master&job=Configuration%3A%20Release&pr=false)
what's there.

View File

@ -207,9 +207,6 @@ if not os.isdir("scratch") then
flags_file:write("#--flush_stdout=false\n") flags_file:write("#--flush_stdout=false\n")
flags_file:write("\n") flags_file:write("\n")
flags_file:write("#--vsync=false\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_prefix=scratch/gpu/gpu_trace_\n")
flags_file:write("#--trace_gpu_stream\n") flags_file:write("#--trace_gpu_stream\n")
flags_file:write("#--disable_framebuffer_readback\n") flags_file:write("#--disable_framebuffer_readback\n")

View File

@ -328,7 +328,7 @@ void FatalError(const char* fmt, ...) {
MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND); MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND);
} }
#endif // WIN32 #endif // WIN32
ShutdownLogging();
exit(1); exit(1);
} }

View File

@ -144,6 +144,21 @@ dword_result_t ObReferenceObjectByHandle(dword_t handle,
} }
DECLARE_XBOXKRNL_EXPORT1(ObReferenceObjectByHandle, kNone, kImplemented); 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) { dword_result_t ObDereferenceObject(dword_t native_ptr) {
// Check if a dummy value from ObReferenceObjectByHandle. // Check if a dummy value from ObReferenceObjectByHandle.
if (native_ptr == 0xDEADF00D) { if (native_ptr == 0xDEADF00D) {

View File

@ -44,7 +44,7 @@ def main():
description='Run and diff GPU traces.') description='Run and diff GPU traces.')
parser.add_argument( parser.add_argument(
'-x', '--executable', '-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('-t', '--trace_file', action='append')
parser.add_argument('-p', '--trace_path') parser.add_argument('-p', '--trace_path')
parser.add_argument('-o', '--output_path', default='') parser.add_argument('-o', '--output_path', default='')

View File

@ -1048,7 +1048,7 @@ class GpuTestCommand(BaseBuildCommand):
# The test executables that will be built and run. # The test executables that will be built and run.
test_targets = args['target'] or [ test_targets = args['target'] or [
'xenia-gpu-gl4-trace-dump', 'xenia-gpu-vulkan-trace-dump',
] ]
args['target'] = test_targets args['target'] = test_targets