ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2019-04-19 15:32:10 +03:00
parent c006acf2c2 18d8a59cfa
commit 40ffba97d9
12 changed files with 176 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenia/app/premake5.lua
View File

@ -51,18 +51,20 @@ project("xenia-app")
files({
"xenia_main.cc",
"../base/main_"..platform_suffix..".cc",
"../base/main_entrypoint_"..platform_suffix..".cc",
})
filter("files:xenia_main.cc or ../base/main_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX for main_win.cc so our AVX check/error can happen.
resincludedirs({
project_root,
})
filter("platforms:Windows")
files({
"main_resources.rc",
})
resincludedirs({
project_root,
})
filter("files:../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
@ -89,7 +91,5 @@ project("xenia-app")
debugdir(project_root)
debugargs({
"--flagfile=scratch/flags.txt",
"2>&1",
"1>scratch/stdout.txt",
})
end

38
src/xenia/base/main_entrypoint_posix.cc Normal file
View File

@ -0,0 +1,38 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2014 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#include "xenia/base/main.h"
#include <gflags/gflags.h>
#include "xenia/base/logging.h"
#include "xenia/base/string.h"
extern "C" int main(int argc, char** argv) {
auto entry_info = xe::GetEntryInfo();
google::SetUsageMessage(std::string("usage: ") +
xe::to_string(entry_info.usage));
google::SetVersionString("1.0");
google::ParseCommandLineFlags(&argc, &argv, true);
std::vector<std::wstring> args;
for (int n = 0; n < argc; n++) {
args.push_back(xe::to_wstring(argv[n]));
}
// Initialize logging. Needs parsed FLAGS.
xe::InitializeLogging(entry_info.name);
// Call app-provided entry point.
int result = entry_info.entry_point(args);
google::ShutDownCommandLineFlags();
return result;
}

79
src/xenia/base/main_entrypoint_win.cc Normal file
View File

@ -0,0 +1,79 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2014 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#include "xenia/base/main.h"
#include <fcntl.h>
#include <gflags/gflags.h>
#include <io.h>
#include <cstdlib>
// Autogenerated by `xb premake`.
#include "build/version.h"
#include "xenia/base/platform_win.h"
#include "xenia/base/string.h"
#include "third_party/xbyak/xbyak/xbyak_util.h"
namespace xe {
void AttachConsole();
int Main();
}; // namespace xe
// Used in console mode apps; automatically picked based on subsystem.
int main(int, char**) {
Xbyak::util::Cpu cpu;
if (!cpu.has(Xbyak::util::Cpu::tAVX)) {
printf(
"Your CPU does not support AVX, which is required by Xenia.\r\nSee the "
"FAQ for system requirements at https://xenia.jp\r\n");
return -1;
}
return xe::Main();
}
// Used in windowed apps; automatically picked based on subsystem.
int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int) {
Xbyak::util::Cpu cpu;
if (!cpu.has(Xbyak::util::Cpu::tAVX)) {
MessageBoxA(
NULL,
"Your CPU does not support AVX, which is required by Xenia. See the "
"FAQ for system requirements at https://xenia.jp",
"Xenia Error", MB_OK | MB_ICONERROR | MB_APPLMODAL | MB_SETFOREGROUND);
return -1;
}
// Attach a console so we can write output to stdout. If the user hasn't
// redirected output themselves it'll pop up a window.
xe::AttachConsole();
// Run normal entry point.
return xe::Main();
}
#if defined _M_IX86
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#elif defined _M_IA64
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#elif defined _M_X64
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#else
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#endif

23
src/xenia/base/main_posix.cc
View File

@ -19,26 +19,3 @@ namespace xe {
bool has_console_attached() { return true; }
} // namespace xe
extern "C" int main(int argc, char** argv) {
auto entry_info = xe::GetEntryInfo();
google::SetUsageMessage(std::string("usage: ") +
xe::to_string(entry_info.usage));
google::SetVersionString("1.0");
google::ParseCommandLineFlags(&argc, &argv, true);
std::vector<std::wstring> args;
for (int n = 0; n < argc; n++) {
args.push_back(xe::to_wstring(argv[n]));
}
// Initialize logging. Needs parsed FLAGS.
xe::InitializeLogging(entry_info.name);
// Call app-provided entry point.
int result = entry_info.entry_point(args);
google::ShutDownCommandLineFlags();
return result;
}

40
src/xenia/base/main_win.cc
View File

@ -124,19 +124,12 @@ int Main() {
// Setup COM on the main thread.
// NOTE: this may fail if COM has already been initialized - that's OK.
#pragma warning(suppress : 6031)
CoInitializeEx(nullptr, COINIT_MULTITHREADED);
// Initialize logging. Needs parsed FLAGS.
xe::InitializeLogging(entry_info.name);
Xbyak::util::Cpu cpu;
if (!cpu.has(Xbyak::util::Cpu::tAVX)) {
xe::FatalError(
"Your CPU does not support AVX, which is required by Xenia. See the "
"FAQ for system requirements at https://xenia.jp");
return -1;
}
// Print version info.
XELOGI("Build: %s / %s on %s", XE_BUILD_BRANCH, XE_BUILD_COMMIT,
XE_BUILD_DATE);
@ -156,34 +149,3 @@ int Main() {
}
} // namespace xe
// Used in console mode apps; automatically picked based on subsystem.
int main(int argc_ignored, char** argv_ignored) { return xe::Main(); }
// Used in windowed apps; automatically picked based on subsystem.
int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR command_line, int) {
// Attach a console so we can write output to stdout. If the user hasn't
// redirected output themselves it'll pop up a window.
xe::AttachConsole();
// Run normal entry point.
return xe::Main();
}
#if defined _M_IX86
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#elif defined _M_IA64
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#elif defined _M_X64
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#else
#pragma comment( \
linker, \
"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length)
#endif

