Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

third_party/SDL2-static.lua

@@ -42,6 +42,7 @@ project("SDL2")
     "SDL2/include/SDL_filesystem.h",
     "SDL2/include/SDL_gamecontroller.h",
     "SDL2/include/SDL_gesture.h",
+    "SDL2/include/SDL_guid.h",
     "SDL2/include/SDL_haptic.h",
     "SDL2/include/SDL_hints.h",
     "SDL2/include/SDL_hidapi.h",
@@ -112,6 +113,7 @@ project("SDL2")
     "SDL2/src/audio/winmm/SDL_winmm.h",
     "SDL2/src/core/windows/SDL_directx.h",
     "SDL2/src/core/windows/SDL_hid.h",
+    "SDL2/src/core/windows/SDL_immdevice.h",
     "SDL2/src/core/windows/SDL_windows.h",
     "SDL2/src/core/windows/SDL_xinput.h",
     "SDL2/src/dynapi/SDL_dynapi.h",
@@ -127,7 +129,6 @@ project("SDL2")
     "SDL2/src/events/SDL_gesture_c.h",
     "SDL2/src/events/SDL_keyboard_c.h",
     "SDL2/src/events/SDL_mouse_c.h",
-    "SDL2/src/events/SDL_sysevents.h",
     "SDL2/src/events/SDL_touch_c.h",
     "SDL2/src/events/SDL_windowevents_c.h",
     "SDL2/src/haptic/SDL_haptic_c.h",
@@ -155,6 +156,7 @@ project("SDL2")
     "SDL2/src/misc/SDL_sysurl.h",
     "SDL2/src/power/SDL_syspower.h",
     "SDL2/src/render/direct3d11/SDL_shaders_d3d11.h",
+    "SDL2/src/render/direct3d12/SDL_shaders_d3d12.h",
     "SDL2/src/render/direct3d/SDL_shaders_d3d.h",
     "SDL2/src/render/opengles2/SDL_gles2funcs.h",
     "SDL2/src/render/opengles2/SDL_shaders_gles2.h",
@@ -175,8 +177,11 @@ project("SDL2")
     "SDL2/src/SDL_assert_c.h",
     "SDL2/src/SDL_dataqueue.h",
     "SDL2/src/SDL_error_c.h",
+    "SDL2/src/SDL_guid.c",
     "SDL2/src/SDL_hints_c.h",
     "SDL2/src/SDL_internal.h",
+    "SDL2/src/SDL_list.h",
+    "SDL2/src/SDL_log_c.h",
     "SDL2/src/sensor/dummy/SDL_dummysensor.h",
     "SDL2/src/sensor/SDL_sensor_c.h",
     "SDL2/src/sensor/SDL_syssensor.h",
@@ -259,6 +264,7 @@ project("SDL2")
     "SDL2/src/audio/wasapi/SDL_wasapi.c",
     "SDL2/src/audio/wasapi/SDL_wasapi_win32.c",
     "SDL2/src/core/windows/SDL_hid.c",
+    "SDL2/src/core/windows/SDL_immdevice.c",
     "SDL2/src/core/windows/SDL_windows.c",
     "SDL2/src/core/windows/SDL_xinput.c",
     "SDL2/src/cpuinfo/SDL_cpuinfo.c",
@@ -281,13 +287,16 @@ project("SDL2")
     "SDL2/src/haptic/windows/SDL_windowshaptic.c",
     "SDL2/src/haptic/windows/SDL_xinputhaptic.c",
     "SDL2/src/hidapi/SDL_hidapi.c",
+    "SDL2/src/joystick/controller_type.c",
     "SDL2/src/joystick/dummy/SDL_sysjoystick.c",
     "SDL2/src/joystick/hidapi/SDL_hidapijoystick.c",
+    "SDL2/src/joystick/hidapi/SDL_hidapi_combined.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_gamecube.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_luna.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_ps4.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_ps5.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_rumble.c",
+    "SDL2/src/joystick/hidapi/SDL_hidapi_shield.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_stadia.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_switch.c",
     "SDL2/src/joystick/hidapi/SDL_hidapi_xbox360.c",
@@ -329,6 +338,8 @@ project("SDL2")
     "SDL2/src/power/SDL_power.c",
     "SDL2/src/power/windows/SDL_syspower.c",
     "SDL2/src/render/direct3d11/SDL_shaders_d3d11.c",
+    "SDL2/src/render/direct3d12/SDL_render_d3d12.c",
+    "SDL2/src/render/direct3d12/SDL_shaders_d3d12.c",
     "SDL2/src/render/direct3d/SDL_render_d3d.c",
     "SDL2/src/render/direct3d11/SDL_render_d3d11.c",
     "SDL2/src/render/direct3d/SDL_shaders_d3d.c",
@@ -350,16 +361,20 @@ project("SDL2")
     "SDL2/src/SDL.c",
     "SDL2/src/SDL_assert.c",
     "SDL2/src/SDL_dataqueue.c",
+    "SDL2/src/SDL_list.c",
     "SDL2/src/SDL_error.c",
     "SDL2/src/SDL_hints.c",
     "SDL2/src/SDL_log.c",
+    "SDL2/src/SDL_utils.c",
     "SDL2/src/sensor/dummy/SDL_dummysensor.c",
     "SDL2/src/sensor/SDL_sensor.c",
     "SDL2/src/sensor/windows/SDL_windowssensor.c",
+    "SDL2/src/stdlib/SDL_crc16.c",
     "SDL2/src/stdlib/SDL_crc32.c",
     "SDL2/src/stdlib/SDL_getenv.c",
     "SDL2/src/stdlib/SDL_iconv.c",
     "SDL2/src/stdlib/SDL_malloc.c",
+    "SDL2/src/stdlib/SDL_mslibc.c",
     "SDL2/src/stdlib/SDL_qsort.c",
     "SDL2/src/stdlib/SDL_stdlib.c",
     "SDL2/src/stdlib/SDL_string.c",

third_party/fxaa/LICENSE

@@ -0,0 +1,30 @@
+BSD 3-Clause License
+
+Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of NVIDIA CORPORATION nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third_party/imgui.lua

@@ -24,6 +24,7 @@ project("imgui")
     "imgui/imgui_draw.cpp",
     "imgui/imgui_demo.cpp",
     "imgui/imgui_internal.h",
+    "imgui/imgui_tables.cpp",
     "imgui/imgui_widgets.cpp",
     "imgui/imstb_rectpack.h",
     "imgui/imstb_textedit.h",