13
src/xenia/cpu/ppc/testing/premake5.lua
View File

@ -18,6 +18,7 @@ project("xenia-cpu-ppc-tests")
files({
"ppc_testing_main.cc",
"../../../base/main_"..platform_suffix..".cc",
"../../../base/main_entrypoint_"..platform_suffix..".cc",
})
files({
"*.s",
@ -25,8 +26,11 @@ project("xenia-cpu-ppc-tests")
includedirs({
project_root.."/third_party/gflags/src",
})
filter("files:*.s")
flags({"ExcludeFromBuild"})
filter("files:../../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Windows")
debugdir(project_root)
debugargs({
@ -51,14 +55,12 @@ project("xenia-cpu-ppc-nativetests")
files({
"ppc_testing_native_main.cc",
"../../../base/main_"..platform_suffix..".cc",
"../../../base/main_entrypoint_"..platform_suffix..".cc",
})
files({
"instr_*.s",
"seq_*.s",
})
filter("files:instr_*.s", "files:seq_*.s")
flags({"ExcludeFromBuild"})
filter({})
includedirs({
project_root.."/third_party/gflags/src",
})
@ -70,4 +72,9 @@ project("xenia-cpu-ppc-nativetests")
"ppc_testing_native_thunks.s",
})
filter("files:instr_*.s", "files:seq_*.s")
flags({"ExcludeFromBuild"})
filter("files:../../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
end

4
src/xenia/gpu/premake5.lua
View File

@ -48,8 +48,12 @@ project("xenia-gpu-shader-compiler")
files({
"shader_compiler_main.cc",
"../base/main_"..platform_suffix..".cc",
"../base/main_entrypoint_"..platform_suffix..".cc",
})
filter("files:../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Windows")
-- Only create the .user file if it doesn't already exist.
local user_file = project_root.."/build/xenia-gpu-shader-compiler.vcxproj.user"

8
src/xenia/gpu/vulkan/premake5.lua
View File

@ -68,8 +68,12 @@ project("xenia-gpu-vulkan-trace-viewer")
files({
"vulkan_trace_viewer_main.cc",
"../../base/main_"..platform_suffix..".cc",
"../../base/main_entrypoint_"..platform_suffix..".cc",
})
filter("files:../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
"X11",
@ -139,8 +143,12 @@ project("xenia-gpu-vulkan-trace-dump")
files({
"vulkan_trace_dump_main.cc",
"../../base/main_"..platform_suffix..".cc",
"../../base/main_entrypoint_"..platform_suffix..".cc",
})
filter("files:../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
"X11",

4
src/xenia/hid/premake5.lua
View File

@ -43,11 +43,15 @@ project("xenia-hid-demo")
files({
"hid_demo.cc",
"../base/main_"..platform_suffix..".cc",
"../base/main_entrypoint_"..platform_suffix..".cc",
})
resincludedirs({
project_root,
})
filter("files:../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
"X11",

18
src/xenia/kernel/xthread.cc
View File

@ -13,6 +13,10 @@
#include <cstring>
#ifdef XE_PLATFORM_WIN32
#include <objbase.h>
#endif
#include "xenia/base/byte_stream.h"
#include "xenia/base/clock.h"
#include "xenia/base/logging.h"
@ -374,6 +378,20 @@ X_STATUS XThread::Create() {
// Set name immediately, if we have one.
thread_->set_name(thread_name_);
#ifdef XE_PLATFORM_WIN32
// Setup COM on this thread.
//
// https://devblogs.microsoft.com/oldnewthing/?p=4613
//
// "If any thread in the process calls CoInitialize[Ex] with the
// COINIT_MULTITHREADED flag, then that not only initializes the current
// thread as a member of the multi-threaded apartment, but it also says,
// "Any thread which has never called CoInitialize[Ex] is also part of the
// multi-threaded apartment."
#pragma warning(suppress : 6031)
CoInitializeEx(nullptr, COINIT_MULTITHREADED);
#endif
// Profiler needs to know about the thread.
xe::Profiler::ThreadEnter(thread_name_.c_str());

4
src/xenia/ui/vulkan/premake5.lua
View File

@ -47,11 +47,15 @@ project("xenia-ui-window-vulkan-demo")
"../window_demo.cc",
"vulkan_window_demo.cc",
project_root.."/src/xenia/base/main_"..platform_suffix..".cc",
project_root.."/src/xenia/base/main_entrypoint_"..platform_suffix..".cc",
})
resincludedirs({
project_root,
})
filter("files:"..project_root.."/src/xenia/base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
"X11",

3
src/xenia/vfs/premake5.lua
View File

@ -34,8 +34,11 @@ project("xenia-vfs-dump")
files({
"vfs_dump.cc",
project_root.."/src/xenia/base/main_"..platform_suffix..".cc",
project_root.."/src/xenia/base/main_entrypoint_"..platform_suffix..".cc",
})
resincludedirs({
project_root,
})
filter("files:"..project_root.."/src/xenia/base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.