Update to 1.7.3

Merge pull request #6716 from cubtekki/cubtekki-patch-0
Updated readme file
2026-11-09 03:29:43 -10:00 · 2018-05-04 05:45:22 +02:00 · 2018-05-04 05:07:02 +02:00 · 2018-05-03 20:02:22 -07:00 · 2018-05-03 19:55:30 -07:00 · 2018-05-03 21:47:21 -04:00
936 changed files with 50915 additions and 18719 deletions
@@ -10,7 +10,7 @@ matrix:
            - g++-mingw-w64-i686
            - mingw-w64-i686-dev
      script:
-        - CROSS_COMPILE=i686-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+        - CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
    - compiler: mingw-x64
      addons:
        apt:
@@ -18,7 +18,7 @@ matrix:
            - g++-mingw-w64-x86-64
            - mingw-w64-x86-64-dev
      script:
-        - CROSS_COMPILE=x86_64-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+        - CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
    - compiler: gcc
    - compiler: clang
      addons:
@@ -64,3 +64,5 @@ addons:
    build_command_prepend: "./configure; make clean"
    build_command:   "make"
    branch_pattern: coverity_scan
+notifications:
+  email: false
@@ -1,125 +1,127 @@
-{
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ]
-        },
-        {
-            "name": "Linux",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Win32",
-            "includePath": [
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                "${workspaceRoot}"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-         "name": "msys2-mingw32",
-         "includePath": [
-             "C:/msys64/mingw32/include",
-             "C:/msys64/mingw32/i686-w64-mingw32/include",
-             "${workspaceRoot}/libretro-common/include",
-             "${workspaceRoot}/include",                
-             "${workspaceRoot}"
-         ],
-         "defines": [
-             "_DEBUG",
-             "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-             "path": [
-                  "C:/msys64/mingw32/include",
-                  "C:/msys64/mingw32/i686-w64-mingw32/include",
-                  "${workspaceRoot}/libretro-common/include",
-                  "${workspaceRoot}/include",                
-                  "${workspaceRoot}"
-             ],
-             "limitSymbolsToIncludedHeaders": true,
-             "databaseFilename": ""
-         }
-        },
-        {
-         "name": "msys2-mingw64",
-         "includePath": [
-             "C:/msys64/mingw64/include",
-             "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-             "${workspaceRoot}/libretro-common/include",
-             "${workspaceRoot}/include",                
-             "${workspaceRoot}"
-         ],
-         "defines": [
-             "_DEBUG",
-             "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-             "path": [
-                  "C:/msys64/mingw64/include",
-                  "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-                  "${workspaceRoot}/libretro-common/include",
-                  "${workspaceRoot}/include",                
-                  "${workspaceRoot}"
-             ],
-             "limitSymbolsToIncludedHeaders": true,
-             "databaseFilename": ""
-         }
-     }
-    ],
-    "version": 3
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "msys2-mingw32",
+            "includePath": [
+                "C:/msys64/mingw32/include",
+                "C:/msys64/mingw32/i686-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw32/include",
+                    "C:/msys64/mingw32/i686-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "msys2-mingw64",
+            "includePath": [
+                "C:/msys64/mingw64/include",
+                "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw64/include",
+                    "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 3
 }
@@ -5,44 +5,41 @@
   "version": "0.2.0",
   "configurations": [
      {
-         "name": "msys2-mingw64 debug",
+         "name": "(gdb) Launch",
         "type": "cppdbg",
         "request": "launch",
         "program": "${workspaceFolder}/retroarch.exe",
-         "args": [],
+         "args": ["-v"],
         "stopAtEntry": false,
         "cwd": "${workspaceFolder}",
         "environment": [],
-         "externalConsole": true,
+         "externalConsole": false,
         "MIMode": "gdb",
         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
         "setupCommands": [
-            {
-               "description": "Enable pretty-printing for gdb",
-               "text": "-enable-pretty-printing",
-               "ignoreFailures": true
-            }
+             {
+                 "description": "Enable pretty-printing for gdb",
+                 "text": "-enable-pretty-printing",
+                 "ignoreFailures": true
+             }
         ]
      },
-      {
-         "name": "msys2-mingw32 debug",
+      { 
+         "name": "(gdb) Attach",
         "type": "cppdbg",
-         "request": "launch",
+         "request": "attach",
         "program": "${workspaceFolder}/retroarch.exe",
-         "args": [],
-         "stopAtEntry": false,
-         "cwd": "${workspaceFolder}",
-         "environment": [],
-         "externalConsole": true,
+         "processId": "${command:pickProcess}",
         "MIMode": "gdb",
-         "miDebuggerPath": "c:\\msys64\\mingw32\\bin\\gdb.exe",
+         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
         "setupCommands": [
-            {
-               "description": "Enable pretty-printing for gdb",
-               "text": "-enable-pretty-printing",
-               "ignoreFailures": true
-            }
+             {
+                 "description": "Enable pretty-printing for gdb",
+                 "text": "-enable-pretty-printing",
+                 "ignoreFailures": true
+             }
         ]
-      }
+      },
+
   ]
 }
@@ -14,4 +14,5 @@
      "*.in": "c",
      "*.rh": "c"
   },
+   "C_Cpp.dimInactiveRegions": false,
 }
@@ -1,4 +1,89 @@
-# 1.7.2 (future)
+# 1.7.4 (future)
+
+# 1.7.3
+- AUDIO: Audio mixer supports FLAC/MP3 file types now!
+- COMMON: Fixed bug 'crashing in cores that don't range check retro_set_controller_type'. Some people were having crashes when device is set to RETRO_DEVICE_NONE and the cores don't check the number of ports, in VBAM's case it was overflowing and crashing. QuickNES was crashing too.
+- COMMON: Fixed buffer overflow in url encoding (affecting MSVC2010/2013).
+- COMMON: (QuickMenu) Added Configuration Override submenu.
+- HID: Merge new HID subsystem.
+- HID: Fix WaveBird support for the Wii U GCA.
+- HID/OSX: Fix regression with IODHIDManager - gamepads which are connected later would not be autoconfigured.
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Japanese translation.
+- LOCALIZATION: Update Portuguese translation.
+- MENU: Audio mixer now works in the menu without any cores loaded. You have to enable the setting 'Enable menu audio' for this to work.
+- REMAPPING/OVERLAYS: Fix regression - overlays could no longer be remapped.
+- SCANNER: Add Wii Backup File WBFS support.
+- X11: CRT SwitchRes support for X11/Linux.
+
+# 1.7.2
+- ANDROID/OPENSL: Prevent crashes when setting audio latency too low (buffer count can never be lower than 2 now).
+- CRT: Added CRT SwitchRes.
+- COMMON: Hide the 'Core delete' option if the 'Core updater' is also hidden.
+- COMMON: Add way to reset core association for playlist entry.
+- COMMON: Fix invalid long command line options causing infinite loop on Windows
+- COMMON: Add OSD statistics for video/audio/core.
+- COMMON: Added runahead system; allows you to drive down latency even further.
+- COMMON: Fix buggy behavior that could happen with ZIP file reading on some platforms as a result of not initializing struct.
+- CHEEVOS: Support Atari 2600, Virtual Boy, and Arcade (only Neo Geo, CPS-1, CPS-2 and CPS-3 and only with fbalpha core).
+- CHEEVOS: Add option to automatically take a screenshot when an achievement is triggered.
+- CHEEVOS: Fixed incompatibilities with Neo Geo Pocket achievement sets.
+- CHEEVOS: Store only login token, not password.
+- D3D10: Added D3D10 driver to release build. Has working shaders (Slang), overlay, and menu display driver support. Should be on par capabilities wise
+with D3D11 driver except for there being no hardware rendering right now.
+- D3D11: Experimental hardware renderer. Allows for libretro cores to use D3D11 for hardware rendering. First core to use this is PPSSPP.
+- D3D11: Increase backwards compatibility, shaders compile with Shader Model 4.0 now, added support for more feature levels.
+- D3D10/D3D11/D3D12: Fix crashes with completely black or white thumbnail textures in XMB.
+- GUI: Support disabling window decorations on Windows and Linux.
+- LIBRETRO: Addition - Functions to enable and disable audio and video, and an environment function to query status of audio and video enables.
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Polish translation.
+- MENU: Add Rewind/Latency/Overlay settings to Quick Menu, add options to show/hide them (User Interface -> Views -> Quick Menu)
+- MENU/RGUI: Only show Menu Linear Filter for RGUI and only show it for
+video drivers that implement it (D3D8/9/10/11/12/GL)
+- MENU/RGUI: Add User Interface -> Appearance options.
+- MENU/RGUI: D3D8/D3D9: Hookup Menu Linear Filter
+- MENU/XMB: Disable XMB shadow icons by default for PowerPC and ARM for performance reasons.
+- MENU/XMB: Left/right thumbnails are now automatically scaled according to layout.
+- MENU/XMB: Add Left Thumbnails (additional to the right). 
+- MENU/XMB: Fixed left/right tab regression.
+- MENU/XMB: Fix scaling of tall images that were cut on bottom previously.
+- MENU/XMB: Menu scale factor setting now changes texts length, image scaling and margins.
+- MENU/XMB: Mouse cursor scales correctly now.
+- MENU/XMB: Add toggle to show/hide Playlist tabs.
+- MENU/XMB: Add menu layout - can switch between Desktop, Handheld and Auto.
+- MENU/XMB: Don't load menu pipeline shaders unless XMB is selected (D3D10/D3D11/D3D12/GL/Vulkan)
+- MENU/VIDEO: Only show black frame insertion for the video drivers/context drivers
+that support it (so far this includes - D3D8/D3D9, OpenGL, Vulkan)
+- MENU/VIDEO:  Only show max swapchain images if supported by video driver and/or context driver (so far this includes - DRM EGL context driver, VideoCore EGL context driver, Vulkan)
+- MENU/MaterialUI: Automatic DPI Scaling should be much improved now, now scales as expected at 1440p and 4K resolutions.
+- MENU/MaterialUI: Fix wrong calculation of an entry height causing long playlists to end up outside of screen range. This also could cause crashes on low DPI screens.
+- IOS: Fixed crash when opening downloaded roms from Safari or using the "Open in.." functionality. Added the compiler flag to support keyboard remapping to controls.
+- IOS: Fixed buffer overlap that caused a crash while trying to download GLSL shaders from the buildbot.
+- PS3: fix URLS
+- REMAPS: Mapping keyboard keys from more than one gamepad (works with dosbox)
+- REMAPS: Mapping more than one button to the same action
+- REMAPS: Unmapping buttons
+- REMAPS: Unmapping analogs
+- REMAPS: Mapping a button to trigger an analog response (tested with mupen, can run on SM64 with the d-pad now, triggers a full analog tilt)
+- REMAPS: Mapping an analog to another analog (having more than one analog mapped to the same output causes issues)
+- REMAPS: Mapping an analog to produce a button response
+- SCANNER: Should be able to scan dual-layer Wii disc images now, filestream code now supports files larger than 4GB.
+- SHADERS/SLANG: Slang shaders should work again on Android version and MSVC versions (basically all the Griffin-based versions).
+- SHADERS: If GL context is GLES2/3/Core context, Cg shaders are unavailable. Applies to shader list too.
+- SHADERS: Hide cg/glsl shaders from being able to be selected if D3D8/9/10/11/Vulkan video drivers are selected.
+- SHADERS: Hide slang shaders from being able to be selected if D3D8/9/OpenGL video drivers are selected.
+- SHADERS: Prevent crashes from occurring if we have the GL video driver in use and we try to skip to a slang shader through next/previous hotkeys
+- SHADERS: Fix shader parameter increase / decrease functions
+- SUBSYSTEM: handle savestates properly (cart1 + cart2.state0)
+- VULKAN/X11: Fix X11 Vulkan bug from Wayland driver.
+- VULKAN: Fix multi-line text spacing in menus with Vulkan driver.
+- WINDOWS XP: Add Cheevos support.
+- WINDOWS/MSVC 2003/2005/2010/2013/2015/2017: Add Cheevos support.
+- VITA: Bugfix for 'PS Vita takes many time to start to accept input' issue.
+- X11: Allow compositor disabling on X11 fullscreen through _NET_WM_BYPASS_COMPOSITOR
+- X11: Prioritize _NET_WM_STATE_FULLSCREEN_ in true fullscreen mode
+- WIIU: Fix OOB read/write in keyboard driver.

 # 1.7.1
 - 3DS: Now correctly reports amount of CPU cores.
@@ -38,9 +123,8 @@
 - LOCALIZATION: Update Spanish translation.
 - NETPLAY: Add menu option to select different MITM (relay) server locations.
 - OSX: Modify HID buttons detection algorithm.
- QB: Added --datarootdir.
- QB: Added --bindir and --mandir and deprecated --with-bin_dir and --with-man_dir.
- QB: Added --docdir.
+- QB: Added --datarootdir, --sysconfdir, --bindir, --docdir and --mandir.
+- QB: Deprecated --global-config-dir, --with-bin_dir and --with-man_dir.
 - SHADERS: Allow saving of shader presets based on the parent directory (Saving one for */foo/bar/mario.sfc* would result in *shaders/presets/corename/bar.ext*). We decided it's safer to still isolate the presets to a single core because different cores may treat video output differently.
 - SHADERS: Don't save the path to the current preset to the main config. This was causing weird behavior, instead it will try to load *currentconfig.ext* and it will save a preset with that name when select *apply shader preset*. The resulting shader will restore properly after restarting and even after core/parent/game specific presets are loaded
 - SOLARIS: Initial port.
@@ -279,7 +363,7 @@ Skipped this one.
 - MISC: Various frontend optimizations.
 - NET: Fix bug #4703 (https://github.com/libretro/RetroArch/issues/4703)
 - OSX/MACOS: Fixes serious memory leak
- THUMBNAILS: Thumbnails show up now in Load Content -> Collection, Information -> Database 
+- THUMBNAILS: Thumbnails show up now in Load Content -> Collection, Information -> Database
 - VIDEO: Fix threaded video regression; tickering of menu entries would no longer work.
 - VITA: Fix 30fps menu (poke into input now instead of reading the entire input buffer which apparently is slow)
 - VITA: Fix frame throttle
@@ -46,7 +46,7 @@ endif
 include Makefile.common

 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEFINES +=  -Wno-invalid-source-encoding
+   DEFINES +=  -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
 endif

 ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
@@ -92,21 +92,22 @@ APPEND_CFLAGS := $(CFLAGS)
 CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS

-ifeq ($(CXX_BUILD), 1)
-   LINK = $(CXX)
-   CFLAGS   := $(CXXFLAGS) -xc++
-   CFLAGS   += -DCXX_BUILD
-   CXXFLAGS += -DCXX_BUILD
-else
-   ifeq ($(NEED_CXX_LINKER),1)
+ifeq ($(HAVE_CXX), 1)
+   ifeq ($(CXX_BUILD), 1)
+      LINK = $(CXX)
+      CFLAGS   := $(CXXFLAGS) -xc++
+      CFLAGS   += -DCXX_BUILD
+      CXXFLAGS += -DCXX_BUILD
+   else ifeq ($(NEED_CXX_LINKER),1)
      LINK = $(CXX)
-   else ifeq ($(findstring Win32,$(OS)),)
-      LINK = $(CC)
   else
-      # directx-related code is c++
-      LINK = $(CXX)
+      LINK = $(CC)
   endif
+else
+   LINK = $(CC)
+endif

+ifneq ($(CXX_BUILD), 1)
   ifneq ($(GNU90_BUILD), 1)
      ifneq ($(findstring icc,$(CC)),)
         CFLAGS += -std=c99 -D_GNU_SOURCE
@@ -133,7 +134,7 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))

 ifneq ($(X86),)
   CFLAGS += -m32
-   CXXLAGS += -m32
+   CXXFLAGS += -m32
   LDFLAGS += -m32
 endif

@@ -150,8 +151,29 @@ ifneq ($(findstring $(GPERFTOOLS),tcmalloc),)
   LIBS += -ltcmalloc
 endif

+# Qt MOC generation, required for QObject-derived classes
+ifneq ($(MOC_HEADERS),)
+    # prefix moc_ to base filename of paths and change extension from h to cpp, so a/b/foo.h becomes a/b/moc_foo.cpp
+    MOC_SRC := $(join $(addsuffix moc_,$(addprefix $(OBJDIR)/,$(dir $(MOC_HEADERS)))), $(notdir $(MOC_HEADERS:.h=.cpp)))
+    MOC_OBJ := $(patsubst %.cpp,%.o,$(MOC_SRC))
+    RARCH_OBJ += $(MOC_OBJ)
+endif
+
 all: $(TARGET) config.mk

+$(MOC_SRC):
+	@$(if $(Q), $(shell echo echo MOC $<),)
+	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
+	$(Q)$(MOC) -o $(MOC_TMP) $<
+
+$(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
+
+$(MOC_OBJ):
+	@$(if $(Q), $(shell echo echo CXX $<),)
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
+$(foreach x,$(join $(addsuffix :,$(MOC_OBJ)),$(MOC_SRC)),$(eval $x))
+
 ifeq ($(MAKECMDGOALS),clean)
 config.mk:
 else
@@ -250,3 +272,6 @@ clean:
 	rm -f *.d

 .PHONY: all install uninstall clean
+
+print-%:
+	@echo '$*=$($*)'
@@ -147,6 +147,8 @@ ifneq ($(GIT_VERSION),)
 endif

 # General object files
+DEFINES += -DHAVE_DR_MP3
+CFLAGS  += -DHAVE_DR_MP3

 OBJ += frontend/frontend.o \
       frontend/frontend_driver.o \
@@ -198,12 +200,15 @@ OBJ += frontend/frontend.o \
       $(LIBRETRO_COMM_DIR)/hash/rhash.o \
       audio/audio_driver.o \
       $(LIBRETRO_COMM_DIR)/audio/audio_mixer.o \
+       input/common/input_common.o \
       input/input_driver.o \
+		 input/input_mapper.o \
       led/led_driver.o \
       led/drivers/led_null.o \
       gfx/video_coord_array.o \
       gfx/video_display_server.o \
       gfx/video_driver.o \
+	   gfx/video_crt_switch.o \
       camera/camera_driver.o \
       wifi/wifi_driver.o \
       location/location_driver.o \
@@ -258,7 +263,18 @@ OBJ += frontend/frontend.o \
       record/drivers/record_null.o \
       $(LIBRETRO_COMM_DIR)/features/features_cpu.o \
       performance_counters.o \
-       verbosity.o
+       verbosity.o \
+
+ifeq ($(HAVE_RUNAHEAD), 1)
+DEFINES += -DHAVE_RUNAHEAD
+OBJ += runahead/copy_load_info.o \
+       runahead/dirty_input.o \
+       runahead/mem_util.o \
+       runahead/mylist.o \
+       runahead/run_ahead.o \
+       runahead/secondary_core.o
+endif
+


 ifeq ($(HAVE_CC_RESAMPLER), 1)
@@ -308,23 +324,27 @@ DEFINES += -DHAVE_IMAGEVIEWER
 OBJ += cores/libretro-imageviewer/image_core.o
 endif

-# Qt
-
-ifeq ($(HAVE_QT_WRAPPER), 1)
-OBJ += ui/drivers/ui_qt.o
-LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/build/release/
-LIBS += -lwrapper
-endif
+# Qt WIMP GUI

 ifeq ($(HAVE_QT), 1)
 OBJ += ui/drivers/ui_qt.o \
       ui/drivers/qt/ui_qt_application.o \
       ui/drivers/qt/ui_qt_window.o \
       ui/drivers/qt/ui_qt_browser_window.o \
+       ui/drivers/qt/ui_qt_load_core_window.o \
       ui/drivers/qt/ui_qt_msg_window.o

+MOC_HEADERS += ui/drivers/ui_qt.h \
+							 ui/drivers/qt/ui_qt_load_core_window.h
+
+DEFINES += $(QT5CORE_CFLAGS) $(QT5GUI_CFLAGS) $(QT5WIDGETS_CFLAGS) -DHAVE_MAIN
+#DEFINES += $(QT5WEBENGINE_CFLAGS)
+LIBS += $(QT5CORE_LIBS) $(QT5GUI_LIBS) $(QT5WIDGETS_LIBS)
+#LIBS += $(QT5WEBENGINE_LIBS)
+NEED_CXX_LINKER = 1
+
 ifneq ($(findstring Linux,$(OS)),)
-DEFINES += -I/usr/include/qt -fPIC
+DEFINES += -fPIC
 endif
 endif

@@ -767,7 +787,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/widgets/menu_input_dialog.o \
 			 menu/widgets/menu_input_bind_dialog.o \
          menu/widgets/menu_entry.o \
-			 menu/widgets/menu_list.o \
 			 menu/widgets/menu_osk.o \
          menu/menu_cbs.o \
          menu/cbs/menu_cbs_ok.o \
@@ -1023,9 +1042,6 @@ ifeq ($(HAVE_PLAIN_DRM), 1)
   LIBS += -ldrm
 endif

-OBJ += \
-		 gfx/drivers_renderchain/null_renderchain.o
-
 ifeq ($(HAVE_GL_CONTEXT), 1)
   DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
   OBJ += gfx/drivers/gl.o \
@@ -1173,7 +1189,7 @@ ifeq ($(HAVE_VULKAN), 1)
   ifeq ($(HAVE_MENU_COMMON), 1)
      OBJ += menu/drivers_display/menu_display_vulkan.o
   endif
-   LIBS += -lstdc++
+   NEED_CXX_LINKER = 1
   DEFINES += -DHAVE_VULKAN
   INCLUDE_DIRS += -Igfx/include

@@ -1249,18 +1265,23 @@ endif

   ifeq ($(HAVE_HLSL), 1)
      OBJ  += gfx/drivers_renderchain/d3d9_hlsl_renderchain.o \
-	      gfx/drivers_shader/shader_hlsl.o
+				  gfx/drivers_shader/shader_hlsl.o
   endif
 endif

 ifeq ($(HAVE_D3D10), 1)
-   OBJ += gfx/drivers/d3d10.o gfx/common/d3d10_common.o
+   OBJ += gfx/drivers/d3d10.o \
+			 gfx/common/d3d10_common.o \
+			 gfx/drivers_font/d3d10_font.o \
+			 menu/drivers_display/menu_display_d3d10.o
   DEFINES += -DHAVE_D3D10
 endif

 ifeq ($(HAVE_D3D11), 1)
-   OBJ += gfx/drivers/d3d11.o gfx/common/d3d11_common.o \
-      gfx/drivers_font/d3d11_font.o menu/drivers_display/menu_display_d3d11.o
+   OBJ += gfx/drivers/d3d11.o \
+			 gfx/common/d3d11_common.o \
+			 gfx/drivers_font/d3d11_font.o \
+			 menu/drivers_display/menu_display_d3d11.o
   DEFINES += -DHAVE_D3D11
   HAVE_SLANG       = 1
   HAVE_GLSLANG     = 1
@@ -1268,8 +1289,10 @@ ifeq ($(HAVE_D3D11), 1)
 endif

 ifeq ($(HAVE_D3D12), 1)
-   OBJ += gfx/drivers/d3d12.o gfx/common/d3d12_common.o \
-      gfx/drivers_font/d3d12_font.o menu/drivers_display/menu_display_d3d12.o
+   OBJ += gfx/drivers/d3d12.o \
+			 gfx/common/d3d12_common.o \
+			 gfx/drivers_font/d3d12_font.o \
+			 menu/drivers_display/menu_display_d3d12.o
   DEFINES += -DHAVE_D3D12
   HAVE_SLANG       = 1
   HAVE_GLSLANG     = 1
@@ -1278,8 +1301,8 @@ endif

 ifneq ($(findstring 1, $(HAVE_D3D10) $(HAVE_D3D11) $(HAVE_D3D12)),)
   INCLUDE_DIRS += -isystemgfx/include/dxsdk
-   OBJ += gfx/common/d3dcompiler_common.o
-   OBJ += gfx/common/dxgi_common.o
+   OBJ += gfx/common/d3dcompiler_common.o \
+			 gfx/common/dxgi_common.o
   CFLAGS += -Wno-unknown-pragmas
 endif

@@ -1301,23 +1324,27 @@ endif

 ifeq ($(HAVE_D3D8), 1)
 	DEFINES += -DHAVE_D3D8
-	OBJ += gfx/drivers/d3d9.o
+	OBJ += gfx/drivers/d3d8.o
+	OBJ += gfx/common/d3d8_common.o
+
+ifeq ($(HAVE_MENU_COMMON), 1)
+	OBJ += menu/drivers_display/menu_display_d3d8.o
+endif
 endif

 ifeq ($(HAVE_D3D9), 1)
 	DEFINES += -DHAVE_D3D9
 	OBJ += gfx/drivers/d3d9.o
+	OBJ += gfx/common/d3d9_common.o
+
+ifeq ($(HAVE_MENU_COMMON), 1)
+	OBJ += menu/drivers_display/menu_display_d3d9.o
+endif
 endif

 ifeq ($(HAVE_D3D_COMMON), 1)
 	DEFINES += -DHAVE_D3D
-	OBJ     += \
-          gfx/common/d3d_common.o \
-          gfx/drivers_context/d3d_ctx.o
-
-   ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/menu_display_d3d.o
-   endif
+	OBJ     += gfx/common/d3d_common.o
 endif

 ifeq ($(HAVE_SLANG),1)
@@ -1416,6 +1443,8 @@ endif

 ifeq ($(HAVE_BUILTINFLAC),1)
   HAVE_FLAC = 1
+	DEFINES += -DHAVE_DR_FLAC -I$(DEPS_DIR)
+	CFLAGS  += -DHAVE_DR_FLAC
   CFLAGS  += -DHAVE_FLAC -I$(DEPS_DIR)/libFLAC/include
   DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
              -DFLAC_PACKAGE_VERSION="\"retroarch\""
@@ -1442,7 +1471,8 @@ ifeq ($(HAVE_BUILTINFLAC),1)
   endif
   OBJ += $(FLACOBJ)
 else ifeq ($(HAVE_FLAC),1)
-   LIBS += $(FLAC_LIBS)
+   DEFINES += -DHAVE_FLAC
+   LIBS    += $(FLAC_LIBS)
 endif

 ifeq ($(HAVE_ZLIB), 1)
@@ -1453,7 +1483,7 @@ ifeq ($(HAVE_ZLIB), 1)
   ifeq ($(HAVE_BUILTINZLIB), 1)
      OBJ += $(DEPS_DIR)/libz/adler32.o \
             $(DEPS_DIR)/libz/compress.o \
-             $(DEPS_DIR)/libz/crc32.o \
+             $(DEPS_DIR)/libz/libz-crc32.o \
             $(DEPS_DIR)/libz/deflate.o \
             $(DEPS_DIR)/libz/gzclose.o \
             $(DEPS_DIR)/libz/gzlib.o \
@@ -1472,19 +1502,27 @@ ifeq ($(HAVE_ZLIB), 1)
   endif
 endif

-ifeq ($(HAVE_FLAC), 1)
-ifeq ($(HAVE_7ZIP), 1)
-ifeq ($(HAVE_ZLIB), 1)
-   DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
+ifeq ($(HAVE_CHD), 1)
   CFLAGS  += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
-   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/bitstream.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/cdrom.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/chd.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/flac.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/huffman.o \
+	DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
+   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \
              $(LIBRETRO_COMM_DIR)/streams/chd_stream.o
-endif
-endif
+	
+   ifeq ($(HAVE_FLAC), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
+				 $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o
+   endif
+
+   ifeq ($(HAVE_7ZIP), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_lzma.o
+   endif
+
+   ifeq ($(HAVE_ZLIB), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zlib.o
+   endif
 endif

 ifeq ($(HAVE_RTGA), 1)
@@ -1586,10 +1624,6 @@ ifeq ($(HAVE_NETWORKING), 1)
         $(LIBRETRO_COMM_DIR)/utils/md5.o
   endif

-   ifeq ($(HAVE_KEYMAPPER), 1)
-      OBJ += input/input_mapper.o
-   endif
-
   ifeq ($(HAVE_NETWORKGAMEPAD), 1)
      OBJ += input/input_remote.o \
             cores/libretro-net-retropad/net_retropad_core.o
@@ -11,6 +11,13 @@ PC_DEVELOPMENT_UDP_PORT    = 3490
 RARCH_CONSOLE        = 0
 USBGECKO       = 0

+SPACE :=
+SPACE := $(SPACE) $(SPACE)
+BACKSLASH :=
+BACKSLASH := \$(BACKSLASH)
+filter_out1 = $(filter-out $(firstword $1),$1)
+filter_out2 = $(call filter_out1,$(call filter_out1,$1))
+
 UNAME_ARCH = $(shell uname -m)

 ifeq ($(UNAME_ARCH),x86_64)
@@ -171,6 +178,7 @@ else ifeq ($(libogc_platform), 1)

   CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int

+   HAVE_RUNAHEAD            := 1
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_THREADS             := 1
   HAVE_RPNG                := 1
@@ -654,6 +662,95 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
      export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include\um;$(WindowsSdkDir)\Include\shared;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
+else ifneq (,$(findstring windows_msvc2015,$(platform)))
+   HAVE_RPNG                := 1
+   HAVE_RJPEG               := 1
+   HAVE_RBMP                := 1
+   HAVE_RTGA                := 1
+   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
+   HAVE_7ZIP                := 1
+   HAVE_NETWORKING          := 1
+   HAVE_NETWORK_CMD         := 1
+   HAVE_OVERLAY             := 1
+   HAVE_MATERIALUI          := 1
+   HAVE_XMB                 := 1
+   HAVE_STB_FONT            := 1
+   HAVE_THREADS             := 1
+   HAVE_LIBRETRODB          := 1
+   HAVE_COMMAND             := 1
+   HAVE_STDIN_CMD           := 1
+   HAVE_CMD                 := 1
+   HAVE_DYLIB               := 1
+   HAVE_DYNAMIC             := 1
+   HAVE_GRIFFIN_CPP         := 1
+   HAVE_DIRECTX             ?= 1
+
+   EXT_TARGET := $(TARGET_NAME).exe
+   EXT_INTER_TARGET := $(TARGET_NAME).exe
+   CC = cl.exe
+   CXX = cl.exe
+   LD = link.exe
+
+   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib
+
+   PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
+
+   ifneq (,$(findstring x64,$(PlatformSuffix)))
+      ifeq ($(HOST_ARCH),x86)
+         # cross-compile for x64 from x86 host
+         PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin/x86_amd64"):$(PATH)
+      else
+         PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin/amd64"):$(PATH)
+      endif
+
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/lib/amd64")
+      WinArch = x64
+      PlatLib = um\x64
+      VCLib = amd64
+   else ifneq (,$(findstring arm,$(PlatformSuffix)))
+      PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin/x86_arm"):$(PATH)
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/lib/arm")
+      HAVE_DIRECTX = 0
+      WinArch = arm
+      PlatLib = um\arm
+      VCLib = arm
+   else
+      PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin"):$(PATH)
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/lib")
+      WinArch = x86
+      PlatLib = um\x86
+      VCLib =
+   endif
+
+   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../IDE")
+   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/include")
+
+   reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
+   fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir := $(WindowsSdkDir)
+
+   WindowsSDKVersion ?= $(firstword $(foreach folder,$(subst $(subst \,/,$(WindowsSdkDir)Include/),,$(wildcard $(call fix_path,$(WindowsSdkDir)Include\*))),$(if $(wildcard $(call fix_path,$(WindowsSdkDir)Include/$(folder)/um/Windows.h)),$(folder),)))$(BACKSLASH)
+   WindowsSDKVersion := $(WindowsSDKVersion)
+
+   export INCLUDE := $(INCLUDE);$(VCINSTALLDIR)INCLUDE;$(VCINSTALLDIR)ATLMFC\INCLUDE;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um
+   export LIB := $(LIB);$(VCINSTALLDIR)LIB$(VCLib);$(VCINSTALLDIR)ATLMFC\LIB$(VCLib);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(WinArch);$(WindowsSdkDir)lib\$(WindowsSDKVersion)$(PlatLib)
+
+   ifeq ($(HAVE_DIRECTX), 1)
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT
+      DXSDK_DIR := $(DXSDK_DIR:\=)
+      export INCLUDE := $(INCLUDE);$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
+      export LIB := $(LIB);$(DXSDK_DIR)\Lib\$(WinArch)
+   else
+      export INCLUDE := $(INCLUDE);libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
+      export LIB := $(LIB)
+   endif
 endif

 ifneq (,$(findstring msvc,$(platform)))
@@ -744,6 +841,10 @@ ifeq ($(HAVE_IMAGEVIEWER), 1)
   CFLAGS      += -DHAVE_IMAGEVIEWER
 endif

+ifeq ($(HAVE_RUNAHEAD), 1)
+   CFLAGS      += -DHAVE_RUNAHEAD
+endif
+
 ifeq ($(HAVE_7ZIP), 1)
   CFLAGS      += -DHAVE_7ZIP
 endif
@@ -53,7 +53,6 @@ HAVE_NETWORK_CMD         := 1
 HAVE_OVERLAY             := 1
 HAVE_LANGEXTRA           := 1
 HAVE_CHEEVOS             := 1
-HAVE_KEYMAPPER           := 1
 HAVE_SHADERPIPELINE      := 1
 HAVE_IMAGEVIEWER         := 1

@@ -4,7 +4,7 @@ include version.all
 #set to GCC for debug builds for use with debugger
 CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
-CELL_PSGL_VERSION	= ultra-opt
+CELL_PSGL_VERSION	= opt

 ASSETS_DIR  := media/assets

@@ -63,7 +63,7 @@ endif

 PPU_SRCS		= griffin/griffin.c

-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD

 ifeq ($(DEX_BUILD), 1)
 DEFINES += -DDEX_BUILD
@@ -96,8 +96,7 @@ ifeq ($(CELL_BUILD_TOOLS), SNC)
 	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
 	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else
-ifneq($(system_platform), win)
+else ifneq ($(system_platform), win)
 	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
 	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
 	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
@@ -120,7 +119,7 @@ DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LA
 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
 else
-   PPU_OPTIMIZE_LV	:= -O3 -g
+   PPU_OPTIMIZE_LV	:= -O2 -g
 endif

 ifeq ($(HAVE_LOGGER), 1)
@@ -2,7 +2,7 @@ include version.all

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
-CELL_BUILD_TOOLS	= SNC
+CELL_BUILD_TOOLS	= GCC
 CELL_GPU_TYPE	   	= RSX
 CELL_PSGL_VERSION	= ultra-opt

@@ -94,8 +94,7 @@ ifeq ($(CELL_BUILD_TOOLS), SNC)
 	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
 	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else
-ifneq($(system_platform), win)
+else ifneq($(system_platform), win)
 	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
 	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
 	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
@@ -1,4 +1,4 @@
-CELL_BUILD_TOOLS	= SNC
+CELL_BUILD_TOOLS	= GCC
 CELL_SDK		?= /usr/local/cell
 HAVE_LOGGER		= 0
 CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
@@ -12,6 +12,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_NEON -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
+	DEFINES += -DHAVE_RUNAHEAD
 else
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
@@ -29,6 +30,7 @@ else
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
 	HAVE_MENU = 1
+	HAVE_RUNAHEAD = 1

 	include Makefile.common
        BLACKLIST :=
@@ -16,7 +16,7 @@ DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
@@ -6,7 +6,8 @@ DEBUG                      = 0
 GRIFFIN_BUILD              = 0
 SALAMANDER_BUILD           = 0
 WHOLE_ARCHIVE_LINK         = 0
-WIIU_HID                   = 0
+WIIU_HID                   = 1
+HAVE_RUNAHEAD              = 1
 WIIU_LOG_RPX               = 0
 BUILD_DIR                  = objs/wiiu
 PC_DEVELOPMENT_IP_ADDRESS  ?=
@@ -32,6 +33,7 @@ OBJ += wiiu/input/wpad_driver.o
 OBJ += wiiu/input/kpad_driver.o
 OBJ += wiiu/input/pad_functions.o
 OBJ += wiiu/system/memory.o
+OBJ += wiiu/system/atomic.o
 OBJ += wiiu/system/exception_handler.o
 OBJ += wiiu/fs/sd_fat_devoptab.o
 OBJ += wiiu/fs/fs_utils.o
@@ -48,15 +50,11 @@ ifeq ($(WIIU_HID),1)
   OBJ += wiiu/input/hidpad_driver.o
   OBJ += wiiu/input/wiiu_hid.o
   OBJ += input/connect/joypad_connection.o \
-          input/connect/connect_ps2adapter.o \
-          input/connect/connect_psxadapter.o \
-          input/connect/connect_ps3.o \
-          input/connect/connect_ps4.o \
-          input/connect/connect_wii.o \
-          input/connect/connect_nesusb.o \
-          input/connect/connect_snesusb.o \
-          input/connect/connect_wiiupro.o \
-          input/connect/connect_wiiugca.o
+          input/common/hid/hid_device_driver.o \
+          input/common/hid/device_wiiu_gca.o \
+          input/common/hid/device_ds3.o \
+          input/common/hid/device_ds4.o \
+          input/common/hid/device_null.o
 endif

 ifeq ($(SALAMANDER_BUILD),1)
@@ -88,6 +86,10 @@ else
   DEFINES += -DHAVE_SLANG
   DEFINES += -DHAVE_SHADERPIPELINE

+ifeq ($(HAVE_RUNAHEAD),1)
+	DEFINES += -DHAVE_RUNAHEAD
+endif
+
   OBJ += wiiu/system/missing_libc_functions.o
   OBJ += wiiu/shader_utils.o
   OBJ += gfx/drivers/gx2_shaders/tex.o
@@ -120,7 +122,6 @@ else
   	HAVE_ZLIB = 1
   	HAVE_7ZIP = 1
   	HAVE_BUILTINZLIB = 1
-   	HAVE_KEYMAPPER = 1
   	HAVE_LIBRETRODB = 1
   	HAVE_ZARCH = 0
   	HAVE_MATERIALUI = 1
@@ -4,7 +4,7 @@
 # RetroArch

 RetroArch is the reference frontend for the libretro API.
-Popular examples of implementations for this API includes videogame system emulators and game engines, but also
+Popular examples of implementations for this API includes video game system emulators and game engines as well as
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".

@@ -18,7 +18,7 @@ These programs are instantiated as dynamic libraries. We refer to these as "libr

 [libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
 A frontend for libretro (such as RetroArch) handles video output, audio output, input and application lifecycle.
-A libretro core written in portable C or C++ can run seamlessly on many platforms with very little/no porting effort.
+A libretro core written in portable C or C++ can run seamlessly on many platforms with very little to no porting effort.

 While RetroArch is the reference frontend for libretro, several other projects have used the libretro
 interface to include support for emulators and/or game engines. libretro is completely open and free for anyone to use.
@@ -49,7 +49,7 @@ More developer-centric stuff is found [here](https://github.com/libretro/libretr

 ## Philosophy

-RetroArch attempts to be small and lean,
+RetroArch attempts to be small and lean
 while still having all the useful core features expected from an emulator.
 It is designed to be very portable and features a gamepad-centric UI.
 It also has a full-featured command-line interface.
@@ -79,7 +79,7 @@ RetroArch has been ported to the following platforms:
   - Original Microsoft Xbox
   - Microsoft Xbox 360 (Libxenon/XeXDK)
   - Nintendo Wii, GameCube (Libogc)
-   - Nintendo WiiU
+   - Nintendo Wii U
   - Nintendo 3DS
   - Nintendo Switch
   - Raspberry Pi
@@ -121,7 +121,7 @@ RetroArch needs at least one of these audio driver libraries:
   - DirectSound (Win32, Xbox 1)
   - CoreAudio (OSX, iOS)

-To run properly, RetroArch requires a libretro implementation present, however, as it's typically loaded
+To run properly, RetroArch requires a libretro implementation present; however, as it's typically loaded
 dynamically, it's not required at build time.

 ## Dependencies (Console ports, mobile)
@@ -131,12 +131,12 @@ anything other than what the respective SDKs provide.

 ## Configuring

-The default configuration is defined in config.def.h.
+The default configuration is defined in `config.def.h`.
 It is not recommended to change this unless you know what you're doing.
 These can later be tweaked by using a config file.
-A sample configuration file is installed to /etc/retroarch.cfg. This is the system-wide config file.
+A sample configuration file is installed to `/etc/retroarch.cfg`. This is the system-wide config file.

-RetroArch will on startup create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg if doesn't exist.
+RetroArch will on startup create a config file in `$XDG\_CONFIG\_HOME/retroarch/retroarch.cfg` if it does not exist.
 Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h.

 To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool.
@@ -144,3 +144,115 @@ To configure joypads, use the built-in menu or the `retroarch-joyconfig` command
 ## Compiling and installing

 Instructions for compiling and installing RetroArch can be found in the [Libretro/RetroArch Documentation Center](https://docs.libretro.com/).
+
+## CRT 15Khz Resolution Switching
+
+CRT Switch res will turn on, on the fly. However, you will need to restart retroarch to disable it. With CRT SwitchRes enable Retroarch will start in 2560 x 480 @ 60.  
+
+If you are running windows, before enabling the CRT SwitchRes options please make sure you have installed CRTEmudriver and installed some modelines. The minimum modelins for all games to switch correctly are:
+
+- 2560 x 192 @ 60.000000
+- 2560 x 200 @ 60.000000
+- 2560 x 240 @ 60.000000
+- 2560 x 224 @ 60.000000
+- 2560 x 237 @ 60.000000
+- 2560 x 256 @ 50.000000
+- 2560 x 254 @ 55.000000
+- 2560 x 448 @ 60.000000
+- 2560 x 480 @ 60.000000
+
+Install these modelines replacing 2560 with your desired super resolution. The above resolutions are NTSC only so if you would be playing any PAL content please add pal modelines:
+
+- 2560 x 192 @ 50.000000
+- 2560 x 200 @ 50.000000
+- 2560 x 240 @ 50.000000
+- 2560 x 224 @ 50.000000
+- 2560 x 288 @ 50.000000
+- 2560 x 237 @ 50.000000
+- 2560 x 254 @ 55.000000
+- 2560 x 448 @ 50.000000
+- 2560 x 480 @ 50.000000
+
+Some games will require higher PAL resolutions which should also be installed:
+
+- 2560 x 512 @ 50.000000
+- 2560 x 576 @ 50.000000
+
+Ideally install all these modelines and everything will work great.
+
+## Super Resolutions
+
+The default super resolution is 2560. It is displayed just under the CRT switch option, which can be found in video settings. This can be changed within the retroarch.cfg. The only compatible resolutions are 1920, 2560 and 3840. Any other resolutions will be ignored and native switching will be activated.
+
+## Native Resolutions
+
+If native resolutions are activated you will need a whole new set of modelines:
+
+- 512 x 240 @ 50.006977 SNESpal
+- 512 x 224 @ 50.006977 SNESpal
+- 512 x 448 @ 50.006977 SNESpal
+- 512 x 240 @ 60.098812 SNESntsc
+- 512 x 224 @ 60.098812 SNESntsc
+- 512 x 448 @ 60.098812 SNESntsc
+- 256 x 240 @ 50.006977 SNESpal
+- 256 x 448 @ 50.006977 SNESpal
+- 256 x 240 @ 60.098812 SNESntsc
+- 256 x 448 @ 60.098812 SNESntsc
+- 320 x 240 @ 59.922745 MDntsc
+- 320 x 448 @ 59.922745 MDntp
+- 320 x 480 @ 59.922745 MDntsc
+- 256 x 192 @ 59.922745 MDntsc
+- 320 x 224 @ 59.922745 MDntsc
+- 256 x 224 @ 59.922745 MDntsc
+- 320 x 288 @ 49.701458 MDpal
+- 320 x 576 @ 49.701458 MDpal
+- 256 x 192 @ 49.701458 MDpal
+- 320 x 224 @ 49.701458 MDpal
+- 320 x 240 @ 49.701458 MDpal
+- 320 x 448 @ 49.701458 MDpal
+- 320 x 480 @ 49.701458 MDpal
+- 256 x 224 @ 49.701458 MDpal
+- 256 x 288 @ 49.701458 MSYSpal
+- 256 x 240 @ 60.098812 NESntsc
+- 256 x 240 @ 50.006977 NESpal
+
+- 640 x 480 @ 60.130001 N64ntsc
+- 640 x 237 @ 60.130001 N64ntsc
+- 640 x 240 @ 60.130001 N64ntsc
+- 640 x 480 @ 50.000000 N64pal
+- 640 x 576 @ 50.000000 n64pal
+- 640 x 288 @ 50.000000 n64pal
+
+- 256 x 252 @ 49.759998 PSXpal
+- 384 x 252 @ 49.759998 PSXpal
+- 640 x 540 @ 49.759998 PSXpal
+- 320 x 252 @ 49.759998 PSXpal
+- 640 x 252 @ 49.759998 PSXpal
+
+- 384 x 240 @ 59.941002 PSXntsc
+- 256 x 480 @ 59.941002 PSXntsc
+
+- 352 x 240 @ 59.820000 Saturn/SGFX_NTSCp
+- 704 x 240 @ 59.820000 SaturnNTSCp
+- 352 x 480 @ 59.820000 SaturnNTSCi
+- 704 x 480 @ 59.820000 SaturnNTSCi
+- 352 x 288 @ 49.701458 SaturnPALp
+- 704 x 288 @ 49.701458 SaturnPALp
+- 352 x 576 @ 49.701458 SaturnPALi
+- 704 x 576 @ 49.701458 SaturnPALi
+
+- 240 x 160 @ 59.730000 GBA
+- 320 x 200 @ 60.000000 Doom
+
+// Arcade
+
+- 400 x 254 @ 54.706841 MK
+- 384 x 224 @ 59.637405 CPS1
+
+These modelines are more accurate giving exact hz. However, some games may have unwanted results. This is due to mid-scanline resolution changes on the original hardware. For the best results super resolutions are the way to go.
+
+## CRT resolution switching & Mame
+
+Some arcade resolutions can be a lot different. There is resolution detection to ensure mame games will be displayed in the closest available resolution but drawn at their native resolution within this resolution. Meaning that the mame game will look just like the original hardware.
+
+Mame roms that run in a vertical aspect like DoDonPachi need to be rotated within mame before resolution switching and aspect correction will work. Do this before enabling CRT switchRes so that Retroarch will run in your desktop resolution. Once you have roted any games that may need it switch CRT SwitchRes on.
@@ -45,7 +45,15 @@

 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)

-#define AUDIO_MIXER_MAX_STREAMS 8
+/**
+ * db_to_gain:
+ * @db          : Decibels.
+ *
+ * Converts decibels to voltage gain.
+ *
+ * Returns: voltage gain value.
+ **/
+#define db_to_gain(db) (powf(10.0f, (db) / 20.0f))

 static const audio_driver_t *audio_drivers[] = {
 #ifdef HAVE_ALSA
@@ -122,18 +130,6 @@ static const audio_driver_t *audio_drivers[] = {
   NULL,
 };

-struct audio_mixer_stream
-{
-   audio_mixer_sound_t *handle;
-   audio_mixer_voice_t *voice;
-   audio_mixer_stop_cb_t stop_cb;
-   enum audio_mixer_state state;
-   float volume;
-   void *buf;
-   size_t bufsize;
-};
-
-static unsigned audio_mixer_current_max_idx              = 0;
 static struct audio_mixer_stream audio_mixer_streams[AUDIO_MIXER_MAX_STREAMS] = {{0}};

 static size_t audio_driver_chunk_size                    = 0;
@@ -146,10 +142,8 @@ static size_t audio_driver_rewind_size                   = 0;
 static int16_t *audio_driver_rewind_buf                  = NULL;
 static int16_t *audio_driver_output_samples_conv_buf     = NULL;

-#ifdef DEBUG
 static unsigned audio_driver_free_samples_buf[AUDIO_BUFFER_FREE_SAMPLES_COUNT];
 static uint64_t audio_driver_free_samples_count          = 0;
-#endif

 static size_t audio_driver_buffer_size                   = 0;
 static size_t audio_driver_data_ptr                      = 0;
@@ -183,6 +177,13 @@ static void *audio_driver_resampler_data                 = NULL;
 static const audio_driver_t *current_audio               = NULL;
 static void *audio_driver_context_audio_data             = NULL;

+static bool audio_suspended                              = false;
+
+static void audio_mixer_play_stop_sequential_cb(
+      audio_mixer_sound_t *sound, unsigned reason);
+static void audio_mixer_play_stop_cb(
+      audio_mixer_sound_t *sound, unsigned reason);
+
 enum resampler_quality audio_driver_get_resampler_quality(void)
 {
   settings_t *settings = config_get_ptr();
@@ -193,18 +194,31 @@ enum resampler_quality audio_driver_get_resampler_quality(void)
   return (enum resampler_quality)settings->uints.audio_resampler_quality;
 }

-#ifdef DEBUG
+audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i)
+{
+   if (i > (AUDIO_MIXER_MAX_STREAMS-1))
+      return NULL;
+   return &audio_mixer_streams[i];
+}
+
+const char *audio_driver_mixer_get_stream_name(unsigned i)
+{
+   if (i > (AUDIO_MIXER_MAX_STREAMS-1))
+      return "N/A";
+   if (!string_is_empty(audio_mixer_streams[i].name))
+      return audio_mixer_streams[i].name;
+   return "N/A";
+}
+
 /**
 * compute_audio_buffer_statistics:
 *
 * Computes audio buffer statistics.
 *
 **/
-static void compute_audio_buffer_statistics(void)
+bool compute_audio_buffer_statistics(audio_statistics_t *stats)
 {
   unsigned i, low_water_size, high_water_size, avg, stddev;
-   float avg_filled              = 0.0f;
-   float deviation               = 0.0f;
   uint64_t accum                = 0;
   uint64_t accum_var            = 0;
   unsigned low_water_count      = 0;
@@ -213,9 +227,21 @@ static void compute_audio_buffer_statistics(void)
         (unsigned)audio_driver_free_samples_count,
         AUDIO_BUFFER_FREE_SAMPLES_COUNT);

-   if (samples < 3)
-      return;
+   if (!stats || samples < 3)
+      return false;

+   stats->samples                = (unsigned)audio_driver_free_samples_count;
+
+#ifdef WARPUP
+   /* uint64 to double not implemented, fair chance 
+    * signed int64 to double doesn't exist either */
+   /* https://forums.libretro.com/t/unsupported-platform-help/13903/ */
+   (void)stddev;
+#elif defined(_MSC_VER) && _MSC_VER <= 1200
+   /* FIXME: error C2520: conversion from unsigned __int64 
+    * to double not implemented, use signed __int64 */
+   (void)stddev;
+#else
   for (i = 1; i < samples; i++)
      accum += audio_driver_free_samples_buf[i];

@@ -223,24 +249,17 @@ static void compute_audio_buffer_statistics(void)

   for (i = 1; i < samples; i++)
   {
-      int diff = avg - audio_driver_free_samples_buf[i];
-      accum_var += diff * diff;
+      int diff     = avg - audio_driver_free_samples_buf[i];
+      accum_var   += diff * diff;
   }

-#ifdef WARPUP
-   /* uint64 to double not implemented, fair chance signed int64 to double doesn't exist either */
-   /* https://forums.libretro.com/t/unsupported-platform-help/13903/ */
-   (void)stddev; (void)avg_filled; (void)deviation;
-#elif defined(_MSC_VER) && _MSC_VER <= 1200
-   /* FIXME: error C2520: conversion from unsigned __int64 to double not implemented, use signed __int64 */
-   (void)stddev; (void)avg_filled; (void)deviation;
-#else
-   stddev          = (unsigned)sqrt((double)accum_var / (samples - 2));
-   avg_filled      = 1.0f - (float)avg / audio_driver_buffer_size;
-   deviation       = (float)stddev / audio_driver_buffer_size;
+   stddev                                = (unsigned)
+      sqrt((double)accum_var / (samples - 2));

-   RARCH_LOG("[Audio]: Average audio buffer saturation: %.2f %%, standard deviation (percentage points): %.2f %%.\n",
-         avg_filled * 100.0, deviation * 100.0);
+   stats->average_buffer_saturation      = (1.0f - (float)avg 
+         / audio_driver_buffer_size) * 100.0;
+   stats->std_deviation_percentage       = ((float)stddev 
+         / audio_driver_buffer_size)  * 100.0;
 #endif

   low_water_size  = (unsigned)(audio_driver_buffer_size * 3 / 4);
@@ -254,11 +273,29 @@ static void compute_audio_buffer_statistics(void)
         high_water_count++;
   }

-   RARCH_LOG("[Audio]: Amount of time spent close to underrun: %.2f %%. Close to blocking: %.2f %%.\n",
-         (100.0 * low_water_count) / (samples - 1),
-         (100.0 * high_water_count) / (samples - 1));
+   stats->close_to_underrun      = (100.0 * low_water_count)  / (samples - 1);
+   stats->close_to_blocking      = (100.0 * high_water_count) / (samples - 1);
+
+   return true;
 }
+
+static void report_audio_buffer_statistics(void)
+{
+   audio_statistics_t audio_stats = {0.0f};
+   if (!compute_audio_buffer_statistics(&audio_stats))
+      return;
+
+#ifdef DEBUG
+   RARCH_LOG("[Audio]: Average audio buffer saturation: %.2f %%,"
+         " standard deviation (percentage points): %.2f %%.\n"
+         "[Audio]: Amount of time spent close to underrun: %.2f %%."
+         " Close to blocking: %.2f %%.\n",
+         audio_stats.average_buffer_saturation,
+         audio_stats.std_deviation_percentage,
+         audio_stats.close_to_underrun,
+         audio_stats.close_to_blocking);
 #endif
+}

 /**
 * audio_driver_find_handle:
@@ -343,13 +380,17 @@ static bool audio_driver_deinit_internal(void)

   command_event(CMD_EVENT_DSP_FILTER_DEINIT, NULL);

-#ifdef DEBUG
-   compute_audio_buffer_statistics();
-#endif
+   report_audio_buffer_statistics();

   return true;
 }

+static void audio_driver_mixer_init(unsigned out_rate)
+{
+   audio_mixer_init(out_rate);
+}
+
+
 static bool audio_driver_init_internal(bool audio_cb_inited)
 {
   unsigned new_rate     = 0;
@@ -506,7 +547,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
      {
         audio_driver_buffer_size =
            current_audio->buffer_size(audio_driver_context_audio_data);
-         audio_driver_control = true;
+         audio_driver_control     = true;
      }
      else
         RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n");
@@ -514,11 +555,9 @@ static bool audio_driver_init_internal(bool audio_cb_inited)

   command_event(CMD_EVENT_DSP_FILTER_INIT, NULL);

-#ifdef DEBUG
   audio_driver_free_samples_count = 0;
-#endif

-   audio_mixer_init(settings->uints.audio_out_rate);
+   audio_driver_mixer_init(settings->uints.audio_out_rate);

   /* Threaded driver is initially stopped. */
   if (
@@ -560,20 +599,17 @@ void audio_driver_set_nonblocking_state(bool enable)
 static void audio_driver_flush(const int16_t *data, size_t samples)
 {
   struct resampler_data src_data;
-   bool is_perfcnt_enable                               = false;
-   bool is_paused                                       = false;
-   bool is_idle                                         = false;
-   bool is_slowmotion                                   = false;
-   const void *output_data                              = NULL;
-   unsigned output_frames                               = 0;
-   float audio_volume_gain                              = !audio_driver_mute_enable ?
+   bool is_perfcnt_enable            = false;
+   bool is_paused                    = false;
+   bool is_idle                      = false;
+   bool is_slowmotion                = false;
+   const void *output_data           = NULL;
+   unsigned output_frames            = 0;
+   float audio_volume_gain           = !audio_driver_mute_enable ?
      audio_driver_volume_gain : 0.0f;

-   src_data.data_in                                     = NULL;
-   src_data.data_out                                    = NULL;
-   src_data.input_frames                                = 0;
-   src_data.output_frames                               = 0;
-   src_data.ratio                                       = 0.0f;
+   src_data.data_out                 = NULL;
+   src_data.output_frames            = 0;

   if (recording_data)
      recording_push_audio(data, samples);
@@ -581,8 +617,8 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
   runloop_get_status(&is_paused, &is_idle, &is_slowmotion,
         &is_perfcnt_enable);

-   if (            is_paused                || 
-		   !audio_driver_active     || 
+   if (            is_paused                ||
+		   !audio_driver_active     ||
 		   !audio_driver_input_data ||
 		   !audio_driver_output_samples_buf)
      return;
@@ -590,8 +626,8 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
   convert_s16_to_float(audio_driver_input_data, data, samples,
         audio_volume_gain);

-   src_data.data_in               = audio_driver_input_data;
-   src_data.input_frames          = samples >> 1;
+   src_data.data_in                  = audio_driver_input_data;
+   src_data.input_frames             = samples >> 1;


   if (audio_driver_dsp)
@@ -626,13 +662,11 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
      int      delta_mid   = avail - half_size;
      double   direction   = (double)delta_mid / half_size;
      double   adjust      = 1.0 + audio_driver_rate_control_delta * direction;
-#ifdef DEBUG
      unsigned write_idx   = audio_driver_free_samples_count++ &
         (AUDIO_BUFFER_FREE_SAMPLES_COUNT - 1);

      audio_driver_free_samples_buf
         [write_idx]               = avail;
-#endif
      audio_source_ratio_current   =
         audio_source_ratio_original * adjust;

@@ -648,7 +682,7 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
 #endif
   }

-   src_data.ratio     = audio_source_ratio_current;
+   src_data.ratio           = audio_source_ratio_current;

   if (is_slowmotion)
   {
@@ -661,7 +695,7 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
   if (audio_mixer_active)
   {
      bool override     = audio_driver_mixer_mute_enable ? true :
-         (audio_driver_mixer_volume_gain != 0.0f) ? true : false;
+         (audio_driver_mixer_volume_gain != 1.0f) ? true : false;
      float mixer_gain  = !audio_driver_mixer_mute_enable ?
         audio_driver_mixer_volume_gain : 0.0f;
      audio_mixer_mix(audio_driver_output_samples_buf,
@@ -696,6 +730,9 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
 **/
 void audio_driver_sample(int16_t left, int16_t right)
 {
+   if (audio_suspended)
+      return;
+
   audio_driver_output_samples_conv_buf[audio_driver_data_ptr++] = left;
   audio_driver_output_samples_conv_buf[audio_driver_data_ptr++] = right;

@@ -708,6 +745,22 @@ void audio_driver_sample(int16_t left, int16_t right)
   audio_driver_data_ptr = 0;
 }

+void audio_driver_menu_sample(void)
+{
+   static int16_t samples_buf[1024]       = {0};
+   struct retro_system_av_info   
+      *av_info                            = video_viewport_get_system_av_info();
+   const struct retro_system_timing *info = 
+      (const struct retro_system_timing*)&av_info->timing;
+   unsigned sample_count                  = (info->sample_rate / info->fps) * 2;
+   while (sample_count > 1024)
+   {
+      audio_driver_flush(samples_buf, 1024);
+      sample_count -= 1024;
+   }
+   audio_driver_flush(samples_buf, sample_count);
+}
+
 /**
 * audio_driver_sample_batch:
 * @data                 : pointer to audio buffer.
@@ -723,6 +776,9 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
   if (frames > (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1))
      frames = AUDIO_CHUNK_SIZE_NONBLOCKING >> 1;

+   if (audio_suspended)
+      return frames;
+
   audio_driver_flush(data, frames << 1);

   return frames;
@@ -820,13 +876,13 @@ void audio_driver_monitor_adjust_system_rates(void)
 {
   float timing_skew;
   settings_t                   *settings = config_get_ptr();
-   struct retro_system_av_info   *av_info = video_viewport_get_system_av_info();
   float video_refresh_rate               = settings->floats.video_refresh_rate;
   float max_timing_skew                  = settings->floats.audio_max_timing_skew;
-   const struct retro_system_timing *info = av_info ?
-      (const struct retro_system_timing*)&av_info->timing : NULL;
+   struct retro_system_av_info   *av_info = video_viewport_get_system_av_info();
+   const struct retro_system_timing *info = 
+      (const struct retro_system_timing*)&av_info->timing;

-   if (!info || info->sample_rate <= 0.0)
+   if (info->sample_rate <= 0.0)
      return;

   timing_skew             = fabs(1.0f - info->fps / video_refresh_rate);
@@ -956,6 +1012,12 @@ bool audio_driver_mixer_extension_supported(const char *ext)
   string_list_append(str_list, "mod", attr);
   string_list_append(str_list, "s3m", attr);
   string_list_append(str_list, "xm", attr);
+#endif
+#ifdef HAVE_DR_FLAC
+   string_list_append(str_list, "flac", attr);
+#endif
+#ifdef HAVE_DR_MP3
+   string_list_append(str_list, "mp3", attr);
 #endif
   string_list_append(str_list, "wav", attr);

@@ -1001,18 +1063,16 @@ static void audio_mixer_play_stop_cb(
         {
            unsigned i = (unsigned)idx;

-#if 0
-            if (audio_mixer_streams[i].buf != NULL)
-               free(audio_mixer_streams[i].buf);
-#endif
+            if (!string_is_empty(audio_mixer_streams[i].name))
+               free(audio_mixer_streams[i].name);

+            audio_mixer_streams[i].name    = NULL;
            audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_NONE;
            audio_mixer_streams[i].volume  = 0.0f;
            audio_mixer_streams[i].buf     = NULL;
            audio_mixer_streams[i].stop_cb = NULL;
            audio_mixer_streams[i].handle  = NULL;
            audio_mixer_streams[i].voice   = NULL;
-            audio_mixer_current_max_idx--;
         }
         break;
      case AUDIO_MIXER_SOUND_STOPPED:
@@ -1022,15 +1082,75 @@ static void audio_mixer_play_stop_cb(
   }
 }

+static void audio_mixer_play_stop_sequential_cb(
+      audio_mixer_sound_t *sound, unsigned reason)
+{
+   int idx = audio_mixer_find_index(sound);
+
+   switch (reason)
+   {
+      case AUDIO_MIXER_SOUND_FINISHED:
+         audio_mixer_destroy(sound);
+
+         if (idx >= 0)
+         {
+            unsigned i = (unsigned)idx;
+
+            if (!string_is_empty(audio_mixer_streams[i].name))
+               free(audio_mixer_streams[i].name);
+
+            audio_mixer_streams[i].name    = NULL;
+            audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_NONE;
+            audio_mixer_streams[i].volume  = 0.0f;
+            audio_mixer_streams[i].buf     = NULL;
+            audio_mixer_streams[i].stop_cb = NULL;
+            audio_mixer_streams[i].handle  = NULL;
+            audio_mixer_streams[i].voice   = NULL;
+
+            i++;
+
+            for (; i < AUDIO_MIXER_MAX_STREAMS; i++)
+            {
+               if (audio_mixer_streams[i].state == AUDIO_STREAM_STATE_STOPPED)
+               {
+                  audio_driver_mixer_play_stream_sequential(i);
+                  break;
+               }
+            }
+         }
+         break;
+      case AUDIO_MIXER_SOUND_STOPPED:
+         break;
+      case AUDIO_MIXER_SOUND_REPEATED:
+         break;
+   }
+}
+
+bool audio_driver_mixer_get_free_stream_slot(unsigned *id)
+{
+   unsigned i;
+   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
+   {
+      if (audio_mixer_streams[i].state == AUDIO_STREAM_STATE_NONE)
+      {
+         *id = i;
+         return true;
+      }
+   }
+
+   return false;
+}
+
 bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
 {
+   unsigned free_slot            = 0;
   audio_mixer_voice_t *voice    = NULL;
   audio_mixer_sound_t *handle   = NULL;
   audio_mixer_stop_cb_t stop_cb = audio_mixer_play_stop_cb;
   bool looped                   = false;
   void *buf                     = NULL;
-
-   if (audio_mixer_current_max_idx >= AUDIO_MIXER_MAX_STREAMS)
+   
+   if (!audio_driver_mixer_get_free_stream_slot(&free_slot))
      return false;

   if (params->state == AUDIO_STREAM_STATE_NONE)
@@ -1054,9 +1174,18 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
      case AUDIO_MIXER_TYPE_MOD:
         handle = audio_mixer_load_mod(buf, (int32_t)params->bufsize);
         break;
+      case AUDIO_MIXER_TYPE_FLAC:
+#ifdef HAVE_DR_FLAC
+         handle = audio_mixer_load_flac(buf, (int32_t)params->bufsize);
+#endif
+         break;
+      case AUDIO_MIXER_TYPE_MP3:
+#ifdef HAVE_DR_MP3
+         handle = audio_mixer_load_mp3(buf, (int32_t)params->bufsize);
+#endif
+         break;
      case AUDIO_MIXER_TYPE_NONE:
-         free(buf);
-         return false;
+         break;
   }

   if (!handle)
@@ -1065,74 +1194,193 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
      return false;
   }

-   if (params->state == AUDIO_STREAM_STATE_PLAYING)
+   switch (params->state)
   {
-      voice = audio_mixer_play(handle, looped, params->volume, stop_cb);
-      audio_set_bool(AUDIO_ACTION_MIXER, true);
-   }
-   else if (params->state == AUDIO_STREAM_STATE_PLAYING_LOOPED)
-   {
-      looped = true;
-      voice  = audio_mixer_play(handle, looped, params->volume, stop_cb);
-      audio_set_bool(AUDIO_ACTION_MIXER, true);
+      case AUDIO_STREAM_STATE_PLAYING_LOOPED:
+         looped = true;
+         voice = audio_mixer_play(handle, looped, params->volume, stop_cb);
+         break;
+      case AUDIO_STREAM_STATE_PLAYING:
+         voice = audio_mixer_play(handle, looped, params->volume, stop_cb);
+         break;
+      case AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL:
+         stop_cb = audio_mixer_play_stop_sequential_cb;
+         voice = audio_mixer_play(handle, looped, params->volume, stop_cb);
+         break;
+      default:
+         break;
   }

-   audio_mixer_streams[audio_mixer_current_max_idx].buf     = buf;
-   audio_mixer_streams[audio_mixer_current_max_idx].handle  = handle;
-   audio_mixer_streams[audio_mixer_current_max_idx].voice   = voice;
-   audio_mixer_streams[audio_mixer_current_max_idx].state   = params->state;
-   audio_mixer_streams[audio_mixer_current_max_idx].volume  = params->volume;
-   audio_mixer_streams[audio_mixer_current_max_idx].stop_cb = stop_cb;
+   audio_mixer_active                     = true;

-   audio_mixer_current_max_idx++;
+   audio_mixer_streams[free_slot].name    = !string_is_empty(params->basename) ? strdup(params->basename) : NULL; 
+   audio_mixer_streams[free_slot].buf     = buf;
+   audio_mixer_streams[free_slot].handle  = handle;
+   audio_mixer_streams[free_slot].voice   = voice;
+   audio_mixer_streams[free_slot].state   = params->state;
+   audio_mixer_streams[free_slot].volume  = params->volume;
+   audio_mixer_streams[free_slot].stop_cb = stop_cb;

   return true;
 }

-static void audio_driver_mixer_remove_stream(unsigned i)
+enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i)
 {
-   audio_mixer_sound_t *handle = audio_mixer_streams[i].handle;
-   audio_mixer_voice_t *voice  = audio_mixer_streams[i].voice;
+   if (i >= AUDIO_MIXER_MAX_STREAMS)
+      return AUDIO_STREAM_STATE_NONE;
+
+   return audio_mixer_streams[i].state;
+}
+
+static void audio_driver_mixer_play_stream_internal(unsigned i, unsigned type)
+{
+   bool set_state              = false;
+
+   if (i >= AUDIO_MIXER_MAX_STREAMS)
+      return;
+
+   switch (audio_mixer_streams[i].state)
+   {
+      case AUDIO_STREAM_STATE_STOPPED:
+         audio_mixer_streams[i].voice = audio_mixer_play(audio_mixer_streams[i].handle,
+               (type == AUDIO_STREAM_STATE_PLAYING_LOOPED) ? true : false,
+               1.0f, audio_mixer_streams[i].stop_cb);
+         set_state = true;
+         break;
+      case AUDIO_STREAM_STATE_PLAYING:
+      case AUDIO_STREAM_STATE_PLAYING_LOOPED:
+      case AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL:
+      case AUDIO_STREAM_STATE_NONE:
+         break;
+   }
+
+   if (set_state)
+      audio_mixer_streams[i].state   = (enum audio_mixer_state)type;
+}
+
+void audio_driver_mixer_play_stream(unsigned i)
+{
+   audio_mixer_streams[i].stop_cb = audio_mixer_play_stop_cb;
+   audio_driver_mixer_play_stream_internal(i, AUDIO_STREAM_STATE_PLAYING);
+}
+
+void audio_driver_mixer_play_stream_looped(unsigned i)
+{
+   audio_mixer_streams[i].stop_cb = audio_mixer_play_stop_cb;
+   audio_driver_mixer_play_stream_internal(i, AUDIO_STREAM_STATE_PLAYING_LOOPED);
+}
+
+void audio_driver_mixer_play_stream_sequential(unsigned i)
+{
+   audio_mixer_streams[i].stop_cb = audio_mixer_play_stop_sequential_cb;
+   audio_driver_mixer_play_stream_internal(i, AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL);
+}
+
+float audio_driver_mixer_get_stream_volume(unsigned i)
+{
+   if (i >= AUDIO_MIXER_MAX_STREAMS)
+      return 0.0f;
+
+   return audio_mixer_streams[i].volume;
+}
+
+void audio_driver_mixer_set_stream_volume(unsigned i, float vol)
+{
+   audio_mixer_voice_t *voice     = NULL;
+
+   if (i >= AUDIO_MIXER_MAX_STREAMS)
+      return;
+
+   audio_mixer_streams[i].volume  = vol;
+
+   voice                          = audio_mixer_streams[i].voice;
+
+   if (voice)
+      audio_mixer_voice_set_volume(voice, db_to_gain(vol));
+}
+
+void audio_driver_mixer_stop_stream(unsigned i)
+{
+   bool set_state              = false;
+
+   if (i >= AUDIO_MIXER_MAX_STREAMS)
+      return;

   switch (audio_mixer_streams[i].state)
   {
      case AUDIO_STREAM_STATE_PLAYING:
-         if (voice)
-            audio_mixer_stop(voice);
-         if (handle)
-            audio_mixer_destroy(handle);
-         break;
      case AUDIO_STREAM_STATE_PLAYING_LOOPED:
-         if (voice)
-            audio_mixer_stop(voice);
-         if (handle)
-            audio_mixer_destroy(handle);
+      case AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL:
+         set_state = true;
         break;
      case AUDIO_STREAM_STATE_STOPPED:
-         if (handle)
-            audio_mixer_destroy(handle);
+      case AUDIO_STREAM_STATE_NONE:
+         break;
+   }
+
+   if (set_state)
+   {
+      audio_mixer_voice_t *voice     = audio_mixer_streams[i].voice;
+
+      if (voice)
+         audio_mixer_stop(voice);
+      audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_STOPPED;
+      audio_mixer_streams[i].volume  = 1.0f;
+   }
+}
+
+void audio_driver_mixer_remove_stream(unsigned i)
+{
+   bool destroy                = false;
+
+   if (i >= AUDIO_MIXER_MAX_STREAMS)
+      return;
+
+   switch (audio_mixer_streams[i].state)
+   {
+      case AUDIO_STREAM_STATE_PLAYING:
+      case AUDIO_STREAM_STATE_PLAYING_LOOPED:
+      case AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL:
+         audio_driver_mixer_stop_stream(i);
+         destroy = true;
+         break;
+      case AUDIO_STREAM_STATE_STOPPED:
+         destroy = true;
         break;
      case AUDIO_STREAM_STATE_NONE:
         break;
   }

-   audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_NONE;
-   audio_mixer_streams[i].volume  = 0.0f;
-   audio_mixer_streams[i].stop_cb = NULL;
-   audio_mixer_streams[i].handle  = NULL;
-   audio_mixer_streams[i].voice   = NULL;
+   if (destroy)
+   {
+      audio_mixer_sound_t *handle = audio_mixer_streams[i].handle;
+      if (handle)
+         audio_mixer_destroy(handle);
+
+      if (!string_is_empty(audio_mixer_streams[i].name))
+         free(audio_mixer_streams[i].name);
+
+      audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_NONE;
+      audio_mixer_streams[i].stop_cb = NULL;
+      audio_mixer_streams[i].volume  = 0.0f;
+      audio_mixer_streams[i].handle  = NULL;
+      audio_mixer_streams[i].voice   = NULL;
+      audio_mixer_streams[i].name    = NULL;
+   }
 }

 static void audio_driver_mixer_deinit(void)
 {
   unsigned i;

-   audio_set_bool(AUDIO_ACTION_MIXER, false);
+   audio_mixer_active = false;

   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
+   {
+      audio_driver_mixer_stop_stream(i);
      audio_driver_mixer_remove_stream(i);
+   }

-   audio_mixer_current_max_idx = 0;
   audio_mixer_done();
 }

@@ -1286,11 +1534,31 @@ bool audio_driver_owns_driver(void)
   return audio_driver_data_own;
 }

+void audio_driver_suspend(void)
+{
+   audio_suspended = true;
+}
+
+bool audio_driver_is_suspended(void)
+{
+   return audio_suspended;
+}
+
+void audio_driver_resume(void)
+{
+   audio_suspended = false;
+}
+
 void audio_driver_set_active(void)
 {
   audio_driver_active = true;
 }

+bool audio_driver_is_active(void)
+{
+   return audio_driver_active;
+}
+
 void audio_driver_destroy(void)
 {
   audio_driver_active   = false;
@@ -1311,15 +1579,6 @@ void audio_set_bool(enum audio_action action, bool val)
   }
 }

-/**
- * db_to_gain:
- * @db          : Decibels.
- *
- * Converts decibels to voltage gain.
- *
- * Returns: voltage gain value.
- **/
-#define db_to_gain(db) (powf(10.0f, (db) / 20.0f))

 void audio_set_float(enum audio_action action, float val)
 {
@@ -35,6 +35,8 @@ RETRO_BEGIN_DECLS

 #define AUDIO_MAX_RATIO                16

+#define AUDIO_MIXER_MAX_STREAMS        16
+
 enum audio_action
 {
   AUDIO_ACTION_NONE = 0,
@@ -46,6 +48,36 @@ enum audio_action
   AUDIO_ACTION_MIXER
 };

+enum audio_mixer_state
+{
+   AUDIO_STREAM_STATE_NONE = 0,
+   AUDIO_STREAM_STATE_STOPPED,
+   AUDIO_STREAM_STATE_PLAYING,
+   AUDIO_STREAM_STATE_PLAYING_LOOPED,
+   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
+};
+
+typedef struct audio_mixer_stream
+{
+   audio_mixer_sound_t *handle;
+   audio_mixer_voice_t *voice;
+   audio_mixer_stop_cb_t stop_cb;
+   enum audio_mixer_state state;
+   float volume;
+   void *buf;
+   char *name;
+   size_t bufsize;
+} audio_mixer_stream_t;
+
+typedef struct audio_statistics
+{
+   float average_buffer_saturation;
+   float std_deviation_percentage;
+   float close_to_underrun;
+   float close_to_blocking;
+   unsigned samples;
+} audio_statistics_t;
+
 typedef struct audio_driver
 {
   /* Creates and initializes handle to audio driver.
@@ -128,20 +160,13 @@ typedef struct audio_driver
   size_t (*buffer_size)(void *data);
 } audio_driver_t;

-enum audio_mixer_state
-{
-   AUDIO_STREAM_STATE_NONE = 0,
-   AUDIO_STREAM_STATE_STOPPED,
-   AUDIO_STREAM_STATE_PLAYING,
-   AUDIO_STREAM_STATE_PLAYING_LOOPED
-};
-
 typedef struct audio_mixer_stream_params
 {
   float volume;
   enum audio_mixer_type  type;
   enum audio_mixer_state state;
   void *buf;
+   char *basename;
   size_t bufsize;
   audio_mixer_stop_cb_t cb;
 } audio_mixer_stream_params_t;
@@ -152,8 +177,16 @@ void audio_driver_set_own_driver(void);

 void audio_driver_unset_own_driver(void);

+void audio_driver_suspend(void);
+
+bool audio_driver_is_suspended(void);
+
+void audio_driver_resume(void);
+
 void audio_driver_set_active(void);

+bool audio_driver_is_active(void);
+
 void audio_driver_destroy(void);

 void audio_driver_deinit_resampler(void);
@@ -254,10 +287,34 @@ bool audio_driver_deinit(void);

 bool audio_driver_init(void);

+void audio_driver_menu_sample(void);
+
+audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i);
+
 bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);

+void audio_driver_mixer_play_stream(unsigned i);
+
+void audio_driver_mixer_play_stream_sequential(unsigned i);
+
+void audio_driver_mixer_play_stream_looped(unsigned i);
+
+void audio_driver_mixer_stop_stream(unsigned i);
+
+float audio_driver_mixer_get_stream_volume(unsigned i);
+
+void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
+
+void audio_driver_mixer_remove_stream(unsigned i);
+
 enum resampler_quality audio_driver_get_resampler_quality(void);

+enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);
+
+const char *audio_driver_mixer_get_stream_name(unsigned i);
+
+bool compute_audio_buffer_statistics(audio_statistics_t *stats);
+
 extern audio_driver_t audio_rsound;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
@@ -83,12 +83,13 @@ static void *gx_audio_init(const char *device,
   AIInit(NULL);
   AIRegisterDMACallback(dma_callback);

-   if (rate < 33000)
+   //ranges 0-32000 (default low) and 40000-47999 (in settings going down from 48000) -> set to 32000 hz
+   if (rate <= 32000 || (rate >= 40000 && rate < 48000))
   {
      AISetDSPSampleRate(AI_SAMPLERATE_32KHZ);
      *new_rate = 32000;
   }
-   else
+   else //ranges 32001-39999 (in settings going up from 32000) and 48000-max (default high) -> set to 48000 hz
   {
      AISetDSPSampleRate(AI_SAMPLERATE_48KHZ);
      *new_rate = 48000;
@@ -133,6 +133,9 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency,
   sl->buf_count    = (latency * 4 * rate + 500) / 1000;
   sl->buf_count    = (sl->buf_count + sl->buf_size / 2) / sl->buf_size;

+   if (sl->buf_count < 2)
+      sl->buf_count = 2;
+
   sl->buffer       = (uint8_t**)calloc(sizeof(uint8_t*), sl->buf_count);
   if (!sl->buffer)
      goto error;
@@ -18,6 +18,7 @@
 #include <stdint.h>

 #include<libtransistor/nx.h>
+#include<libtransistor/alloc_pages.h>

 #include "../audio_driver.h"
 #include "../../verbosity.h"
@@ -27,12 +28,6 @@ static const int max_num_samples       = sample_rate;
 static const int num_channels          = 2;
 static const size_t sample_buffer_size = ((max_num_samples * num_channels * sizeof(uint16_t)) + 0xfff) & ~0xfff;

-/* don't think this can be in mapped memory, since samples get DMA'd out of it */
-static uint16_t __attribute__((aligned(0x1000))) sample_buffer_1[sample_buffer_size/sizeof(uint16_t)];
-static uint16_t __attribute__((aligned(0x1000))) sample_buffer_2[sample_buffer_size/sizeof(uint16_t)];
-static uint16_t __attribute__((aligned(0x1000))) sample_buffer_3[sample_buffer_size/sizeof(uint16_t)];
-static uint16_t *sample_buffers[3] = {sample_buffer_1, sample_buffer_2, sample_buffer_3};
-
 typedef struct
 {
   audio_output_t output;
@@ -254,11 +249,14 @@ static void *switch_audio_init(const char *device,
   for(i = 0; i < 3; i++)
   {
      swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
-      swa->buffers[i].sample_data = sample_buffers[i];
+      swa->buffers[i].sample_data = alloc_pages(sample_buffer_size, sample_buffer_size, NULL);
      swa->buffers[i].buffer_size = sample_buffer_size;
      swa->buffers[i].data_size   = sample_buffer_size;
      swa->buffers[i].unknown     = 0;

+      if(swa->buffers[i].sample_data == NULL)
+	      goto fail_audio_output;
+      
      if (audio_ipc_output_append_buffer(&swa->output, &swa->buffers[i]) != RESULT_OK)
         goto fail_audio_output;
   }
@@ -38,6 +38,20 @@ End of setup

 #define CHEEVOS_TAG "[CHEEVOS]: "

+#ifdef CHEEVOS_VERBOSE
+
+#define CHEEVOS_LOG RARCH_LOG
+#define CHEEVOS_ERR RARCH_ERR
+
+#else
+
+void cheevos_log(const char *fmt, ...);
+
+#define CHEEVOS_LOG cheevos_log
+#define CHEEVOS_ERR cheevos_log
+
+#endif
+
 typedef struct cheevos_ctx_desc
 {
   unsigned idx;
@@ -64,7 +78,7 @@ typedef enum
   CHEEVOS_CONSOLE_PLAYSTATION     = 12,
   CHEEVOS_CONSOLE_ATARI_LYNX      = 13,
   CHEEVOS_CONSOLE_NEOGEO_POCKET   = 14,
-   CHEEVOS_CONSOLE_XBOX_360        = 15,
+   CHEEVOS_CONSOLE_GAME_GEAR       = 15,
   CHEEVOS_CONSOLE_GAMECUBE        = 16,
   CHEEVOS_CONSOLE_ATARI_JAGUAR    = 17,
   CHEEVOS_CONSOLE_NINTENDO_DS     = 18,
@@ -65,7 +65,7 @@ static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr)
   }
   else
   {
-      RARCH_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
+      CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
      op = CHEEVOS_COND_OP_EQUALS;
   }

@@ -168,9 +168,6 @@ void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsign
         if (index == which)
         {
            cheevos_cond_parse(cond, &memaddr);
-#ifdef CHEEVOS_VERBOSE
-            /*cheevos_log_cond(cond);*/
-#endif
            cond++;
         }
         else
@@ -24,17 +24,6 @@
 #include "../core.h"
 #include "../verbosity.h"

-static void STUB_LOG(const char *fmt, ...)
-{
-   (void)fmt;
-}
-
-#ifdef CHEEVOS_VERBOSE
-#define CHEEVOS_LOG RARCH_LOG
-#else
-#define CHEEVOS_LOG STUB_LOG
-#endif
-
 /*****************************************************************************
 Parsing
 *****************************************************************************/
@@ -191,12 +180,6 @@ void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console)
         var->value -= 0x2000;
      }
   }
-   else if (console == CHEEVOS_CONSOLE_NEOGEO_POCKET)
-   {
-      if (var->value >= 0x4000 && var->value <= 0x7fff)
-      CHEEVOS_LOG(CHEEVOS_TAG "NGP memory address %X adjusted to %X\n", var->value, var->value - 0x004000);
-      var->value -= 0x4000;
-   }

   if (system->mmaps.num_descriptors != 0)
   {
@@ -333,7 +316,7 @@ uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
               meminfo.id = RETRO_MEMORY_RTC;
               break;
            default:
-               RARCH_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id);
+               CHEEVOS_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id);
               break;
         }

@@ -140,6 +140,8 @@ static const struct cmd_action_map action_map[] = {
 static const struct cmd_map map[] = {
   { "FAST_FORWARD",           RARCH_FAST_FORWARD_KEY },
   { "FAST_FORWARD_HOLD",      RARCH_FAST_FORWARD_HOLD_KEY },
+   { "SLOWMOTION",             RARCH_SLOWMOTION_KEY },
+   { "SLOWMOTION_HOLD",        RARCH_SLOWMOTION_HOLD_KEY },
   { "LOAD_STATE",             RARCH_LOAD_STATE_KEY },
   { "SAVE_STATE",             RARCH_SAVE_STATE_KEY },
   { "FULLSCREEN_TOGGLE",      RARCH_FULLSCREEN_TOGGLE_KEY },
@@ -160,7 +162,6 @@ static const struct cmd_map map[] = {
   { "MUTE",                   RARCH_MUTE },
   { "OSK",                    RARCH_OSK },
   { "NETPLAY_GAME_WATCH",     RARCH_NETPLAY_GAME_WATCH },
-   { "SLOWMOTION",             RARCH_SLOWMOTION },
   { "VOLUME_UP",              RARCH_VOLUME_UP },
   { "VOLUME_DOWN",            RARCH_VOLUME_DOWN },
   { "OVERLAY_NEXT",           RARCH_OVERLAY_NEXT },
@@ -168,6 +169,7 @@ static const struct cmd_map map[] = {
   { "DISK_NEXT",              RARCH_DISK_NEXT },
   { "DISK_PREV",              RARCH_DISK_PREV },
   { "GRAB_MOUSE_TOGGLE",      RARCH_GRAB_MOUSE_TOGGLE },
+   { "UI_COMPANION_TOGGLE",    RARCH_UI_COMPANION_TOGGLE },
   { "GAME_FOCUS_TOGGLE",      RARCH_GAME_FOCUS_TOGGLE },
   { "MENU_TOGGLE",            RARCH_MENU_TOGGLE },
   { "MENU_UP",                RETRO_DEVICE_ID_JOYPAD_UP },
@@ -219,26 +221,13 @@ static bool command_reply(const char * data, size_t len)
 bool command_set_shader(const char *arg)
 {
   char msg[256];
-   enum rarch_shader_type type = RARCH_SHADER_NONE;
-   struct video_shader      *shader  = menu_shader_get();
+   bool is_preset                  = false;
+   struct video_shader    *shader  = menu_shader_get();
+   enum rarch_shader_type     type = video_shader_get_type_from_ext(
+         path_get_extension(arg), &is_preset);

-   switch (msg_hash_to_file_type(msg_hash_calculate(path_get_extension(arg))))
-   {
-      case FILE_TYPE_SHADER_GLSL:
-      case FILE_TYPE_SHADER_PRESET_GLSLP:
-         type = RARCH_SHADER_GLSL;
-         break;
-      case FILE_TYPE_SHADER_CG:
-      case FILE_TYPE_SHADER_PRESET_CGP:
-         type = RARCH_SHADER_CG;
-         break;
-      case FILE_TYPE_SHADER_SLANG:
-      case FILE_TYPE_SHADER_PRESET_SLANGP:
-         type = RARCH_SHADER_SLANG;
-         break;
-      default:
-         return false;
-   }
+   if (type == RARCH_SHADER_NONE)
+      return false;

   snprintf(msg, sizeof(msg), "Shader: \"%s\"", arg);
   runloop_msg_queue_push(msg, 1, 120, true);
@@ -255,8 +244,7 @@ static bool command_read_ram(const char *arg)
 {
   cheevos_var_t var;
   unsigned i;
-   unsigned nbytes;
-   char reply[256];
+   char reply[256]      = {0};
   const uint8_t * data = NULL;
   char *reply_at       = NULL;

@@ -290,7 +278,6 @@ static bool command_read_ram(const char *arg)

 static bool command_write_ram(const char *arg)
 {
-   int i;
   cheevos_var_t var;
   unsigned nbytes   = 0;
   uint8_t *data     = NULL;
@@ -1029,7 +1016,7 @@ static void command_event_init_controllers(void)
            /* Ideally these checks shouldn't be required but if we always
             * call core_set_controller_port_device input won't work on
             * cores that don't set port information properly */
-            if (info && info->ports.size != 0 && i < info->ports.size)
+            if (info && info->ports.size != 0)
               set_controller = true;
            break;
         default:
@@ -1043,7 +1030,7 @@ static void command_event_init_controllers(void)
            break;
      }

-      if (set_controller)
+      if (set_controller && i < info->ports.size)
      {
         pad.device     = device;
         pad.port       = i;
@@ -1714,31 +1701,28 @@ void command_playlist_push_write(
 void command_playlist_update_write(
      void *data,
      size_t idx,
-      const char *core_display_name,
+      const char *path,
      const char *label,
-      const char *path)
+      const char *core_path,
+      const char *core_display_name,
+      const char *crc32,
+      const char *db_name)
 {
   playlist_t *plist    = (playlist_t*)data;
-   playlist_t *playlist = NULL;
+   playlist_t *playlist = plist ? plist : playlist_get_cached();

-   if (plist)
-      playlist          = plist;
-#ifdef HAVE_MENU
-   else
-      menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
-#endif
   if (!playlist)
      return;

   playlist_update(
         playlist,
         idx,
-         label,
-         NULL,
         path,
+         label,
+         core_path,
         core_display_name,
-         NULL,
-         NULL);
+         crc32,
+         db_name);

   playlist_write_file(playlist);
 }
@@ -1804,10 +1788,11 @@ bool command_event(enum event_command cmd, void *data)
               return false;
 #endif

-            libretro_get_system_info(
+            if (!libretro_get_system_info(
                  core_path,
                  system,
-                  &system_info->load_no_content);
+                  &system_info->load_no_content))
+               return false;
            info_find.path = core_path;

            if (!core_info_load(&info_find))
@@ -1820,11 +1805,17 @@ bool command_event(enum event_command cmd, void *data)
         }
         break;
      case CMD_EVENT_LOAD_CORE:
-         command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+      {
+         bool success = command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+
 #ifndef HAVE_DYNAMIC
         command_event(CMD_EVENT_QUIT, NULL);
+#else
+         if (!success)
+            return false;
 #endif
         break;
+      }
      case CMD_EVENT_LOAD_STATE:
         /* Immutable - disallow savestate load when
          * we absolutely cannot change game state. */
@@ -1942,7 +1933,7 @@ bool command_event(enum event_command cmd, void *data)
         cheevos_toggle_hardcore_mode();
 #endif
         break;
-      /* this fallthrough is on purpose, it should do 
+      /* this fallthrough is on purpose, it should do
         a CMD_EVENT_REINIT too */
      case CMD_EVENT_REINIT_FROM_TOGGLE:
         retroarch_unset_forced_fullscreen();
@@ -2027,7 +2018,7 @@ TODO: Add a setting for these tweaks */
      case CMD_EVENT_AUTOSAVE_INIT:
         command_event(CMD_EVENT_AUTOSAVE_DEINIT, NULL);
 #ifdef HAVE_THREADS
-	 {
+    {
 #ifdef HAVE_NETWORKING
         /* Only enable state manager if netplay is not underway
            TODO: Add a setting for these tweaks */
@@ -2041,7 +2032,7 @@ TODO: Add a setting for these tweaks */
            else
               runloop_unset(RUNLOOP_ACTION_AUTOSAVE);
         }
-	 }
+    }
 #endif
         break;
      case CMD_EVENT_AUTOSAVE_STATE:
@@ -2213,11 +2204,22 @@ TODO: Add a setting for these tweaks */
         break;
      case CMD_EVENT_CORE_INFO_INIT:
         {
+            char ext_name[255];
            settings_t *settings      = config_get_ptr();
+
+            ext_name[0]               = '\0';
+
            command_event(CMD_EVENT_CORE_INFO_DEINIT, NULL);

+            if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+               return false;
+
            if (!string_is_empty(settings->paths.directory_libretro))
-               core_info_init_list();
+               core_info_init_list(settings->paths.path_libretro_info,
+                     settings->paths.directory_libretro,
+                     ext_name,
+                     settings->bools.show_hidden_files
+                     );
         }
         break;
      case CMD_EVENT_CORE_DEINIT:
@@ -2312,7 +2314,7 @@ TODO: Add a setting for these tweaks */
      case CMD_EVENT_RESUME:
         rarch_menu_running_finished();
         if (ui_companion_is_on_foreground())
-            ui_companion_driver_toggle();
+            ui_companion_driver_toggle(false);
         break;
      case CMD_EVENT_ADD_TO_FAVORITES:
      {
@@ -2340,6 +2342,27 @@ TODO: Add a setting for these tweaks */
               );
         runloop_msg_queue_push(msg_hash_to_str(MSG_ADDED_TO_FAVORITES), 1, 180, true);
         break;
+
+      }
+      case CMD_EVENT_RESET_CORE_ASSOCIATION:
+      {
+         const char *core_name          = "DETECT";
+         const char *core_path          = "DETECT";
+         size_t *playlist_index         = (size_t*)data;
+
+         command_playlist_update_write(
+            NULL,
+            *playlist_index,
+            NULL,
+            NULL,
+            core_path,
+            core_name,
+            NULL,
+            NULL);
+
+         runloop_msg_queue_push(msg_hash_to_str(MSG_RESET_CORE_ASSOCIATION), 1, 180, true);
+         break;
+
      }
      case CMD_EVENT_RESTART_RETROARCH:
         if (!frontend_driver_set_fork(FRONTEND_FORK_RESTART))
@@ -2562,7 +2585,7 @@ TODO: Add a setting for these tweaks */
      case CMD_EVENT_FULLSCREEN_TOGGLE:
         {
            settings_t *settings      = config_get_ptr();
-            bool new_fullscreen_state = !settings->bools.video_fullscreen 
+            bool new_fullscreen_state = !settings->bools.video_fullscreen
               && !retroarch_is_forced_fullscreen();
            if (!video_driver_has_windowed())
               return false;
@@ -2721,6 +2744,11 @@ TODO: Add a setting for these tweaks */
               video_driver_show_mouse();
         }
         break;
+      case CMD_EVENT_UI_COMPANION_TOGGLE:
+         {
+            ui_companion_driver_toggle(true);
+            break;
+         }
      case CMD_EVENT_GAME_FOCUS_TOGGLE:
         {
            static bool game_focus_state  = false;
@@ -138,6 +138,8 @@ enum event_command
   CMD_EVENT_RESUME,
   /* Add a playlist entry to favorites. */
   CMD_EVENT_ADD_TO_FAVORITES,
+   /* Reset playlist entry associated core to DETECT */
+   CMD_EVENT_RESET_CORE_ASSOCIATION,
   /* Toggles pause. */
   CMD_EVENT_PAUSE_TOGGLE,
   /* Pauses RetroArch. */
@@ -216,6 +218,8 @@ enum event_command
   CMD_EVENT_GRAB_MOUSE_TOGGLE,
   /* Toggles game focus. */
   CMD_EVENT_GAME_FOCUS_TOGGLE,
+   /* Toggles desktop menu. */
+   CMD_EVENT_UI_COMPANION_TOGGLE,
   /* Toggles fullscreen mode. */
   CMD_EVENT_FULLSCREEN_TOGGLE,
   CMD_EVENT_PERFCNT_REPORT_FRONTEND_LOG,
@@ -269,9 +273,12 @@ void command_playlist_push_write(
 void command_playlist_update_write(
      void *data,
      size_t idx,
-      const char *core_display_name,
+      const char *path,
      const char *label,
-      const char *path);
+      const char *core_path,
+      const char *core_display_name,
+      const char *crc32,
+      const char *db_name);

 RETRO_END_DECLS

@@ -67,6 +67,10 @@ static bool bundle_assets_extract_enable = false;
 static bool materialui_icons_enable      = true;
 #endif

+static const bool crt_switch_resolution = false; 	
+static const int crt_switch_resolution_super = 2560; 
+
+
 static const bool def_history_list_enable = true;
 static const bool def_playlist_entry_remove = true;
 static const bool def_playlist_entry_rename = true;
@@ -293,6 +297,7 @@ static bool content_show_history     = true;
 #ifdef HAVE_LIBRETRODB
 static bool content_show_add     	 = true;
 #endif
+static bool content_show_playlists   = true;

 #ifdef HAVE_XMB
 static unsigned xmb_scale_factor = 100;
@@ -300,9 +305,10 @@ static unsigned xmb_alpha_factor = 75;
 static unsigned menu_font_color_red = 255;
 static unsigned menu_font_color_green = 255;
 static unsigned menu_font_color_blue = 255;
+static unsigned xmb_menu_layout  = 0;
 static unsigned xmb_icon_theme   = XMB_ICON_THEME_MONOCHROME;
 static unsigned xmb_theme        = XMB_THEME_ELECTRIC_BLUE;
-#ifdef HAVE_LAKKA
+#if defined(HAVE_LAKKA) || defined(__arm__) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
 static bool xmb_shadows_enable   = false;
 #else
 static bool xmb_shadows_enable   = true;
@@ -352,6 +358,8 @@ static bool default_screenshots_in_content_dir = false;
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
 #elif defined(VITA)
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
+#elif defined(SWITCH)
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_START_SELECT;
 #else
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
 #endif
@@ -587,6 +595,12 @@ static const float slowmotion_ratio = 3.0;
 /* Maximum fast forward ratio. */
 static const float fastforward_ratio = 0.0;

+/* Run core logic one or more frames ahead then load the state back to reduce perceived input lag. */
+static const unsigned run_ahead_frames = 1;
+
+/* When using the Run Ahead feature, use a secondary instance of the core. */
+static const bool run_ahead_secondary_instance = true;
+
 /* Enable stdin/network command interface. */
 static const bool network_cmd_enable = false;
 static const uint16_t network_cmd_port = 55355;
@@ -599,11 +613,7 @@ static const unsigned default_content_history_size = 100;
 /* Show Menu start-up screen on boot. */
 static const bool default_menu_show_start_screen = true;

-#ifdef RARCH_MOBILE
 static const bool menu_dpi_override_enable = false;
-#else
-static const bool menu_dpi_override_enable = true;
-#endif

 #ifdef RARCH_MOBILE
 static const unsigned menu_dpi_override_value = 72;
@@ -648,6 +658,10 @@ static const unsigned input_bind_timeout = 5;

 static const unsigned menu_thumbnails_default = 3;

+static const unsigned menu_left_thumbnails_default = 0;
+
+static const bool xmb_vertical_thumbnails = false;
+
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
 #else
@@ -656,6 +670,12 @@ static const bool ui_companion_start_on_boot = true;

 static const bool ui_companion_enable = false;

+/* Currently only used to show the WIMP UI on startup */
+static const bool ui_companion_toggle = false;
+
+/* Only init the WIMP UI for this session if this is enabled */
+static const bool desktop_menu_enable = true;
+
 #if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
 #elif defined(PSP) || defined(_3DS) || defined(VITA)
@@ -717,11 +737,11 @@ static char buildbot_server_url[] = "";
 #elif defined(WIIU)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
 #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/dex-ps3/";
+static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/";
 #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/cex-ps3/";
+static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/";
 #elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/ode-ps3/";
+static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/";
 #else
 static char buildbot_server_url[] = "";
 #endif
@@ -66,6 +66,8 @@ static const struct retro_keybind retro_keybinds_1[] = {

   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -86,7 +88,6 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -96,6 +97,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_UI_COMPANION_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_SPACE,   NO_BTN, NO_BTN, 0, AXIS_NONE },
 #else
   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_z,       NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -140,6 +142,8 @@ static const struct retro_keybind retro_keybinds_1[] = {

   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_SPACE,   NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_l,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_e,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_F4,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_F2,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_f,       NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -160,7 +164,6 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_F9,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_F12,     NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_i,       NO_BTN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_e,       NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_KP_PLUS, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_KP_MINUS,NO_BTN, NO_BTN, 0, AXIS_NONE },
@@ -170,6 +173,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_F11,     NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_SCROLLOCK,  NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_UI_COMPANION_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,  RETROK_F5,      NO_BTN, NO_BTN, 0, AXIS_NONE },
   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_F1,      NO_BTN, NO_BTN, 0, AXIS_NONE },
 #endif
 };
@@ -67,6 +67,7 @@ struct config_bool_setting
   bool def_enable;
   bool def;
   bool handle;
+   enum rarch_override_setting override;
 };

 struct config_int_setting
@@ -76,6 +77,7 @@ struct config_int_setting
   bool def_enable;
   int def;
   bool handle;
+   enum rarch_override_setting override;
 };

 struct config_uint_setting
@@ -85,6 +87,7 @@ struct config_uint_setting
   bool def_enable;
   unsigned def;
   bool handle;
+   enum rarch_override_setting override;
 };

 struct config_float_setting
@@ -94,6 +97,7 @@ struct config_float_setting
   bool def_enable;
   float def;
   bool handle;
+   enum rarch_override_setting override;
 };

 struct config_array_setting
@@ -103,6 +107,7 @@ struct config_array_setting
   bool def_enable;
   const char *def;
   bool handle;
+   enum rarch_override_setting override;
 };

 struct config_path_setting
@@ -535,6 +540,9 @@ static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_NULL;
 #define SETTING_ARRAY(key, configval, default_enable, default_setting, handle_setting) \
   GENERAL_SETTING(key, configval, default_enable, default_setting, struct config_array_setting, handle_setting)

+#define SETTING_OVERRIDE(override_setting) \
+   tmp[count-1].override = override_setting
+
 struct defaults g_defaults;
 static settings_t *configuration_settings = NULL;

@@ -1025,6 +1033,7 @@ static struct config_array_setting *populate_settings_array(settings_t *settings
 #ifdef HAVE_CHEEVOS
   SETTING_ARRAY("cheevos_username",         settings->arrays.cheevos_username, false, NULL, true);
   SETTING_ARRAY("cheevos_password",         settings->arrays.cheevos_password, false, NULL, true);
+   SETTING_ARRAY("cheevos_token",            settings->arrays.cheevos_token, false, NULL, true);
 #endif
   SETTING_ARRAY("video_context_driver",     settings->arrays.video_context_driver,   false, NULL, true);
   SETTING_ARRAY("audio_driver",             settings->arrays.audio_driver,           false, NULL, true);
@@ -1171,6 +1180,8 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("automatically_add_content_to_playlist", &settings->bools.automatically_add_content_to_playlist, true, automatically_add_content_to_playlist, false);
   SETTING_BOOL("ui_companion_start_on_boot",    &settings->bools.ui_companion_start_on_boot, true, ui_companion_start_on_boot, false);
   SETTING_BOOL("ui_companion_enable",           &settings->bools.ui_companion_enable, true, ui_companion_enable, false);
+   SETTING_BOOL("ui_companion_toggle",           &settings->bools.ui_companion_toggle, false, ui_companion_toggle, false);
+   SETTING_BOOL("desktop_menu_enable",           &settings->bools.desktop_menu_enable, true, desktop_menu_enable, false);
   SETTING_BOOL("video_gpu_record",              &settings->bools.video_gpu_record, true, gpu_record, false);
   SETTING_BOOL("input_remap_binds_enable",      &settings->bools.input_remap_binds_enable, true, true, false);
   SETTING_BOOL("all_users_control_menu",        &settings->bools.input_all_users_control_menu, true, all_users_control_menu, false);
@@ -1181,6 +1192,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("netplay_allow_slaves",          &settings->bools.netplay_allow_slaves, true, netplay_allow_slaves, false);
   SETTING_BOOL("netplay_require_slaves",        &settings->bools.netplay_require_slaves, true, netplay_require_slaves, false);
   SETTING_BOOL("netplay_stateless_mode",        &settings->bools.netplay_stateless_mode, true, netplay_stateless_mode, false);
+   SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_NETPLAY_STATELESS_MODE);
   SETTING_BOOL("netplay_use_mitm_server",       &settings->bools.netplay_use_mitm_server, true, netplay_use_mitm_server, false);
   SETTING_BOOL("netplay_request_device_p1",     &settings->bools.netplay_request_devices[0], true, false, false);
   SETTING_BOOL("netplay_request_device_p2",     &settings->bools.netplay_request_devices[1], true, false, false);
@@ -1206,10 +1218,13 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("builtin_mediaplayer_enable",    &settings->bools.multimedia_builtin_mediaplayer_enable, false, false /* TODO */, false);
   SETTING_BOOL("builtin_imageviewer_enable",    &settings->bools.multimedia_builtin_imageviewer_enable, true, true, false);
   SETTING_BOOL("fps_show",                      &settings->bools.video_fps_show, true, false, false);
+   SETTING_BOOL("statistics_show",               &settings->bools.video_statistics_show, true, false, false);
   SETTING_BOOL("framecount_show",               &settings->bools.video_framecount_show, true, true, false);
   SETTING_BOOL("ui_menubar_enable",             &settings->bools.ui_menubar_enable, true, true, false);
   SETTING_BOOL("suspend_screensaver_enable",    &settings->bools.ui_suspend_screensaver_enable, true, true, false);
   SETTING_BOOL("rewind_enable",                 &settings->bools.rewind_enable, true, rewind_enable, false);
+   SETTING_BOOL("run_ahead_enabled",             &settings->bools.run_ahead_enabled, true, false, false);
+   SETTING_BOOL("run_ahead_secondary_instance",  &settings->bools.run_ahead_secondary_instance, true, false, false);
   SETTING_BOOL("audio_sync",                    &settings->bools.audio_sync, true, audio_sync, false);
   SETTING_BOOL("video_shader_enable",           &settings->bools.video_shader_enable, true, shader_enable, false);
   SETTING_BOOL("video_shader_watch_files",      &settings->bools.video_shader_watch_files, true, video_shader_watch_files, false);
@@ -1232,6 +1247,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("video_vsync",                   &settings->bools.video_vsync, true, vsync, false);
   SETTING_BOOL("video_hard_sync",               &settings->bools.video_hard_sync, true, hard_sync, false);
   SETTING_BOOL("video_black_frame_insertion",   &settings->bools.video_black_frame_insertion, true, black_frame_insertion, false);
+   SETTING_BOOL("crt_switch_resolution",  		 &settings->bools.crt_switch_resolution, true, crt_switch_resolution, false); 
   SETTING_BOOL("video_disable_composition",     &settings->bools.video_disable_composition, true, disable_composition, false);
   SETTING_BOOL("pause_nonactive",               &settings->bools.pause_nonactive, true, pause_nonactive, false);
   SETTING_BOOL("video_gpu_screenshot",          &settings->bools.video_gpu_screenshot, true, gpu_screenshot, false);
@@ -1239,6 +1255,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("keyboard_gamepad_enable",       &settings->bools.input_keyboard_gamepad_enable, true, true, false);
   SETTING_BOOL("core_set_supports_no_game_enable", &settings->bools.set_supports_no_game_enable, true, true, false);
   SETTING_BOOL("audio_enable",                  &settings->bools.audio_enable, true, audio_enable, false);
+   SETTING_BOOL("audio_enable_menu",             &settings->bools.audio_enable_menu, true, false, false);
   SETTING_BOOL("audio_mute_enable",             audio_get_bool_ptr(AUDIO_ACTION_MUTE_ENABLE), true, false, false);
   SETTING_BOOL("audio_mixer_mute_enable",       audio_get_bool_ptr(AUDIO_ACTION_MIXER_MUTE_ENABLE), true, false, false);
   SETTING_BOOL("location_allow",                &settings->bools.location_allow, true, false, false);
@@ -1299,10 +1316,14 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
 #ifdef HAVE_LIBRETRODB
   SETTING_BOOL("content_show_add",              &settings->bools.menu_content_show_add, true, content_show_add, false);
 #endif
+   SETTING_BOOL("content_show_playlists",        &settings->bools.menu_content_show_playlists, true, content_show_playlists, false);
   SETTING_BOOL("menu_show_load_core",           &settings->bools.menu_show_load_core, true, menu_show_load_core, false);
   SETTING_BOOL("menu_show_load_content",        &settings->bools.menu_show_load_content, true, menu_show_load_content, false);
   SETTING_BOOL("menu_show_information",         &settings->bools.menu_show_information, true, menu_show_information, false);
   SETTING_BOOL("menu_show_configurations",      &settings->bools.menu_show_configurations, true, menu_show_configurations, false);
+   SETTING_BOOL("menu_show_latency",      &settings->bools.menu_show_latency, true, true, false);
+   SETTING_BOOL("menu_show_rewind",      &settings->bools.menu_show_rewind, true, true, false);
+   SETTING_BOOL("menu_show_overlays",      &settings->bools.menu_show_overlays, true, true, false);
   SETTING_BOOL("menu_show_help",                &settings->bools.menu_show_help, true, menu_show_help, false);
   SETTING_BOOL("menu_show_quit_retroarch",      &settings->bools.menu_show_quit_retroarch, true, menu_show_quit_retroarch, false);
   SETTING_BOOL("menu_show_reboot",              &settings->bools.menu_show_reboot, true, menu_show_reboot, false);
@@ -1317,8 +1338,14 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
 #ifdef HAVE_MATERIALUI
   SETTING_BOOL("materialui_icons_enable",       &settings->bools.menu_materialui_icons_enable, true, materialui_icons_enable, false);
 #endif
+#ifdef HAVE_RGUI
+   SETTING_BOOL("rgui_background_filler_thickness_enable",     &settings->bools.menu_rgui_background_filler_thickness_enable, true, true, false);
+   SETTING_BOOL("rgui_border_filler_thickness_enable",     &settings->bools.menu_rgui_border_filler_thickness_enable, true, true, false);
+   SETTING_BOOL("rgui_border_filler_enable",     &settings->bools.menu_rgui_border_filler_enable, true, true, false);
+#endif
 #ifdef HAVE_XMB
   SETTING_BOOL("xmb_shadows_enable",            &settings->bools.menu_xmb_shadows_enable, true, xmb_shadows_enable, false);
+   SETTING_BOOL("xmb_vertical_thumbnails",       &settings->bools.menu_xmb_vertical_thumbnails, true, xmb_vertical_thumbnails, false);
 #endif
 #endif
 #ifdef HAVE_CHEEVOS
@@ -1326,10 +1353,11 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
   SETTING_BOOL("cheevos_test_unofficial",      &settings->bools.cheevos_test_unofficial, true, false, false);
   SETTING_BOOL("cheevos_hardcore_mode_enable", &settings->bools.cheevos_hardcore_mode_enable, true, false, false);
   SETTING_BOOL("cheevos_leaderboards_enable",  &settings->bools.cheevos_leaderboards_enable, true, false, false);
+   SETTING_BOOL("cheevos_verbose_enable",       &settings->bools.cheevos_verbose_enable, true, false, false);
+   SETTING_BOOL("cheevos_auto_screenshot",      &settings->bools.cheevos_auto_screenshot, true, false, false);
 #ifdef HAVE_XMB
   SETTING_BOOL("cheevos_badges_enable",        &settings->bools.cheevos_badges_enable, true, false, false);
 #endif
-   SETTING_BOOL("cheevos_verbose_enable",       &settings->bools.cheevos_verbose_enable, true, false, false);
 #endif
 #ifdef HAVE_OVERLAY
   SETTING_BOOL("input_overlay_enable",         &settings->bools.input_overlay_enable, true, config_overlay_enable_default(), false);
@@ -1344,9 +1372,6 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
 #ifdef HAVE_NETWORKGAMEPAD
   SETTING_BOOL("network_remote_enable",        &settings->bools.network_remote_enable, false, false /* TODO */, false);
 #endif
-#ifdef HAVE_KEYMAPPER
-   SETTING_BOOL("keymapper_enable",       &settings->bools.keymapper_enable, true, true /* TODO */, false);
-#endif
 #ifdef HAVE_NETWORKING
   SETTING_BOOL("netplay_nat_traversal",        &settings->bools.netplay_nat_traversal, true, true, false);
 #endif
@@ -1451,9 +1476,6 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
 #ifdef HAVE_NETWORKGAMEPAD
   SETTING_UINT("network_remote_base_port",     &settings->uints.network_remote_base_port, true, network_remote_base_port, false);
 #endif
-#ifdef HAVE_KEYMAPPER
-   SETTING_UINT("keymapper_port",               &settings->uints.keymapper_port, true, 0, false);
-#endif
 #ifdef GEKKO
   SETTING_UINT("video_viwidth",                &settings->uints.video_viwidth, true, video_viwidth, false);
 #endif
@@ -1461,8 +1483,10 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
   SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, menu_dpi_override_value, false);
   SETTING_UINT("menu_thumbnails",              &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false);
 #ifdef HAVE_XMB
+   SETTING_UINT("menu_left_thumbnails",         &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false);
   SETTING_UINT("xmb_alpha_factor",             &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false);
   SETTING_UINT("xmb_scale_factor",             &settings->uints.menu_xmb_scale_factor, true, xmb_scale_factor, false);
+   SETTING_UINT("xmb_layout",                   &settings->uints.menu_xmb_layout, true, xmb_menu_layout, false);
   SETTING_UINT("xmb_theme",                    &settings->uints.menu_xmb_theme, true, xmb_icon_theme, false);
   SETTING_UINT("xmb_menu_color_theme",         &settings->uints.menu_xmb_color_theme, true, xmb_theme, false);
   SETTING_UINT("menu_font_color_red",          &settings->uints.menu_font_color_red, true, menu_font_color_red, false);
@@ -1474,6 +1498,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
 #endif
   SETTING_UINT("audio_out_rate",               &settings->uints.audio_out_rate, true, out_rate, false);
   SETTING_UINT("custom_viewport_width",        &settings->video_viewport_custom.width, false, 0 /* TODO */, false);
+   SETTING_UINT("crt_switch_resolution_super",  &settings->uints.crt_switch_resolution_super,      true, crt_switch_resolution_super, false);
   SETTING_UINT("custom_viewport_height",       &settings->video_viewport_custom.height, false, 0 /* TODO */, false);
   SETTING_UINT("custom_viewport_x",            (unsigned*)&settings->video_viewport_custom.x, false, 0 /* TODO */, false);
   SETTING_UINT("custom_viewport_y",            (unsigned*)&settings->video_viewport_custom.y, false, 0 /* TODO */, false);
@@ -1486,6 +1511,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
   SETTING_UINT("aspect_ratio_index",           &settings->uints.video_aspect_ratio_idx, true, aspect_ratio_idx, false);
 #ifdef HAVE_NETWORKING
   SETTING_UINT("netplay_ip_port",              &settings->uints.netplay_port,         true, RARCH_DEFAULT_PORT, false);
+   SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT);
   SETTING_UINT("netplay_input_latency_frames_min",&settings->uints.netplay_input_latency_frames_min, true, 0, false);
   SETTING_UINT("netplay_input_latency_frames_range",&settings->uints.netplay_input_latency_frames_range, true, 0, false);
   SETTING_UINT("netplay_share_digital",        &settings->uints.netplay_share_digital, true, netplay_share_digital, false);
@@ -1501,6 +1527,8 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
   SETTING_UINT("video_msg_bgcolor_green",        &settings->uints.video_msg_bgcolor_green, true, message_bgcolor_green, false);
   SETTING_UINT("video_msg_bgcolor_blue",        &settings->uints.video_msg_bgcolor_blue, true, message_bgcolor_blue, false);

+   SETTING_UINT("run_ahead_frames",           &settings->uints.run_ahead_frames, true, 1,  false);
+
   *size = count;

   return tmp;
@@ -1509,11 +1537,12 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
 static struct config_int_setting *populate_settings_int(settings_t *settings, int *size)
 {
   unsigned count                     = 0;
-   struct config_int_setting  *tmp    = (struct config_int_setting*)malloc((*size + 1) * sizeof(struct config_int_setting));
+   struct config_int_setting  *tmp    = (struct config_int_setting*)calloc((*size + 1), sizeof(struct config_int_setting));

   SETTING_INT("state_slot",                   &settings->ints.state_slot, false, 0 /* TODO */, false);
 #ifdef HAVE_NETWORKING
   SETTING_INT("netplay_check_frames",         &settings->ints.netplay_check_frames, true, netplay_check_frames, false);
+   SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES);
 #endif
 #ifdef HAVE_WASAPI
   SETTING_INT("audio_wasapi_sh_buffer_length", &settings->ints.audio_wasapi_sh_buffer_length, true, wasapi_sh_buffer_length, false);
@@ -1699,6 +1728,7 @@ static void config_set_defaults(void)
 #ifdef HAVE_CHEEVOS
   *settings->arrays.cheevos_username                 = '\0';
   *settings->arrays.cheevos_password                 = '\0';
+   *settings->arrays.cheevos_token                    = '\0';
 #endif

   input_config_reset();
@@ -1727,8 +1757,7 @@ static void config_set_defaults(void)
   {
      settings->uints.input_joypad_map[i] = i;
      settings->uints.input_analog_dpad_mode[i] = ANALOG_DPAD_NONE;
-      if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DEVICE, &i))
-         input_config_set_device(i, RETRO_DEVICE_JOYPAD);
+      input_config_set_device(i, RETRO_DEVICE_JOYPAD);
      settings->uints.input_mouse_index[i] = 0;
   }

@@ -1742,8 +1771,7 @@ static void config_set_defaults(void)
      dir_clear(RARCH_DIR_SAVESTATE);

   *settings->paths.path_libretro_info = '\0';
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL))
-      *settings->paths.directory_libretro = '\0';
+   *settings->paths.directory_libretro = '\0';
   *settings->paths.directory_cursor = '\0';
   *settings->paths.directory_resampler = '\0';
   *settings->paths.directory_screenshot = '\0';
@@ -1764,12 +1792,9 @@ static void config_set_defaults(void)
   *settings->paths.directory_video_filter = '\0';
   *settings->paths.directory_audio_filter = '\0';

-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_UPS_PREF, NULL))
-      rarch_ctl(RARCH_CTL_UNSET_UPS_PREF, NULL);
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_BPS_PREF, NULL))
-      rarch_ctl(RARCH_CTL_UNSET_BPS_PREF, NULL);
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_IPS_PREF, NULL))
-      rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_UPS_PREF, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_BPS_PREF, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL);

   {
      global_t *global =  global_get_ptr();
@@ -1897,8 +1922,14 @@ static void config_set_defaults(void)
            g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
            sizeof(settings->paths.directory_menu_config));
 #if TARGET_OS_IPHONE
-      path_set(RARCH_PATH_CONFIG,
-            settings->paths.directory_menu_config);
+      {
+         char *config_file_path        = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+         size_t config_file_path_size  = PATH_MAX_LENGTH * sizeof(char);
+
+         fill_pathname_join(config_file_path, settings->paths.directory_menu_config, file_path_str(FILE_PATH_MAIN_CONFIG), config_file_path_size);
+         path_set(RARCH_PATH_CONFIG,
+               config_file_path);
+      }
 #endif
   }

@@ -1912,12 +1943,10 @@ static void config_set_defaults(void)
            g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG],
            sizeof(settings->paths.directory_autoconfig));

-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL) &&
-         !string_is_empty(g_defaults.dirs[DEFAULT_DIR_SAVESTATE]))
+   if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_SAVESTATE]))
      dir_set(RARCH_DIR_SAVESTATE, g_defaults.dirs[DEFAULT_DIR_SAVESTATE]);

-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL) &&
-         !string_is_empty(g_defaults.dirs[DEFAULT_DIR_SRAM]))
+   if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_SRAM]))
      dir_set(RARCH_DIR_SAVEFILE, g_defaults.dirs[DEFAULT_DIR_SRAM]);

   if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_SYSTEM]))
@@ -2365,9 +2394,6 @@ static bool config_load_file(const char *path, bool set_defaults,
   unsigned msg_color                              = 0;
   config_file_t *conf                             = NULL;
   char *override_username                         = NULL;
-#ifdef HAVE_NETWORKING
-   char *override_netplay_ip_address               = NULL;
-#endif
   const char *path_core                           = NULL;
   const char *path_config                         = NULL;
   const char *shader_ext                          = NULL;
@@ -2445,11 +2471,6 @@ static bool config_load_file(const char *path, bool set_defaults,
   if (rarch_ctl(RARCH_CTL_HAS_SET_USERNAME, NULL))
      override_username = strdup(settings->paths.username);

-#ifdef HAVE_NETWORKING
-   if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS, NULL))
-      override_netplay_ip_address = strdup(settings->paths.netplay_server);
-#endif
-
   /* Boolean settings */

   for (i = 0; i < (unsigned)bool_settings_size; i++)
@@ -2472,15 +2493,12 @@ static bool config_load_file(const char *path, bool set_defaults,
         settings->bools.network_remote_enable_user[i] = tmp_bool;
   }
 #endif
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL))
+   if (config_get_bool(conf, "log_verbosity", &tmp_bool))
   {
-      if (config_get_bool(conf, "log_verbosity", &tmp_bool))
-      {
-         if (tmp_bool)
-            verbosity_enable();
-         else
-            verbosity_disable();
-      }
+      if (tmp_bool)
+         verbosity_enable();
+      else
+         verbosity_disable();
   }
   {
      char tmp[64];
@@ -2513,14 +2531,6 @@ static bool config_load_file(const char *path, bool set_defaults,
         *uint_settings[i].ptr = tmp;
   }

-#ifdef HAVE_NETWORKING
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_STATELESS_MODE, NULL))
-      CONFIG_GET_BOOL_BASE(conf, settings, bools.netplay_stateless_mode, "netplay_stateless_mode");
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES, NULL))
-      CONFIG_GET_INT_BASE(conf, settings, ints.netplay_check_frames, "netplay_check_frames");
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT, NULL))
-      CONFIG_GET_INT_BASE(conf, settings, uints.netplay_port, "netplay_ip_port");
-#endif
   for (i = 0; i < MAX_USERS; i++)
   {
      char buf[64];
@@ -2536,11 +2546,8 @@ static bool config_load_file(const char *path, bool set_defaults,
      snprintf(buf, sizeof(buf), "input_player%u_mouse_index", i + 1);
      CONFIG_GET_INT_BASE(conf, settings, uints.input_mouse_index[i], buf);

-      if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DEVICE, &i))
-      {
-         snprintf(buf, sizeof(buf), "input_libretro_device_p%u", i + 1);
-         CONFIG_GET_INT_BASE(conf, settings, uints.input_libretro_device[i], buf);
-      }
+      snprintf(buf, sizeof(buf), "input_libretro_device_p%u", i + 1);
+      CONFIG_GET_INT_BASE(conf, settings, uints.input_libretro_device[i], buf);
   }

   /* LED map for use by the led driver */
@@ -2606,11 +2613,8 @@ static bool config_load_file(const char *path, bool set_defaults,
         strlcpy(path_settings[i].ptr, tmp_str, PATH_MAX_LENGTH);
   }

-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL))
-   {
-      if (config_get_path(conf, "libretro_directory", tmp_str, path_size))
-            strlcpy(settings->paths.directory_libretro, tmp_str, sizeof(settings->paths.directory_libretro));
-   }
+   if (config_get_path(conf, "libretro_directory", tmp_str, path_size))
+      strlcpy(settings->paths.directory_libretro, tmp_str, sizeof(settings->paths.directory_libretro));

 #ifndef HAVE_DYNAMIC
   if (config_get_path(conf, "libretro_path", tmp_str, path_size))
@@ -2631,16 +2635,6 @@ static bool config_load_file(const char *path, bool set_defaults,
      free(override_username);
   }

-#ifdef HAVE_NETWORKING
-   if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS, NULL))
-   {
-      strlcpy(settings->paths.netplay_server,
-            override_netplay_ip_address,
-            sizeof(settings->paths.netplay_server));
-      free(override_netplay_ip_address);
-   }
-#endif
-
   if (settings->uints.video_hard_sync_frames > 3)
      settings->uints.video_hard_sync_frames = 3;

@@ -2949,7 +2943,7 @@ bool config_load_override(void)
   config_file_t *new_conf                = NULL;
   bool should_append                     = false;
   rarch_system_info_t *system            = runloop_get_system_info();
-   const char *core_name                  = system ? 
+   const char *core_name                  = system ?
      system->info.library_name : NULL;
   const char *game_name                  = path_basename(path_get(RARCH_PATH_BASENAME));

@@ -3037,7 +3031,7 @@ bool config_load_override(void)
   if (!should_append)
      goto error;

-   /* Re-load the configuration with any overrides 
+   /* Re-load the configuration with any overrides
    * that might have been found */
   buf[0] = '\0';

@@ -3122,7 +3116,7 @@ bool config_unload_override(void)
 bool config_load_remap(void)
 {
   size_t path_size                       = PATH_MAX_LENGTH * sizeof(char);
-   char *remap_directory                  = NULL; 
+   char *remap_directory                  = NULL;
   char *core_path                        = NULL;
   char *game_path                        = NULL;
   config_file_t *new_conf                = NULL;
@@ -3142,12 +3136,12 @@ bool config_load_remap(void)
   /* path to the directory containing retroarch.cfg (prefix)    */
   remap_directory                        = (char*)
      malloc(PATH_MAX_LENGTH * sizeof(char));
-   /* final path for core-specific configuration (prefix+suffix) */    
+   /* final path for core-specific configuration (prefix+suffix) */
   core_path                              = (char*)
      malloc(PATH_MAX_LENGTH * sizeof(char));
   /* final path for game-specific configuration (prefix+suffix) */
   game_path                              = (char*)
-      malloc(PATH_MAX_LENGTH * sizeof(char));          
+      malloc(PATH_MAX_LENGTH * sizeof(char));
   remap_directory[0] = core_path[0] = game_path[0] = '\0';

   strlcpy(remap_directory,
@@ -3249,7 +3243,7 @@ bool config_load_shader_preset(void)
   char *parent_path                      = NULL;
   settings_t *settings                   = config_get_ptr();
   rarch_system_info_t *system            = runloop_get_system_info();
-   const char *core_name                  = system 
+   const char *core_name                  = system
      ? system->info.library_name : NULL;
   const char *game_name                  = path_basename(path_get(RARCH_PATH_BASENAME));

@@ -3534,14 +3528,14 @@ static void save_keybind_mbutton(config_file_t *conf,
      const char *base,
      const struct retro_keybind *bind, bool save_empty)
 {
-	char key[64];
+   char key[64];

-	key[0] = '\0';
+   key[0] = '\0';

-	fill_pathname_join_delim_concat(key, prefix,
-		base, '_', "_mbtn", sizeof(key));
+   fill_pathname_join_delim_concat(key, prefix,
+      base, '_', "_mbtn", sizeof(key));

-	switch ( bind->mbutton )
+   switch ( bind->mbutton )
   {
      case RETRO_DEVICE_ID_MOUSE_LEFT:
         config_set_uint64(conf, key, 1);
@@ -3787,8 +3781,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
 error:
   free(buf);
   free(autoconf_file);
-   if (path_new)
-      free(path_new);
+   free(path_new);
   return false;
 }

@@ -3864,9 +3857,11 @@ bool config_save_file(const char *path)
   if (array_settings && (array_settings_size > 0))
   {
      for (i = 0; i < (unsigned)array_settings_size; i++)
-         config_set_string(conf,
-               array_settings[i].ident,
-               array_settings[i].ptr);
+         if (!array_settings[i].override ||
+             !retroarch_override_setting_is_set(array_settings[i].override, NULL))
+            config_set_string(conf,
+                  array_settings[i].ident,
+                  array_settings[i].ptr);

      free(array_settings);
   }
@@ -3875,9 +3870,11 @@ bool config_save_file(const char *path)
   if (float_settings && (float_settings_size > 0))
   {
      for (i = 0; i < (unsigned)float_settings_size; i++)
-         config_set_float(conf,
-               float_settings[i].ident,
-               *float_settings[i].ptr);
+         if (!float_settings[i].override ||
+             !retroarch_override_setting_is_set(float_settings[i].override, NULL))
+            config_set_float(conf,
+                  float_settings[i].ident,
+                  *float_settings[i].ptr);

      free(float_settings);
   }
@@ -3886,9 +3883,11 @@ bool config_save_file(const char *path)
   if (int_settings && (int_settings_size > 0))
   {
      for (i = 0; i < (unsigned)int_settings_size; i++)
-         config_set_int(conf,
-               int_settings[i].ident,
-               *int_settings[i].ptr);
+         if (!int_settings[i].override ||
+             !retroarch_override_setting_is_set(int_settings[i].override, NULL))
+            config_set_int(conf,
+                  int_settings[i].ident,
+                  *int_settings[i].ptr);

      free(int_settings);
   }
@@ -3896,9 +3895,11 @@ bool config_save_file(const char *path)
   if (uint_settings && (uint_settings_size > 0))
   {
      for (i = 0; i < (unsigned)uint_settings_size; i++)
-         config_set_int(conf,
-               uint_settings[i].ident,
-               *uint_settings[i].ptr);
+         if (!uint_settings[i].override ||
+             !retroarch_override_setting_is_set(uint_settings[i].override, NULL))
+            config_set_int(conf,
+                  uint_settings[i].ident,
+                  *uint_settings[i].ptr);

      free(uint_settings);
   }
@@ -3925,8 +3926,10 @@ bool config_save_file(const char *path)
   if (bool_settings && (bool_settings_size > 0))
   {
      for (i = 0; i < (unsigned)bool_settings_size; i++)
-         config_set_bool(conf, bool_settings[i].ident,
-               *bool_settings[i].ptr);
+         if (!bool_settings[i].override ||
+             !retroarch_override_setting_is_set(bool_settings[i].override, NULL))
+            config_set_bool(conf, bool_settings[i].ident,
+                  *bool_settings[i].ptr);

      free(bool_settings);
   }
@@ -3943,6 +3946,7 @@ bool config_save_file(const char *path)
   }
 #endif

+   /* Verbosity isn't in bool_settings since it needs to be loaded differently */
   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL))
   {
      config_set_bool(conf, "log_verbosity",
@@ -4189,28 +4193,28 @@ bool config_save_overrides(int override_type)
         char cfg[64];

         cfg[0] = '\0';
-         if (settings->uints.input_device[i] 
+         if (settings->uints.input_device[i]
               != overrides->uints.input_device[i])
         {
            snprintf(cfg, sizeof(cfg), "input_device_p%u", i + 1);
            config_set_int(conf, cfg, overrides->uints.input_device[i]);
         }

-         if (settings->uints.input_joypad_map[i] 
+         if (settings->uints.input_joypad_map[i]
               != overrides->uints.input_joypad_map[i])
         {
            snprintf(cfg, sizeof(cfg), "input_player%u_joypad_index", i + 1);
            config_set_int(conf, cfg, overrides->uints.input_joypad_map[i]);
         }

-         if (settings->uints.input_libretro_device[i] 
+         if (settings->uints.input_libretro_device[i]
               != overrides->uints.input_libretro_device[i])
         {
            snprintf(cfg, sizeof(cfg), "input_libretro_device_p%u", i + 1);
            config_set_int(conf, cfg, overrides->uints.input_libretro_device[i]);
         }

-         if (settings->uints.input_analog_dpad_mode[i] 
+         if (settings->uints.input_analog_dpad_mode[i]
               != overrides->uints.input_analog_dpad_mode[i])
         {
            snprintf(cfg, sizeof(cfg), "input_player%u_analog_dpad_mode", i + 1);
@@ -92,11 +92,14 @@ typedef struct settings
      bool video_shared_context;
      bool video_force_srgb_disable;
      bool video_fps_show;
+      bool video_statistics_show;
      bool video_framecount_show;
      bool video_msg_bgcolor_enable;
+      bool crt_switch_resolution;  

      /* Audio */
      bool audio_enable;
+      bool audio_enable_menu;
      bool audio_sync;
      bool audio_rate_control;
      bool audio_wasapi_exclusive_mode;
@@ -145,8 +148,15 @@ typedef struct settings
      bool menu_show_help;
      bool menu_show_quit_retroarch;
      bool menu_show_reboot;
+      bool menu_show_latency;
+      bool menu_show_rewind;
+      bool menu_show_overlays;
      bool menu_materialui_icons_enable;
+      bool menu_rgui_background_filler_thickness_enable;
+      bool menu_rgui_border_filler_thickness_enable;
+      bool menu_rgui_border_filler_enable;
      bool menu_xmb_shadows_enable;
+      bool menu_xmb_vertical_thumbnails;
      bool menu_content_show_settings;
      bool menu_content_show_favorites;
      bool menu_content_show_images;
@@ -155,6 +165,7 @@ typedef struct settings
      bool menu_content_show_netplay;
      bool menu_content_show_history;
      bool menu_content_show_add;
+      bool menu_content_show_playlists;
      bool menu_unified_controls;
      bool quick_menu_show_take_screenshot;
      bool quick_menu_show_save_load_state;
@@ -187,6 +198,8 @@ typedef struct settings
      bool ui_suspend_screensaver_enable;
      bool ui_companion_start_on_boot;
      bool ui_companion_enable;
+      bool ui_companion_toggle;
+      bool desktop_menu_enable;

      /* Cheevos */
      bool cheevos_enable;
@@ -195,6 +208,7 @@ typedef struct settings
      bool cheevos_leaderboards_enable;
      bool cheevos_badges_enable;
      bool cheevos_verbose_enable;
+      bool cheevos_auto_screenshot;

      /* Camera */
      bool camera_allow;
@@ -221,6 +235,8 @@ typedef struct settings
      bool playlist_entry_remove;
      bool playlist_entry_rename;
      bool rewind_enable;
+      bool run_ahead_enabled;
+      bool run_ahead_secondary_instance;
      bool pause_nonactive;
      bool block_sram_overwrite;
      bool savestate_auto_index;
@@ -331,6 +347,7 @@ typedef struct settings
      unsigned video_window_x;
      unsigned video_window_y;
      unsigned video_window_opacity;
+      unsigned crt_switch_resolution_super;  
      unsigned video_monitor_index;
      unsigned video_fullscreen_x;
      unsigned video_fullscreen_y;
@@ -346,10 +363,12 @@ typedef struct settings
      unsigned video_msg_bgcolor_blue;

      unsigned menu_thumbnails;
+      unsigned menu_left_thumbnails;
      unsigned menu_dpi_override_value;
      unsigned menu_entry_normal_color;
      unsigned menu_entry_hover_color;
      unsigned menu_title_color;
+      unsigned menu_xmb_layout;
      unsigned menu_xmb_shader_pipeline;
      unsigned menu_xmb_scale_factor;
      unsigned menu_xmb_alpha_factor;
@@ -373,11 +392,13 @@ typedef struct settings
      unsigned input_libretro_device[MAX_USERS];
      unsigned input_analog_dpad_mode[MAX_USERS];

-      unsigned input_keymapper_ids[RARCH_CUSTOM_BIND_LIST_END];
+      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];

      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];

      unsigned led_map[MAX_LEDS];
+
+      unsigned run_ahead_frames;
   } uints;

   struct
@@ -393,6 +414,7 @@ typedef struct settings
      char menu_driver[32];
      char cheevos_username[32];
      char cheevos_password[32];
+      char cheevos_token[32];
      char video_context_driver[32];
      char audio_driver[32];
      char audio_resampler[32];
@@ -92,17 +92,16 @@ void content_clear_subsystem(void);
 void content_set_subsystem(unsigned subsystem);

 /* Get the current subsystem*/
-int content_get_subsystem();
+int content_get_subsystem(void);

 /* Add a rom to the subsystem rom buffer */
 void content_add_subsystem(const char* path);

 /* Get the current subsystem rom id */
-int content_get_subsystem_rom_id();
+unsigned content_get_subsystem_rom_id(void);

 /* Set environment variables before a subsystem load */
-void content_set_subsystem_info();
-
+void content_set_subsystem_info(void);

 RETRO_END_DECLS

@@ -170,6 +170,9 @@ bool core_set_poll_type(unsigned *type);
 /* Runs the core for one frame. */
 bool core_run(void);

+/* Runs the core for one frame, but does not trigger any input polling */
+bool core_run_no_input_polling(void);
+
 bool core_init(void);

 bool core_deinit(void *data);
@@ -44,6 +44,11 @@
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"

+#ifdef HAVE_RUNAHEAD
+#include "runahead/copy_load_info.h"
+#include "runahead/secondary_core.h"
+#endif
+
 struct                     retro_callbacks retro_ctx;
 struct                     retro_core_t current_core;

@@ -262,6 +267,11 @@ bool core_set_controller_port_device(retro_ctx_controller_info_t *pad)
 {
   if (!pad)
      return false;
+
+#ifdef HAVE_RUNAHEAD
+   remember_controller_port_device(pad->port, pad->device);
+#endif
+
   current_core.retro_set_controller_port_device(pad->port, pad->device);
   return true;
 }
@@ -280,6 +290,11 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
   bool contentless = false;
   bool is_inited   = false;

+#ifdef HAVE_RUNAHEAD
+   set_load_content_info(load_info);
+   clear_controller_port_map();
+#endif
+
   content_get_status(&contentless, &is_inited);

   if (load_info && load_info->special)
@@ -424,6 +439,12 @@ bool core_run(void)
   return true;
 }

+bool core_run_no_input_polling(void)
+{
+   current_core.retro_run();
+   return true;
+}
+
 bool core_load(unsigned poll_type_behavior)
 {
   current_core.poll_type = poll_type_behavior;
@@ -17,6 +17,7 @@

 #include <compat/strl.h>
 #include <string/stdstring.h>
+#include <file/config_file.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <file/archive_file.h>
@@ -26,14 +27,10 @@
 #include "config.h"
 #endif

-#include "retroarch.h"
 #include "verbosity.h"

-#include "config.def.h"
 #include "core_info.h"
-#include "configuration.h"
 #include "file_path_special.h"
-#include "list_special.h"

 static const char *core_info_tmp_path               = NULL;
 static const struct string_list *core_info_tmp_list = NULL;
@@ -154,6 +151,7 @@ static void core_info_list_free(core_info_list_t *core_info_list)
      free(info->systemname);
      free(info->system_manufacturer);
      free(info->display_name);
+      free(info->display_version);
      free(info->supported_extensions);
      free(info->authors);
      free(info->permissions);
@@ -224,21 +222,23 @@ static bool core_info_list_iterate(
   return true;
 }

-static core_info_list_t *core_info_list_new(const char *path)
+static core_info_list_t *core_info_list_new(const char *path,
+      const char *libretro_info_dir,
+      const char *exts,
+      bool show_hidden_files)
 {
   size_t i;
   core_info_t *core_info           = NULL;
   core_info_list_t *core_info_list = NULL;
-   struct string_list *contents     = dir_list_new_special(
-                                      path, DIR_LIST_CORES, NULL);
-   settings_t             *settings = config_get_ptr();
-   const char       *path_basedir   = !string_is_empty(settings->paths.path_libretro_info) ?
-      settings->paths.path_libretro_info : settings->paths.directory_libretro;
-
+   const char       *path_basedir   = libretro_info_dir;
+   struct string_list *contents     = dir_list_new(
+                                      path, exts,
+                                      false,
+                                      show_hidden_files,
+                                      false, false);
   if (!contents)
      return NULL;

-
   core_info_list = (core_info_list_t*)calloc(1, sizeof(*core_info_list));
   if (!core_info_list)
      goto error;
@@ -279,6 +279,13 @@ static core_info_list_t *core_info_list_new(const char *path)
            free(tmp);
            tmp = NULL;
         }
+         if (config_get_string(conf, "display_version", &tmp)
+               && !string_is_empty(tmp))
+         {
+            core_info[i].display_version = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
         if (config_get_string(conf, "corename", &tmp)
               && !string_is_empty(tmp))
         {
@@ -518,7 +525,8 @@ static core_info_t *core_info_find_internal(
 static bool core_info_list_update_missing_firmware_internal(
      core_info_list_t *core_info_list,
      const char *core,
-      const char *systemdir)
+      const char *systemdir,
+      bool *set_missing_bios)
 {
   size_t i;
   core_info_t      *info = NULL;
@@ -535,7 +543,6 @@ static bool core_info_list_update_missing_firmware_internal(

   path                   = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
   path[0]                = '\0';
-   rarch_ctl(RARCH_CTL_UNSET_MISSING_BIOS, NULL);

   for (i = 0; i < info->firmware_count; i++)
   {
@@ -547,7 +554,7 @@ static bool core_info_list_update_missing_firmware_internal(
      info->firmware[i].missing = !filestream_exists(path);
      if (info->firmware[i].missing && !info->firmware[i].optional)
      {
-         rarch_ctl(RARCH_CTL_SET_MISSING_BIOS, NULL);
+         *set_missing_bios = true;
         RARCH_WARN("Firmware missing: %s\n", info->firmware[i].path);
      }
   }
@@ -635,14 +642,13 @@ void core_info_deinit_list(void)
   core_info_curr_list = NULL;
 }

-bool core_info_init_list(void)
+bool core_info_init_list(const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files)
 {
-   settings_t *settings = config_get_ptr();
-
-   if (settings)
-      core_info_curr_list = core_info_list_new(settings->paths.directory_libretro);
-
-   if (!core_info_curr_list)
+   if (!(core_info_curr_list = core_info_list_new(dir_cores,
+               !string_is_empty(path_info) ? path_info : dir_cores,
+               exts,
+               show_hidden_files)))
      return false;
   return true;
 }
@@ -655,13 +661,15 @@ bool core_info_get_list(core_info_list_t **core)
   return true;
 }

-bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info)
+bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
+      bool *set_missing_bios)
 {
   if (!info)
      return false;
   return core_info_list_update_missing_firmware_internal(
         core_info_curr_list,
-         info->path, info->directory.system);
+         info->path, info->directory.system,
+         set_missing_bios);
 }

 bool core_info_load(core_info_ctx_find_t *info)
@@ -751,16 +759,15 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
   *num_infos = supported;
 }

-void core_info_get_name(const char *path, char *s, size_t len)
+void core_info_get_name(const char *path, char *s, size_t len,
+      const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files)
 {
   size_t i;
-   settings_t             *settings = config_get_ptr();
-   struct string_list *contents     = dir_list_new_special(
-         settings->paths.directory_libretro,
-         DIR_LIST_CORES, NULL);
-   const char       *path_basedir   = !string_is_empty(settings->paths.path_libretro_info) ?
-      settings->paths.path_libretro_info : settings->paths.directory_libretro;
-
+   const char       *path_basedir   = !string_is_empty(path_info) ?
+      path_info : dir_cores;
+   struct string_list *contents     = dir_list_new(
+         dir_cores, exts, false, show_hidden_files, false, false);
   if (!contents)
      return;

@@ -786,7 +793,7 @@ void core_info_get_name(const char *path, char *s, size_t len)
         continue;
      }

-      conf = config_file_new(info_path);
+      conf                            = config_file_new(info_path);

      if (!conf)
      {
@@ -43,6 +43,7 @@ typedef struct
   char *path;
   void *config_data;
   char *display_name;
+   char *display_version;
   char *core_name;
   char *system_manufacturer;
   char *systemname;
@@ -97,7 +98,9 @@ bool core_info_list_get_display_name(core_info_list_t *list,

 bool core_info_get_display_name(const char *path, char *s, size_t len);

-void core_info_get_name(const char *path, char *s, size_t len);
+void core_info_get_name(const char *path, char *s, size_t len,
+      const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files);

 core_info_t *core_info_get(core_info_list_t *list, size_t i);

@@ -109,11 +112,13 @@ bool core_info_get_current_core(core_info_t **core);

 void core_info_deinit_list(void);

-bool core_info_init_list(void);
+bool core_info_init_list(const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files);

 bool core_info_get_list(core_info_list_t **core);

-bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info);
+bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
+      bool *set_missing_bios);

 bool core_info_find(core_info_ctx_find_t *info, const char *name);

@@ -98,12 +98,6 @@ ifneq (,$(findstring gles,$(platform)))
   CFLAGS += -DHAVE_OPENGLES
 endif

-ifneq (,$(findstring qnx,$(platform)))
-CFLAGS += -Wc,-std=c99
-else
-CFLAGS += -std=gnu99
-endif
-
 # Locale support should be enabled by default, as it's most common.
 ifneq ($(locale),false)
 	CFLAGS += -DHAVE_LOCALE
@@ -120,7 +114,7 @@ endif
 CFLAGS   += -I../../libretro-common/include

 OBJECTS	:= mpv-libretro.o
-LDFLAGS	+= -lmpv
+LDFLAGS	+= -lmpv -ldl -lm
 CFLAGS	+= -Wall -pedantic

 all: $(TARGET)
@@ -1,27 +1,31 @@
 /* mpv media player libretro core
 * Copyright (C) 2018 Mahyar Koshkouei
- * 
+ *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
- * 
+ *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-
-#include <dlfcn.h>
+ 
+#include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#ifdef HAVE_OPENGLES
+#include <dlfcn.h>
+#endif
+
 #ifdef HAVE_LOCALE
 #include <locale.h>
 #endif
@@ -29,7 +33,7 @@
 #include <mpv/client.h>
 #include <mpv/opengl_cb.h>

-#include "libretro.h"
+#include <libretro.h>
 #include "version.h"

 static struct retro_hw_render_callback hw_render;
@@ -56,6 +60,13 @@ static int64_t *playback_time = 0;
 /* filepath required globaly as mpv is reopened on context change */
 static char *filepath = NULL;

+static volatile int frame_queue = 0;
+
+void queue_new_frame(void *cb_ctx)
+{
+	frame_queue++;
+}
+
 static void fallback_log(enum retro_log_level level, const char *fmt, ...)
 {
 	(void)level;
@@ -123,19 +134,24 @@ static void *get_proc_address_mpv(void *fn_ctx, const char *name)
 	void *proc_addr = (void *) hw_render.get_proc_address(name);
 #pragma GCC diagnostic pop

-    // EGL 1.4 (supported by the RPI firmware) does not necessarily return
-    // function pointers for core functions.
-    if (!proc_addr) {
-		void *h = dlopen("/opt/vc/lib/libGLESv2.so", RTLD_LAZY);
+#ifdef HAVE_OPENGLES
+	/* EGL 1.4 (supported by the RPI firmware) does not necessarily return
+	 * function pointers for core functions.
+	 */
+	if (!proc_addr)
+   {
+      void *h = dlopen("/opt/vc/lib/libGLESv2.so", RTLD_LAZY);

-		if (!h)
-			h = dlopen("/usr/lib/libGLESv2.so", RTLD_LAZY);
+      if (!h)
+         h = dlopen("/usr/lib/libGLESv2.so", RTLD_LAZY);

-        if (h) {
-            proc_addr = dlsym(h, name);
-            dlclose(h);
-        }
-    }
+      if (h)
+      {
+         proc_addr = dlsym(h, name);
+         dlclose(h);
+      }
+   }
+#endif

 	if(proc_addr == NULL)
 		log_cb(RETRO_LOG_ERROR, "Failure obtaining %s proc address\n", name);
@@ -293,6 +309,13 @@ static void context_reset(void)
 		goto err;
 	}

+	mpv_opengl_cb_set_update_callback(mpv_gl, queue_new_frame, NULL);
+
+	mpv_set_option_string(mpv, "ao", "audio-cb");
+
+	/* Attempt to enable hardware acceleration. MPV will fallback to software
+	 * decoding on failure.
+	 */
 	if(mpv_set_option_string(mpv, "hwdec", "auto") < 0)
 		log_cb(RETRO_LOG_ERROR, "failed to set hwdec option\n");

@@ -316,6 +339,17 @@ static void context_reset(void)
 		usleep(10);
 	}

+	/* TODO #2: Check for the highest samplerate in audio stream, and use that.
+	 * Fall back to 48kHz otherwise.
+	 * We currently force the audio to be sampled at 48KHz.
+	 */
+	mpv_set_option_string(mpv, "audio-samplerate", "48000");
+	mpv_set_option_string(mpv, "opengl-swapinterval", "0");
+
+	/* The following works best when vsync is switched off in Retroarch. */
+	//mpv_set_option_string(mpv, "video-sync", "display-resample");
+	//mpv_set_option_string(mpv, "display-fps", "60");
+
 	log_cb(RETRO_LOG_INFO, "Context reset.\n");

 	return;
@@ -380,20 +414,25 @@ void retro_reset(void)
 	return;
 }

-#if 0
-static void audio_callback(void)
+static void audio_callback(double fps)
 {
-	static unsigned phase;
+	/* Obtain len samples to reduce lag. */
+	int len = 48000 / (int)floor(fps);
+	static int16_t frames[512];

-	for (unsigned i = 0; i < 30000 / 60; i++, phase++)
+	while(len > 0)
 	{
-		int16_t val = 0x800 * sinf(2.0f * M_PI * phase * 300.0f / 30000.0f);
-		audio_cb(val, val);
-	}
+		int mpv_len = mpv_audio_callback(&frames, len > 512 ? 512*2 : len*2);
+		//printf("mpv cb: %d\n", mpv_len);
+		if(mpv_len < 1)
+			return;

-	phase %= 100;
+		len -= mpv_len;
+
+		//printf("acb: %lu\n", audio_batch_cb(frames, mpv_len));
+		audio_batch_cb(frames, mpv_len);
+	}
 }
-#endif

 static void retropad_update_input(void)
 {
@@ -413,7 +452,7 @@ static void retropad_update_input(void)
 	/* A ternary operator is used since input_state_cb returns an int16_t, but
 	 * we only care about whether the button is on or off which is why we store
 	 * the value in a single bit for each button.
-	 * 
+	 *
 	 * Unsure if saving the memory is worth the extra checks, costing CPU time,
 	 * but both are incredibly miniscule anyway.
 	 */
@@ -470,12 +509,14 @@ void retro_run(void)
 	 * retro_get_system_av_info() call.
 	 */
 	static bool updated_video_dimensions = false;
-	static int64_t width, height;
+	static int64_t width = 0, height = 0;
+	static double container_fps = 30.0f;

 	if(updated_video_dimensions == false)
 	{
 		mpv_get_property(mpv, "dwidth", MPV_FORMAT_INT64, &width);
 		mpv_get_property(mpv, "dheight", MPV_FORMAT_INT64, &height);
+		mpv_get_property(mpv, "container-fps", MPV_FORMAT_DOUBLE, &container_fps);

 		/* We don't know the dimensions of the video when
 		 * retro_get_system_av_info is called, so we have to set it here for
@@ -492,18 +533,44 @@ void retro_run(void)
 			.aspect_ratio = -1,
 		};

-		environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &geometry);
+		log_cb(RETRO_LOG_INFO, "Setting fps to %f\n", container_fps);
+
+		struct retro_system_timing timing = {
+			.fps = container_fps,
+			.sample_rate = 48000.0f,
+		};
+
+		struct retro_system_av_info av_info = {
+			.geometry = geometry,
+			.timing = timing,
+		};
+
+		if(width > 0 && height > 0)
+			environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &av_info);
+
 		updated_video_dimensions = true;
 	}

 	print_mpv_logs();

 	retropad_update_input();
-	/* TODO #2: Implement an audio callback feature in to libmpv */
-	/* audio_callback(); */

+	/* TODO #2: Implement an audio callback feature in to libmpv */
+	audio_callback(container_fps);
+
+#if 1
+	if(frame_queue > 0)
+	{
+		mpv_opengl_cb_draw(mpv_gl, hw_render.get_current_framebuffer(), width, height);
+		video_cb(RETRO_HW_FRAME_BUFFER_VALID, width, height, 0);
+		frame_queue--;
+	}
+	else
+		video_cb(NULL, width, height, 0);
+#else
 	mpv_opengl_cb_draw(mpv_gl, hw_render.get_current_framebuffer(), width, height);
 	video_cb(RETRO_HW_FRAME_BUFFER_VALID, width, height, 0);
+#endif
 	return;
 }

@@ -1,5 +1,6 @@
 #include <3ds.h>
 #include <sys/iosupport.h>
+#include <3ds/services/apt.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -21,46 +21,16 @@
 #include <compat/strl.h>
 #include <retro_endianness.h>
 #include <file/file_path.h>
+#include <lists/string_list.h>
+#include <lists/dir_list.h>
 #include <string/stdstring.h>

 #include "libretro-db/libretrodb.h"

-#include "list_special.h"
+#include "core_info.h"
 #include "database_info.h"
-#include "msg_hash.h"
 #include "verbosity.h"

-#define DB_CURSOR_ROM_NAME                      0x16bbcf13U
-#define DB_CURSOR_NAME                          0x7c9b0c46U
-#define DB_CURSOR_DESCRIPTION                   0x91b0c789U
-#define DB_CURSOR_GENRE                         0x0f802156U
-#define DB_CURSOR_PUBLISHER                     0x5e099013U
-#define DB_CURSOR_DEVELOPER                     0x1783d2abU
-#define DB_CURSOR_ORIGIN                        0x1315e3edU
-#define DB_CURSOR_FRANCHISE                     0xc3a526b8U
-#define DB_CURSOR_BBFC_RATING                   0xede26836U
-#define DB_CURSOR_ESRB_RATING                   0x4c3fa255U
-#define DB_CURSOR_ELSPA_RATING                  0xd9cab41eU
-#define DB_CURSOR_CERO_RATING                   0x084a1772U
-#define DB_CURSOR_PEGI_RATING                   0x431b736eU
-#define DB_CURSOR_CHECKSUM_CRC32                0x0b88671dU
-#define DB_CURSOR_CHECKSUM_SHA1                 0x7c9de632U
-#define DB_CURSOR_CHECKSUM_MD5                  0x0b888fabU
-#define DB_CURSOR_ENHANCEMENT_HW                0xab612029U
-#define DB_CURSOR_EDGE_MAGAZINE_REVIEW          0xd3573eabU
-#define DB_CURSOR_EDGE_MAGAZINE_RATING          0xd30dc4feU
-#define DB_CURSOR_EDGE_MAGAZINE_ISSUE           0xa0f30d42U
-#define DB_CURSOR_FAMITSU_MAGAZINE_RATING       0x0a50ca62U
-#define DB_CURSOR_TGDB_RATING                   0x8d61458aU
-#define DB_CURSOR_MAX_USERS                     0x1084ff77U
-#define DB_CURSOR_RELEASEDATE_MONTH             0x790ad76cU
-#define DB_CURSOR_RELEASEDATE_YEAR              0x7fd06ed7U
-#define DB_CURSOR_RUMBLE_SUPPORTED              0x1a4dc3ecU
-#define DB_CURSOR_COOP_SUPPORTED                0x7c953ff6U
-#define DB_CURSOR_ANALOG_SUPPORTED              0xf220fc17U
-#define DB_CURSOR_SIZE                          0x7c9dede0U
-#define DB_CURSOR_SERIAL                        0x1b843ec5U
-
 int database_info_build_query_enum(char *s, size_t len,
      enum database_query_type type,
      const char *path)
@@ -201,7 +171,6 @@ static int database_cursor_iterate(libretrodb_cursor_t *cur,

   for (i = 0; i < item.val.map.len; i++)
   {
-      uint32_t                 value = 0;
      struct rmsgpack_dom_value *key = &item.val.map.items[i].key;
      struct rmsgpack_dom_value *val = &item.val.map.items[i].value;
      const char *val_string         = NULL;
@@ -209,121 +178,123 @@ static int database_cursor_iterate(libretrodb_cursor_t *cur,
      if (!key || !val)
         continue;

-      val_string = val->val.string.buff;
-      str        = key->val.string.buff;
-      value      = msg_hash_calculate(str);
+      val_string                     = val->val.string.buff;
+      str                            = key->val.string.buff;

-      switch (value)
+      if (string_is_equal(str, "publisher"))
      {
-         case DB_CURSOR_SERIAL:
-            if (!string_is_empty(val_string))
-               db_info->serial = strdup(val_string);
-            break;
-         case DB_CURSOR_ROM_NAME:
-            if (!string_is_empty(val_string))
-               db_info->rom_name = strdup(val_string);
-            break;
-         case DB_CURSOR_NAME:
-            if (!string_is_empty(val_string))
-               db_info->name = strdup(val_string);
-            break;
-         case DB_CURSOR_DESCRIPTION:
-            if (!string_is_empty(val_string))
-               db_info->description = strdup(val_string);
-            break;
-         case DB_CURSOR_GENRE:
-            if (!string_is_empty(val_string))
-               db_info->genre = strdup(val_string);
-            break;
-         case DB_CURSOR_PUBLISHER:
-            if (!string_is_empty(val_string))
-               db_info->publisher = strdup(val_string);
-            break;
-         case DB_CURSOR_DEVELOPER:
-            if (!string_is_empty(val_string))
-               db_info->developer = string_split(val_string, "|");
-            break;
-         case DB_CURSOR_ORIGIN:
-            if (!string_is_empty(val_string))
-               db_info->origin = strdup(val_string);
-            break;
-         case DB_CURSOR_FRANCHISE:
-            if (!string_is_empty(val_string))
-               db_info->franchise = strdup(val_string);
-            break;
-         case DB_CURSOR_BBFC_RATING:
-            if (!string_is_empty(val_string))
-               db_info->bbfc_rating = strdup(val_string);
-            break;
-         case DB_CURSOR_ESRB_RATING:
-            if (!string_is_empty(val_string))
-               db_info->esrb_rating = strdup(val_string);
-            break;
-         case DB_CURSOR_ELSPA_RATING:
-            if (!string_is_empty(val_string))
-               db_info->elspa_rating = strdup(val_string);
-            break;
-         case DB_CURSOR_CERO_RATING:
-            if (!string_is_empty(val_string))
-               db_info->cero_rating          = strdup(val_string);
-            break;
-         case DB_CURSOR_PEGI_RATING:
-            if (!string_is_empty(val_string))
-               db_info->pegi_rating          = strdup(val_string);
-            break;
-         case DB_CURSOR_ENHANCEMENT_HW:
-            if (!string_is_empty(val_string))
-               db_info->enhancement_hw       = strdup(val_string);
-            break;
-         case DB_CURSOR_EDGE_MAGAZINE_REVIEW:
-            if (!string_is_empty(val_string))
-               db_info->edge_magazine_review = strdup(val_string);
-            break;
-         case DB_CURSOR_EDGE_MAGAZINE_RATING:
-            db_info->edge_magazine_rating    = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_EDGE_MAGAZINE_ISSUE:
-            db_info->edge_magazine_issue     = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_FAMITSU_MAGAZINE_RATING:
-            db_info->famitsu_magazine_rating = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_TGDB_RATING:
-            db_info->tgdb_rating             = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_MAX_USERS:
-            db_info->max_users               = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_RELEASEDATE_MONTH:
-            db_info->releasemonth            = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_RELEASEDATE_YEAR:
-            db_info->releaseyear             = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_RUMBLE_SUPPORTED:
-            db_info->rumble_supported        = (int)val->val.uint_;
-            break;
-         case DB_CURSOR_COOP_SUPPORTED:
-            db_info->coop_supported          = (int)val->val.uint_;
-            break;
-         case DB_CURSOR_ANALOG_SUPPORTED:
-            db_info->analog_supported        = (int)val->val.uint_;
-            break;
-         case DB_CURSOR_SIZE:
-            db_info->size                    = (unsigned)val->val.uint_;
-            break;
-         case DB_CURSOR_CHECKSUM_CRC32:
-            db_info->crc32 = swap_if_little32(*(uint32_t*)val->val.binary.buff);
-            break;
-         case DB_CURSOR_CHECKSUM_SHA1:
-            db_info->sha1 = bin_to_hex_alloc((uint8_t*)val->val.binary.buff, val->val.binary.len);
-            break;
-         case DB_CURSOR_CHECKSUM_MD5:
-            db_info->md5 = bin_to_hex_alloc((uint8_t*)val->val.binary.buff, val->val.binary.len);
-            break;
-         default:
-            RARCH_LOG("Unknown key: %s\n", str);
-            break;
+         if (!string_is_empty(val_string))
+            db_info->publisher = strdup(val_string);
+      }
+      else if (string_is_equal(str, "developer"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->developer = string_split(val_string, "|");
+      }
+      else if (string_is_equal(str, "serial"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->serial = strdup(val_string);
+      }
+      else if (string_is_equal(str, "rom_name"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->rom_name = strdup(val_string);
+      }
+      else if (string_is_equal(str, "name"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->name = strdup(val_string);
+      }
+      else if (string_is_equal(str, "description"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->description = strdup(val_string);
+      }
+      else if (string_is_equal(str, "genre"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->genre = strdup(val_string);
+      }
+      else if (string_is_equal(str, "origin"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->origin = strdup(val_string);
+      }
+      else if (string_is_equal(str, "franchise"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->franchise = strdup(val_string);
+      }
+      else if (string_is_equal(str, "bbfc_rating"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->bbfc_rating = strdup(val_string);
+      }
+      else if (string_is_equal(str, "esrb_rating"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->esrb_rating = strdup(val_string);
+      }
+      else if (string_is_equal(str, "elspa_rating"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->elspa_rating = strdup(val_string);
+      }
+      else if (string_is_equal(str, "cero_rating"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->cero_rating          = strdup(val_string);
+      }
+      else if (string_is_equal(str, "pegi_rating"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->pegi_rating          = strdup(val_string);
+      }
+      else if (string_is_equal(str, "enhancement_hw"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->enhancement_hw       = strdup(val_string);
+      }
+      else if (string_is_equal(str, "edge_review"))
+      {
+         if (!string_is_empty(val_string))
+            db_info->edge_magazine_review = strdup(val_string);
+      }
+      else if (string_is_equal(str, "edge_rating"))
+         db_info->edge_magazine_rating    = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "edge_issue"))
+         db_info->edge_magazine_issue     = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "famitsu_rating"))
+         db_info->famitsu_magazine_rating = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "tgdb_rating"))
+         db_info->tgdb_rating             = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "users"))
+         db_info->max_users               = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "releasemonth"))
+         db_info->releasemonth            = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "releaseyear"))
+         db_info->releaseyear             = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "rumble"))
+         db_info->rumble_supported        = (int)val->val.uint_;
+      else if (string_is_equal(str, "coop"))
+         db_info->coop_supported          = (int)val->val.uint_;
+      else if (string_is_equal(str, "analog"))
+         db_info->analog_supported        = (int)val->val.uint_;
+      else if (string_is_equal(str, "size"))
+         db_info->size                    = (unsigned)val->val.uint_;
+      else if (string_is_equal(str, "crc"))
+         db_info->crc32 = swap_if_little32(
+               *(uint32_t*)val->val.binary.buff);
+      else if (string_is_equal(str, "sha1"))
+         db_info->sha1 = bin_to_hex_alloc(
+               (uint8_t*)val->val.binary.buff, val->val.binary.len);
+      else if (string_is_equal(str, "md5"))
+         db_info->md5 = bin_to_hex_alloc(
+               (uint8_t*)val->val.binary.buff, val->val.binary.len);
+      else
+      {
+         RARCH_LOG("Unknown key: %s\n", str);
      }
   }

@@ -371,22 +342,22 @@ static int database_cursor_close(libretrodb_t *db, libretrodb_cursor_t *cur)
   return 0;
 }

-static bool type_is_prioritized(enum msg_file_type type)
+static bool type_is_prioritized(const char *path)
 {
-   return (type == FILE_TYPE_CUE || type == FILE_TYPE_GDI);
-}
-
-static enum msg_file_type file_type(const char *path)
-{
-   return msg_hash_to_file_type(msg_hash_calculate(path_get_extension(path)));
+   const char *ext = path_get_extension(path);
+   if (string_is_equal_noncase(ext, "cue"))
+      return true;
+   if (string_is_equal_noncase(ext, "gdi"))
+      return true;
+   return false;
 }

 static int dir_entry_compare(const void *left, const void *right)
 {
   const struct string_list_elem *le = (const struct string_list_elem*)left;
   const struct string_list_elem *re = (const struct string_list_elem*)right;
-   bool                            l = type_is_prioritized(file_type(le->data));
-   bool                            r = type_is_prioritized(file_type(re->data));
+   bool                            l = type_is_prioritized(le->data);
+   bool                            r = type_is_prioritized(re->data);

   return (int) r - (int) l;
 }
@@ -397,37 +368,44 @@ static void dir_list_prioritize(struct string_list *list)
 }

 database_info_handle_t *database_info_dir_init(const char *dir,
-      enum database_type type, retro_task_t *task)
+      enum database_type type, retro_task_t *task,
+      bool show_hidden_files)
 {
-   database_info_handle_t     *db  = (database_info_handle_t*)
+   core_info_list_t *core_info_list = NULL;
+   struct string_list       *list   = NULL;
+   database_info_handle_t     *db   = (database_info_handle_t*)
      calloc(1, sizeof(*db));

   if (!db)
      return NULL;

-   db->list           = dir_list_new_special(dir, DIR_LIST_RECURSIVE, NULL);
+   core_info_get_list(&core_info_list);

-   if (!db->list)
-      goto error;
+   list = dir_list_new(dir, core_info_list->all_ext,
+         false, show_hidden_files,
+         false, true);

-   dir_list_prioritize(db->list);
+   if (!list)
+   {
+      free(db);
+      return NULL;
+   }

+   dir_list_prioritize(list);
+
+   db->list           = list;
   db->list_ptr       = 0;
   db->status         = DATABASE_STATUS_ITERATE;
   db->type           = type;

   return db;
-
-error:
-   if (db)
-      free(db);
-   return NULL;
 }

 database_info_handle_t *database_info_file_init(const char *path,
      enum database_type type, retro_task_t *task)
 {
   union string_list_elem_attr attr;
+   struct string_list        *list  = NULL;
   database_info_handle_t      *db  = (database_info_handle_t*)
      calloc(1, sizeof(*db));

@@ -436,23 +414,22 @@ database_info_handle_t *database_info_file_init(const char *path,

   attr.i             = 0;

-   db->list           = string_list_new();
+   list               = string_list_new();

-   if (!db->list)
-      goto error;
+   if (!list)
+   {
+      free(db);
+      return NULL;
+   }

-   string_list_append(db->list, path, attr);
+   string_list_append(list, path, attr);

   db->list_ptr       = 0;
+   db->list           = list;
   db->status         = DATABASE_STATUS_ITERATE;
   db->type           = type;

   return db;
-
-error:
-   if (db)
-      free(db);
-   return NULL;
 }

 void database_info_free(database_info_handle_t *db)
@@ -126,7 +126,8 @@ database_info_list_t *database_info_list_new(const char *rdb_path,
 void database_info_list_free(database_info_list_t *list);

 database_info_handle_t *database_info_dir_init(const char *dir,
-      enum database_type type, retro_task_t *task);
+      enum database_type type, retro_task_t *task,
+      bool show_hidden_files);

 database_info_handle_t *database_info_file_init(const char *path,
      enum database_type type, retro_task_t *task);
@@ -2,7 +2,7 @@ language: cpp
 os:
  - linux
  - osx
-osx_image: xcode8.2
+osx_image: xcode8.3

 # Use Ubuntu 14.04 LTS (Trusty) as the Linux testing environment.
 sudo: required
@@ -13,7 +13,7 @@ env:
  - GLSLANG_REV=9c6f8cc29ba303b43ccf36deea6bb38a304f9b92 SPIRV_TOOLS_REV=e28edd458b729da7bbfd51e375feb33103709e6f

 before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python3; fi
  - git clone https://github.com/KhronosGroup/glslang.git glslang
  - git clone https://github.com/KhronosGroup/SPIRV-Tools SPIRV-Tools
  - git clone https://github.com/KhronosGroup/SPIRV-Headers.git SPIRV-Tools/external/spirv-headers
@@ -101,12 +101,17 @@ spirv_cross_add_library(spirv-cross-hlsl spirv_cross_hlsl STATIC
    ${CMAKE_CURRENT_SOURCE_DIR}/spirv_hlsl.hpp
    ${CMAKE_CURRENT_SOURCE_DIR}/spirv_hlsl.cpp)

+spirv_cross_add_library(spirv-cross-util spirv_cross_util STATIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/spirv_cross_util.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/spirv_cross_util.cpp)
+
 add_executable(spirv-cross main.cpp)
 target_compile_options(spirv-cross PRIVATE ${spirv-compiler-options})
 target_compile_definitions(spirv-cross PRIVATE ${spirv-compiler-defines})

 install(TARGETS spirv-cross RUNTIME DESTINATION bin)
-target_link_libraries(spirv-cross spirv-cross-glsl spirv-cross-hlsl spirv-cross-cpp spirv-cross-msl spirv-cross-core)
+target_link_libraries(spirv-cross spirv-cross-glsl spirv-cross-hlsl spirv-cross-cpp spirv-cross-msl spirv-cross-util spirv-cross-core)
+target_link_libraries(spirv-cross-util spirv-cross-core)
 target_link_libraries(spirv-cross-glsl spirv-cross-core)
 target_link_libraries(spirv-cross-msl spirv-cross-glsl)
 target_link_libraries(spirv-cross-hlsl spirv-cross-glsl)
@@ -7,8 +7,8 @@ SPIRV-Cross is a tool designed for parsing and converting SPIR-V to other shader
 ## Features

  - Convert SPIR-V to readable, usable and efficient GLSL
-  - Convert SPIR-V to readable, usable and efficient Metal Shading Language (MSL) [EXPERIMENTAL]
-  - Convert SPIR-V to readable, usable and efficient HLSL [EXPERIMENTAL]
+  - Convert SPIR-V to readable, usable and efficient Metal Shading Language (MSL)
+  - Convert SPIR-V to readable, usable and efficient HLSL
  - Convert SPIR-V to debuggable C++ [EXPERIMENTAL]
  - Reflection API to simplify the creation of Vulkan pipeline layouts
  - Reflection API to modify and tweak OpDecorations
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)

 LOCAL_CFLAGS += -std=c++11 -Wall -Wextra
 LOCAL_MODULE := spirv-cross
-LOCAL_SRC_FILES := ../spirv_cfg.cpp ../spirv_cross.cpp ../spirv_glsl.cpp ../spirv_msl.cpp ../spirv_cpp.cpp
+LOCAL_SRC_FILES := ../spirv_cfg.cpp ../spirv_cross.cpp ../spirv_cross_util.cpp ../spirv_glsl.cpp ../spirv_hlsl.cpp ../spirv_msl.cpp ../spirv_cpp.cpp
 LOCAL_CPP_FEATURES := exceptions
 LOCAL_ARM_MODE := arm
 LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS
@@ -15,6 +15,7 @@
 */

 #include "spirv_cpp.hpp"
+#include "spirv_cross_util.hpp"
 #include "spirv_glsl.hpp"
 #include "spirv_hlsl.hpp"
 #include "spirv_msl.hpp"
@@ -286,9 +287,9 @@ static void print_resources(const Compiler &compiler, const ShaderResources &res
 	uint64_t modes = compiler.get_execution_mode_mask();

 	fprintf(stderr, "Entry points:\n");
-	auto entry_points = compiler.get_entry_points();
+	auto entry_points = compiler.get_entry_points_and_stages();
 	for (auto &e : entry_points)
-		fprintf(stderr, "  %s (%s)\n", e.c_str(), execution_model_to_str(compiler.get_entry_point(e).model));
+		fprintf(stderr, "  %s (%s)\n", e.name.c_str(), execution_model_to_str(e.execution_model));
 	fprintf(stderr, "\n");

 	fprintf(stderr, "Execution modes:\n");
@@ -467,8 +468,15 @@ struct CLIArguments
 	vector<InterfaceVariableRename> interface_variable_renames;
 	vector<HLSLVertexAttributeRemap> hlsl_attr_remap;
 	string entry;
+	string entry_stage;

-	vector<pair<string, string>> entry_point_rename;
+	struct Rename
+	{
+		string old_name;
+		string new_name;
+		ExecutionModel execution_model;
+	};
+	vector<Rename> entry_point_rename;

 	uint32_t iterations = 1;
 	bool cpp = false;
@@ -491,12 +499,13 @@ static void print_help()
 	                "[--hlsl] [--shader-model] [--hlsl-enable-compat] "
 	                "[--separate-shader-objects]"
 	                "[--pls-in format input-name] [--pls-out format output-name] [--remap source_name target_name "
-	                "components] [--extension ext] [--entry name] [--remove-unused-variables] "
+	                "components] [--extension ext] [--entry name] [--stage <stage (vert, frag, geom, tesc, tese, "
+	                "comp)>] [--remove-unused-variables] "
 	                "[--flatten-multidimensional-arrays] [--no-420pack-extension] "
 	                "[--remap-variable-type <variable_name> <new_variable_type>] "
 	                "[--rename-interface-variable <in|out> <location> <new_variable_name>] "
 	                "[--set-hlsl-vertex-input-semantic <location> <semantic>] "
-	                "[--rename-entry-point <old> <new>] "
+	                "[--rename-entry-point <old> <new> <stage>] "
 	                "\n");
 }

@@ -584,31 +593,22 @@ static PlsFormat pls_format(const char *str)
 		return PlsNone;
 }

-void rename_interface_variable(Compiler &compiler, const vector<Resource> &resources,
-                               const InterfaceVariableRename &rename)
+static ExecutionModel stage_to_execution_model(const std::string &stage)
 {
-	for (auto &v : resources)
-	{
-		if (!compiler.has_decoration(v.id, spv::DecorationLocation))
-			continue;
-
-		auto loc = compiler.get_decoration(v.id, spv::DecorationLocation);
-		if (loc != rename.location)
-			continue;
-
-		auto &type = compiler.get_type(v.base_type_id);
-
-		// This is more of a friendly variant. If we need to rename interface variables, we might have to rename
-		// structs as well and make sure all the names match up.
-		if (type.basetype == SPIRType::Struct)
-		{
-			compiler.set_name(v.base_type_id, join("SPIRV_Cross_Interface_Location", rename.location));
-			for (uint32_t i = 0; i < uint32_t(type.member_types.size()); i++)
-				compiler.set_member_name(v.base_type_id, i, join("InterfaceMember", i));
-		}
-
-		compiler.set_name(v.id, rename.variable_name);
-	}
+	if (stage == "vert")
+		return ExecutionModelVertex;
+	else if (stage == "frag")
+		return ExecutionModelFragment;
+	else if (stage == "comp")
+		return ExecutionModelGLCompute;
+	else if (stage == "tesc")
+		return ExecutionModelTessellationControl;
+	else if (stage == "tese")
+		return ExecutionModelTessellationEvaluation;
+	else if (stage == "geom")
+		return ExecutionModelGeometry;
+	else
+		SPIRV_CROSS_THROW("Invalid stage.");
 }

 static int main_inner(int argc, char *argv[])
@@ -652,9 +652,11 @@ static int main_inner(int argc, char *argv[])
 	cbs.add("--rename-entry-point", [&args](CLIParser &parser) {
 		auto old_name = parser.next_string();
 		auto new_name = parser.next_string();
-		args.entry_point_rename.push_back({ old_name, new_name });
+		auto model = stage_to_execution_model(parser.next_string());
+		args.entry_point_rename.push_back({ old_name, new_name, move(model) });
 	});
 	cbs.add("--entry", [&args](CLIParser &parser) { args.entry = parser.next_string(); });
+	cbs.add("--stage", [&args](CLIParser &parser) { args.entry_stage = parser.next_string(); });
 	cbs.add("--separate-shader-objects", [&args](CLIParser &) { args.sso = true; });
 	cbs.add("--set-hlsl-vertex-input-semantic", [&args](CLIParser &parser) {
 		HLSLVertexAttributeRemap remap;
@@ -733,6 +735,7 @@ static int main_inner(int argc, char *argv[])
 	unique_ptr<CompilerGLSL> compiler;

 	bool combined_image_samplers = false;
+	bool build_dummy_sampler = false;

 	if (args.cpp)
 	{
@@ -755,6 +758,7 @@ static int main_inner(int argc, char *argv[])
 	else
 	{
 		combined_image_samplers = !args.vulkan_semantics;
+		build_dummy_sampler = true;
 		compiler = unique_ptr<CompilerGLSL>(new CompilerGLSL(read_spirv_file(args.input)));
 	}

@@ -770,10 +774,82 @@ static int main_inner(int argc, char *argv[])
 	}

 	for (auto &rename : args.entry_point_rename)
-		compiler->rename_entry_point(rename.first, rename.second);
+		compiler->rename_entry_point(rename.old_name, rename.new_name, rename.execution_model);

-	if (!args.entry.empty())
-		compiler->set_entry_point(args.entry);
+	auto entry_points = compiler->get_entry_points_and_stages();
+	auto entry_point = args.entry;
+	ExecutionModel model = ExecutionModelMax;
+
+	if (!args.entry_stage.empty())
+	{
+		model = stage_to_execution_model(args.entry_stage);
+		if (entry_point.empty())
+		{
+			// Just use the first entry point with this stage.
+			for (auto &e : entry_points)
+			{
+				if (e.execution_model == model)
+				{
+					entry_point = e.name;
+					break;
+				}
+			}
+
+			if (entry_point.empty())
+			{
+				fprintf(stderr, "Could not find an entry point with stage: %s\n", args.entry_stage.c_str());
+				return EXIT_FAILURE;
+			}
+		}
+		else
+		{
+			// Make sure both stage and name exists.
+			bool exists = false;
+			for (auto &e : entry_points)
+			{
+				if (e.execution_model == model && e.name == entry_point)
+				{
+					exists = true;
+					break;
+				}
+			}
+
+			if (!exists)
+			{
+				fprintf(stderr, "Could not find an entry point %s with stage: %s\n", entry_point.c_str(),
+				        args.entry_stage.c_str());
+				return EXIT_FAILURE;
+			}
+		}
+	}
+	else if (!entry_point.empty())
+	{
+		// Make sure there is just one entry point with this name, or the stage
+		// is ambiguous.
+		uint32_t stage_count = 0;
+		for (auto &e : entry_points)
+		{
+			if (e.name == entry_point)
+			{
+				stage_count++;
+				model = e.execution_model;
+			}
+		}
+
+		if (stage_count == 0)
+		{
+			fprintf(stderr, "There is no entry point with name: %s\n", entry_point.c_str());
+			return EXIT_FAILURE;
+		}
+		else if (stage_count > 1)
+		{
+			fprintf(stderr, "There is more than one entry point with name: %s. Use --stage.\n", entry_point.c_str());
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (!entry_point.empty())
+		compiler->set_entry_point(entry_point, model);

 	if (!args.set_version && !compiler->get_options().version)
 	{
@@ -816,10 +892,14 @@ static int main_inner(int argc, char *argv[])
 		{
 			// Enable all compat options.
 			hlsl_opts.point_size_compat = true;
+			hlsl_opts.point_coord_compat = true;
 		}
 		hlsl->set_options(hlsl_opts);
 	}

+	if (build_dummy_sampler)
+		compiler->build_dummy_sampler_for_combined_images();
+
 	ShaderResources res;
 	if (args.remove_unused)
 	{
@@ -858,9 +938,11 @@ static int main_inner(int argc, char *argv[])
 	for (auto &rename : args.interface_variable_renames)
 	{
 		if (rename.storageClass == StorageClassInput)
-			rename_interface_variable(*compiler, res.stage_inputs, rename);
+			spirv_cross_util::rename_interface_variable(*compiler, res.stage_inputs, rename.location,
+			                                            rename.variable_name);
 		else if (rename.storageClass == StorageClassOutput)
-			rename_interface_variable(*compiler, res.stage_outputs, rename);
+			spirv_cross_util::rename_interface_variable(*compiler, res.stage_outputs, rename.location,
+			                                            rename.variable_name);
 		else
 		{
 			fprintf(stderr, "error at --rename-interface-variable <in|out> ...\n");
@@ -887,6 +969,17 @@ static int main_inner(int argc, char *argv[])
 		}
 	}

+	if (args.hlsl)
+	{
+		auto *hlsl_compiler = static_cast<CompilerHLSL *>(compiler.get());
+		uint32_t new_builtin = hlsl_compiler->remap_num_workgroups_builtin();
+		if (new_builtin)
+		{
+			hlsl_compiler->set_decoration(new_builtin, DecorationDescriptorSet, 0);
+			hlsl_compiler->set_decoration(new_builtin, DecorationBinding, 0);
+		}
+	}
+
 	string glsl;
 	for (uint32_t i = 0; i < args.iterations; i++)
 	{
@@ -130,6 +130,7 @@
    <ClCompile Include="..\spirv_hlsl.cpp" />
    <ClCompile Include="..\spirv_msl.cpp" />
    <ClCompile Include="..\spirv_cfg.cpp" />
+    <ClCompile Include="..\spirv_cross_util.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\GLSL.std.450.h" />
@@ -141,6 +142,7 @@
    <ClInclude Include="..\spirv_hlsl.hpp" />
    <ClInclude Include="..\spirv_msl.hpp" />
    <ClInclude Include="..\spirv_cfg.hpp" />
+    <ClInclude Include="..\spirv_cross_util.hpp" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
@@ -36,6 +36,9 @@
    <ClCompile Include="..\spirv_hlsl.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\spirv_cross_util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\GLSL.std.450.h">
@@ -65,5 +68,8 @@
    <ClInclude Include="..\spirv_hlsl.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\spirv_cross_util.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
@@ -0,0 +1,29 @@
+static float4 FragColor;
+static float4 vA;
+static float4 vB;
+
+struct SPIRV_Cross_Input
+{
+    float4 vA : TEXCOORD0;
+    float4 vB : TEXCOORD1;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = fmod(vA, vB);
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    vA = stage_input.vA;
+    vB = stage_input.vB;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,19 @@
+static float4 FragColor;
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = (((1.0f.xxxx + 1.0f.xxxx) + (1.0f.xxx.xyzz + 1.0f.xxxx)) + (1.0f.xxxx + 2.0f.xxxx)) + (1.0f.xx.xyxy + 2.0f.xxxx);
+}
+
+SPIRV_Cross_Output main()
+{
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,122 @@
+RWByteAddressBuffer _15 : register(u0);
+ByteAddressBuffer _20 : register(t1);
+
+// Returns the inverse of a matrix, by using the algorithm of calculating the classical
+// adjoint and dividing by the determinant. The contents of the matrix are changed.
+float2x2 SPIRV_Cross_Inverse(float2x2 m)
+{
+    float2x2 adj;	// The adjoint matrix (inverse after dividing by determinant)
+
+    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
+    adj[0][0] =  m[1][1];
+    adj[0][1] = -m[0][1];
+
+    adj[1][0] = -m[1][0];
+    adj[1][1] =  m[0][0];
+
+    // Calculate the determinant as a combination of the cofactors of the first row.
+    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]);
+
+    // Divide the classical adjoint matrix by the determinant.
+    // If determinant is zero, matrix is not invertable, so leave it unchanged.
+    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
+}
+
+// Returns the determinant of a 2x2 matrix.
+float SPIRV_Cross_Det2x2(float a1, float a2, float b1, float b2)
+{
+    return a1 * b2 - b1 * a2;
+}
+
+// Returns the inverse of a matrix, by using the algorithm of calculating the classical
+// adjoint and dividing by the determinant. The contents of the matrix are changed.
+float3x3 SPIRV_Cross_Inverse(float3x3 m)
+{
+    float3x3 adj;	// The adjoint matrix (inverse after dividing by determinant)
+
+    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
+    adj[0][0] =  SPIRV_Cross_Det2x2(m[1][1], m[1][2], m[2][1], m[2][2]);
+    adj[0][1] = -SPIRV_Cross_Det2x2(m[0][1], m[0][2], m[2][1], m[2][2]);
+    adj[0][2] =  SPIRV_Cross_Det2x2(m[0][1], m[0][2], m[1][1], m[1][2]);
+
+    adj[1][0] = -SPIRV_Cross_Det2x2(m[1][0], m[1][2], m[2][0], m[2][2]);
+    adj[1][1] =  SPIRV_Cross_Det2x2(m[0][0], m[0][2], m[2][0], m[2][2]);
+    adj[1][2] = -SPIRV_Cross_Det2x2(m[0][0], m[0][2], m[1][0], m[1][2]);
+
+    adj[2][0] =  SPIRV_Cross_Det2x2(m[1][0], m[1][1], m[2][0], m[2][1]);
+    adj[2][1] = -SPIRV_Cross_Det2x2(m[0][0], m[0][1], m[2][0], m[2][1]);
+    adj[2][2] =  SPIRV_Cross_Det2x2(m[0][0], m[0][1], m[1][0], m[1][1]);
+
+    // Calculate the determinant as a combination of the cofactors of the first row.
+    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]);
+
+    // Divide the classical adjoint matrix by the determinant.
+    // If determinant is zero, matrix is not invertable, so leave it unchanged.
+    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
+}
+
+// Returns the determinant of a 3x3 matrix.
+float SPIRV_Cross_Det3x3(float a1, float a2, float a3, float b1, float b2, float b3, float c1, float c2, float c3)
+{
+    return a1 * SPIRV_Cross_Det2x2(b2, b3, c2, c3) - b1 * SPIRV_Cross_Det2x2(a2, a3, c2, c3) + c1 * SPIRV_Cross_Det2x2(a2, a3, b2, b3);
+}
+
+// Returns the inverse of a matrix, by using the algorithm of calculating the classical
+// adjoint and dividing by the determinant. The contents of the matrix are changed.
+float4x4 SPIRV_Cross_Inverse(float4x4 m)
+{
+    float4x4 adj;	// The adjoint matrix (inverse after dividing by determinant)
+
+    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
+    adj[0][0] =  SPIRV_Cross_Det3x3(m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][1] = -SPIRV_Cross_Det3x3(m[0][1], m[0][2], m[0][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][2] =  SPIRV_Cross_Det3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][3] = -SPIRV_Cross_Det3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3]);
+
+    adj[1][0] = -SPIRV_Cross_Det3x3(m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][1] =  SPIRV_Cross_Det3x3(m[0][0], m[0][2], m[0][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][2] = -SPIRV_Cross_Det3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][3] =  SPIRV_Cross_Det3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3]);
+
+    adj[2][0] =  SPIRV_Cross_Det3x3(m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][1] = -SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][2] =  SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][3] = -SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3]);
+
+    adj[3][0] = -SPIRV_Cross_Det3x3(m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][1] =  SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][2] = -SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][3] =  SPIRV_Cross_Det3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]);
+
+    // Calculate the determinant as a combination of the cofactors of the first row.
+    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]) + (adj[0][3] * m[3][0]);
+
+    // Divide the classical adjoint matrix by the determinant.
+    // If determinant is zero, matrix is not invertable, so leave it unchanged.
+    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
+}
+
+void comp_main()
+{
+    float2x2 _23 = asfloat(uint2x2(_20.Load2(0), _20.Load2(8)));
+    float2x2 _24 = SPIRV_Cross_Inverse(_23);
+    _15.Store2(0, asuint(_24[0]));
+    _15.Store2(8, asuint(_24[1]));
+    float3x3 _29 = asfloat(uint3x3(_20.Load3(16), _20.Load3(32), _20.Load3(48)));
+    float3x3 _30 = SPIRV_Cross_Inverse(_29);
+    _15.Store3(16, asuint(_30[0]));
+    _15.Store3(32, asuint(_30[1]));
+    _15.Store3(48, asuint(_30[2]));
+    float4x4 _35 = asfloat(uint4x4(_20.Load4(64), _20.Load4(80), _20.Load4(96), _20.Load4(112)));
+    float4x4 _36 = SPIRV_Cross_Inverse(_35);
+    _15.Store4(64, asuint(_36[0]));
+    _15.Store4(80, asuint(_36[1]));
+    _15.Store4(96, asuint(_36[2]));
+    _15.Store4(112, asuint(_36[3]));
+}
+
+[numthreads(1, 1, 1)]
+void main()
+{
+    comp_main();
+}
@@ -0,0 +1,16 @@
+RWByteAddressBuffer _10 : register(u0);
+cbuffer SPIRV_Cross_NumWorkgroups : register(b0)
+{
+    uint3 SPIRV_Cross_NumWorkgroups_count : packoffset(c0);
+};
+
+void comp_main()
+{
+    _10.Store3(0, SPIRV_Cross_NumWorkgroups_count);
+}
+
+[numthreads(1, 1, 1)]
+void main()
+{
+    comp_main();
+}
@@ -0,0 +1,23 @@
+RWByteAddressBuffer _10 : register(u0);
+cbuffer SPIRV_Cross_NumWorkgroups : register(b0)
+{
+    uint3 SPIRV_Cross_NumWorkgroups_count : packoffset(c0);
+};
+
+static uint3 gl_WorkGroupID;
+struct SPIRV_Cross_Input
+{
+    uint3 gl_WorkGroupID : SV_GroupID;
+};
+
+void comp_main()
+{
+    _10.Store3(0, SPIRV_Cross_NumWorkgroups_count + gl_WorkGroupID);
+}
+
+[numthreads(1, 1, 1)]
+void main(SPIRV_Cross_Input stage_input)
+{
+    gl_WorkGroupID = stage_input.gl_WorkGroupID;
+    comp_main();
+}
@@ -0,0 +1,30 @@
+static float gl_ClipDistance[2];
+static float gl_CullDistance[1];
+static float FragColor;
+
+struct SPIRV_Cross_Input
+{
+    float2 gl_ClipDistance0 : SV_ClipDistance0;
+    float gl_CullDistance0 : SV_CullDistance0;
+};
+
+struct SPIRV_Cross_Output
+{
+    float FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = (gl_ClipDistance[0] + gl_CullDistance[0]) + gl_ClipDistance[1];
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    gl_ClipDistance[0] = stage_input.gl_ClipDistance0.x;
+    gl_ClipDistance[1] = stage_input.gl_ClipDistance0.y;
+    gl_CullDistance[0] = stage_input.gl_CullDistance0.x;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,39 @@
+static bool gl_FrontFacing;
+static float4 FragColor;
+static float4 vA;
+static float4 vB;
+
+struct SPIRV_Cross_Input
+{
+    float4 vA : TEXCOORD0;
+    float4 vB : TEXCOORD1;
+    bool gl_FrontFacing : SV_IsFrontFace;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    if (gl_FrontFacing)
+    {
+        FragColor = vA;
+    }
+    else
+    {
+        FragColor = vB;
+    }
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    gl_FrontFacing = stage_input.gl_FrontFacing;
+    vA = stage_input.vA;
+    vB = stage_input.vB;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,19 @@
+static float3 FragColor;
+
+struct SPIRV_Cross_Output
+{
+    float3 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = float3(asfloat(0x7f800000u), asfloat(0xff800000u), asfloat(0xffc00000u));
+}
+
+SPIRV_Cross_Output main()
+{
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,32 @@
+Texture2DMS<float4> uSubpass0 : register(t0);
+Texture2DMS<float4> uSubpass1 : register(t1);
+
+static float4 gl_FragCoord;
+static int gl_SampleID;
+static float4 FragColor;
+
+struct SPIRV_Cross_Input
+{
+    float4 gl_FragCoord : SV_Position;
+    uint gl_SampleID : SV_SampleIndex;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = (uSubpass0.Load(int2(gl_FragCoord.xy), 1) + uSubpass1.Load(int2(gl_FragCoord.xy), 2)) + uSubpass0.Load(int2(gl_FragCoord.xy), gl_SampleID);
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    gl_FragCoord = stage_input.gl_FragCoord;
+    gl_SampleID = stage_input.gl_SampleID;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,29 @@
+Texture2D<float4> uSubpass0 : register(t0);
+Texture2D<float4> uSubpass1 : register(t1);
+
+static float4 gl_FragCoord;
+static float4 FragColor;
+
+struct SPIRV_Cross_Input
+{
+    float4 gl_FragCoord : SV_Position;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = uSubpass0.Load(int3(int2(gl_FragCoord.xy), 0)) + uSubpass1.Load(int3(int2(gl_FragCoord.xy), 0));
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    gl_FragCoord = stage_input.gl_FragCoord;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,19 @@
+static float2 FragColor;
+
+struct SPIRV_Cross_Output
+{
+    float2 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = float2(0.5f, 0.5f);
+}
+
+SPIRV_Cross_Output main()
+{
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,33 @@
+static const int Value = 2;
+
+cbuffer _15 : register(b0)
+{
+    float4 _15_samples[Value] : packoffset(c0);
+};
+
+static float4 FragColor;
+static int Index;
+
+struct SPIRV_Cross_Input
+{
+    nointerpolation int Index : TEXCOORD0;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = _15_samples[Index];
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    Index = stage_input.Index;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,28 @@
+static float4 gl_Position;
+static float gl_ClipDistance[2];
+static float gl_CullDistance[1];
+struct SPIRV_Cross_Output
+{
+    float4 gl_Position : SV_Position;
+    float2 gl_ClipDistance0 : SV_ClipDistance0;
+    float gl_CullDistance0 : SV_CullDistance0;
+};
+
+void vert_main()
+{
+    gl_Position = 1.0f.xxxx;
+    gl_ClipDistance[0] = 0.0f;
+    gl_ClipDistance[1] = 0.0f;
+    gl_CullDistance[0] = 4.0f;
+}
+
+SPIRV_Cross_Output main()
+{
+    vert_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.gl_Position = gl_Position;
+    stage_output.gl_ClipDistance0.x = gl_ClipDistance[0];
+    stage_output.gl_ClipDistance0.y = gl_ClipDistance[1];
+    stage_output.gl_CullDistance0.x = gl_CullDistance[0];
+    return stage_output;
+}
@@ -8,7 +8,7 @@ struct SPIRV_Cross_Output
 void vert_main()
 {
    gl_Position = 1.0f.xxxx;
-    gl_PointSize = 10.0f;
+    gl_PointSize = 1.0f;
 }

 SPIRV_Cross_Output main()
@@ -0,0 +1,31 @@
+static const float4 _20[2] = { 10.0f.xxxx, 20.0f.xxxx };
+
+static float4 gl_Position;
+static float4 vInput0;
+static float4 vInput1;
+
+struct SPIRV_Cross_Input
+{
+    float4 vInput0 : TEXCOORD0;
+    float4 vInput1 : TEXCOORD1;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 gl_Position : SV_Position;
+};
+
+void vert_main()
+{
+    gl_Position = 10.0f.xxxx + vInput1;
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    vInput0 = stage_input.vInput0;
+    vInput1 = stage_input.vInput1;
+    vert_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.gl_Position = gl_Position;
+    return stage_output;
+}
@@ -0,0 +1,23 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_in
+{
+    float4 vB [[user(locn1)]];
+    float4 vA [[user(locn0)]];
+};
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+};
+
+fragment main0_out main0(main0_in in [[stage_in]])
+{
+    main0_out out = {};
+    out.FragColor = fmod(in.vA, in.vB);
+    return out;
+}
+
@@ -0,0 +1,17 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+};
+
+fragment main0_out main0()
+{
+    main0_out out = {};
+    out.FragColor = (((float4(1.0) + float4(1.0)) + (float3(1.0).xyzz + float4(1.0))) + (float4(1.0) + float4(2.0))) + (float2(1.0).xyxy + float4(2.0));
+    return out;
+}
+
@@ -0,0 +1,123 @@
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct MatrixOut
+{
+    float2x2 m2out;
+    float3x3 m3out;
+    float4x4 m4out;
+};
+
+struct MatrixIn
+{
+    float2x2 m2in;
+    float3x3 m3in;
+    float4x4 m4in;
+};
+
+// Returns the determinant of a 2x2 matrix.
+inline float spvDet2x2(float a1, float a2, float b1, float b2)
+{
+    return a1 * b2 - b1 * a2;
+}
+
+// Returns the determinant of a 3x3 matrix.
+inline float spvDet3x3(float a1, float a2, float a3, float b1, float b2, float b3, float c1, float c2, float c3)
+{
+    return a1 * spvDet2x2(b2, b3, c2, c3) - b1 * spvDet2x2(a2, a3, c2, c3) + c1 * spvDet2x2(a2, a3, b2, b3);
+}
+
+// Returns the inverse of a matrix, by using the algorithm of calculating the classical
+// adjoint and dividing by the determinant. The contents of the matrix are changed.
+float4x4 spvInverse4x4(float4x4 m)
+{
+    float4x4 adj;	// The adjoint matrix (inverse after dividing by determinant)
+
+    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
+    adj[0][0] =  spvDet3x3(m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][1] = -spvDet3x3(m[0][1], m[0][2], m[0][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][2] =  spvDet3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[3][1], m[3][2], m[3][3]);
+    adj[0][3] = -spvDet3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3]);
+
+    adj[1][0] = -spvDet3x3(m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][1] =  spvDet3x3(m[0][0], m[0][2], m[0][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][2] = -spvDet3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[3][0], m[3][2], m[3][3]);
+    adj[1][3] =  spvDet3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3]);
+
+    adj[2][0] =  spvDet3x3(m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][1] = -spvDet3x3(m[0][0], m[0][1], m[0][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][2] =  spvDet3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[3][0], m[3][1], m[3][3]);
+    adj[2][3] = -spvDet3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3]);
+
+    adj[3][0] = -spvDet3x3(m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][1] =  spvDet3x3(m[0][0], m[0][1], m[0][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][2] = -spvDet3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[3][0], m[3][1], m[3][2]);
+    adj[3][3] =  spvDet3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]);
+
+    // Calculate the determinant as a combination of the cofactors of the first row.
+    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]) + (adj[0][3] * m[3][0]);
+
+    // Divide the classical adjoint matrix by the determinant.
+    // If determinant is zero, matrix is not invertable, so leave it unchanged.
+    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
+}
+
+// Returns the inverse of a matrix, by using the algorithm of calculating the classical
+// adjoint and dividing by the determinant. The contents of the matrix are changed.
+float3x3 spvInverse3x3(float3x3 m)
+{
+    float3x3 adj;	// The adjoint matrix (inverse after dividing by determinant)
+
+    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
+    adj[0][0] =  spvDet2x2(m[1][1], m[1][2], m[2][1], m[2][2]);
+    adj[0][1] = -spvDet2x2(m[0][1], m[0][2], m[2][1], m[2][2]);
+    adj[0][2] =  spvDet2x2(m[0][1], m[0][2], m[1][1], m[1][2]);
+
+    adj[1][0] = -spvDet2x2(m[1][0], m[1][2], m[2][0], m[2][2]);
+    adj[1][1] =  spvDet2x2(m[0][0], m[0][2], m[2][0], m[2][2]);
+    adj[1][2] = -spvDet2x2(m[0][0], m[0][2], m[1][0], m[1][2]);
+
+    adj[2][0] =  spvDet2x2(m[1][0], m[1][1], m[2][0], m[2][1]);
+    adj[2][1] = -spvDet2x2(m[0][0], m[0][1], m[2][0], m[2][1]);
+    adj[2][2] =  spvDet2x2(m[0][0], m[0][1], m[1][0], m[1][1]);
+
+    // Calculate the determinant as a combination of the cofactors of the first row.
+    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]);
+
+    // Divide the classical adjoint matrix by the determinant.
+    // If determinant is zero, matrix is not invertable, so leave it unchanged.
+    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
+}
+
+// Returns the inverse of a matrix, by using the algorithm of calculating the classical
+// adjoint and dividing by the determinant. The contents of the matrix are changed.
+float2x2 spvInverse2x2(float2x2 m)
+{
+    float2x2 adj;	// The adjoint matrix (inverse after dividing by determinant)
+
+    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
+    adj[0][0] =  m[1][1];
+    adj[0][1] = -m[0][1];
+
+    adj[1][0] = -m[1][0];
+    adj[1][1] =  m[0][0];
+
+    // Calculate the determinant as a combination of the cofactors of the first row.
+    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]);
+
+    // Divide the classical adjoint matrix by the determinant.
+    // If determinant is zero, matrix is not invertable, so leave it unchanged.
+    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
+}
+
+kernel void main0(device MatrixOut& _15 [[buffer(0)]], device MatrixIn& _20 [[buffer(1)]])
+{
+    _15.m2out = spvInverse2x2(_20.m2in);
+    _15.m3out = spvInverse3x3(_20.m3in);
+    _15.m4out = spvInverse4x4(_20.m4in);
+}
+
@@ -0,0 +1,29 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct s1
+{
+    int a;
+};
+
+struct s2
+{
+    s1 b;
+};
+
+struct dstbuffer
+{
+    s2 test[1];
+};
+
+constant s2 _31 = {};
+
+kernel void main0(device dstbuffer& _19 [[buffer(0)]])
+{
+    s2 _30 = _31;
+    _30.b.a = 0;
+    _19.test[0].b.a = _30.b.a;
+}
+
@@ -3,6 +3,8 @@

 using namespace metal;

+typedef float3x2 packed_float2x3;
+
 struct S0
 {
    float2 a[1];
@@ -58,8 +60,10 @@ struct SSBO1
    float3x2 m3;
    float2x2 m4;
    float2x2 m5[9];
-    float2x3 m6[4][2];
+    packed_float2x3 m6[4][2];
+    char pad10[8];
    float3x2 m7;
+    char pad11[8];
    float array[1];
 };

@@ -96,5 +100,6 @@ kernel void main0(device SSBO1& ssbo_430 [[buffer(0)]], device SSBO0& ssbo_140 [
    ssbo_430.content.m3s[5].c = ssbo_140.content.m3s[5].c;
    ssbo_430.content.m3s[6].c = ssbo_140.content.m3s[6].c;
    ssbo_430.content.m3s[7].c = ssbo_140.content.m3s[7].c;
+    ssbo_430.content.m1.a = ssbo_430.content.m3.a * ssbo_430.m6[1][1];
 }

@@ -1,3 +1,5 @@
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+
 #include <metal_stdlib>
 #include <simd/simd.h>

@@ -9,6 +11,12 @@ struct Foobar
    float b;
 };

+constant float4 _37[3] = {float4(1.0), float4(2.0), float4(3.0)};
+constant float4 _49[2] = {float4(1.0), float4(2.0)};
+constant float4 _54[2] = {float4(8.0), float4(10.0)};
+constant float4 _55[2][2] = {{float4(1.0), float4(2.0)}, {float4(8.0), float4(10.0)}};
+constant Foobar _75[2] = {{10.0, 40.0}, {90.0, 70.0}};
+
 struct main0_in
 {
    int index [[user(locn0)]];
@@ -19,6 +27,20 @@ struct main0_out
    float4 FragColor [[color(0)]];
 };

+// Implementation of an array copy function to cover GLSL's ability to copy an array via assignment.
+template<typename T, uint N>
+void spvArrayCopy(thread T (&dst)[N], thread const T (&src)[N])
+{
+    for (uint i = 0; i < N; dst[i] = src[i], i++);
+}
+
+// An overload for constant arrays.
+template<typename T, uint N>
+void spvArrayCopyConstant(thread T (&dst)[N], constant T (&src)[N])
+{
+    for (uint i = 0; i < N; dst[i] = src[i], i++);
+}
+
 fragment main0_out main0(main0_in in [[stage_in]])
 {
    main0_out out = {};
@@ -1,3 +1,5 @@
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+
 #include <metal_stdlib>
 #include <simd/simd.h>

@@ -9,6 +11,9 @@ struct Foo
    float b;
 };

+constant float _16[4] = {1.0, 4.0, 3.0, 2.0};
+constant Foo _28[2] = {{10.0, 20.0}, {30.0, 40.0}};
+
 struct main0_in
 {
    int line [[user(locn0)]];
@@ -19,6 +24,20 @@ struct main0_out
    float4 FragColor [[color(0)]];
 };

+// Implementation of an array copy function to cover GLSL's ability to copy an array via assignment.
+template<typename T, uint N>
+void spvArrayCopy(thread T (&dst)[N], thread const T (&src)[N])
+{
+    for (uint i = 0; i < N; dst[i] = src[i], i++);
+}
+
+// An overload for constant arrays.
+template<typename T, uint N>
+void spvArrayCopyConstant(thread T (&dst)[N], constant T (&src)[N])
+{
+    for (uint i = 0; i < N; dst[i] = src[i], i++);
+}
+
 fragment main0_out main0(main0_in in [[stage_in]])
 {
    main0_out out = {};
@@ -0,0 +1,30 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_in
+{
+    float4 vB [[user(locn1)]];
+    float4 vA [[user(locn0)]];
+};
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+};
+
+fragment main0_out main0(main0_in in [[stage_in]], bool gl_FrontFacing [[front_facing]])
+{
+    main0_out out = {};
+    if (gl_FrontFacing)
+    {
+        out.FragColor = in.vA;
+    }
+    else
+    {
+        out.FragColor = in.vB;
+    }
+    return out;
+}
+
@@ -0,0 +1,17 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_out
+{
+    float3 FragColor [[color(0)]];
+};
+
+fragment main0_out main0()
+{
+    main0_out out = {};
+    out.FragColor = float3(as_type<float>(0x7f800000u), as_type<float>(0xff800000u), as_type<float>(0xffc00000u));
+    return out;
+}
+
@@ -0,0 +1,17 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+};
+
+fragment main0_out main0(texture2d_ms<float> uSubpass0 [[texture(0)]], texture2d_ms<float> uSubpass1 [[texture(1)]], uint gl_SampleID [[sample_id]], float4 gl_FragCoord [[position]])
+{
+    main0_out out = {};
+    out.FragColor = (uSubpass0.read(uint2(gl_FragCoord.xy), 1) + uSubpass1.read(uint2(gl_FragCoord.xy), 2)) + uSubpass0.read(uint2(gl_FragCoord.xy), gl_SampleID);
+    return out;
+}
+
@@ -0,0 +1,17 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+};
+
+fragment main0_out main0(texture2d<float> uSubpass0 [[texture(0)]], texture2d<float> uSubpass1 [[texture(1)]], float4 gl_FragCoord [[position]])
+{
+    main0_out out = {};
+    out.FragColor = uSubpass0.read(uint2(gl_FragCoord.xy), 0) + uSubpass1.read(uint2(gl_FragCoord.xy), 0);
+    return out;
+}
+
@@ -0,0 +1,17 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_out
+{
+    float FragColor [[color(0)]];
+};
+
+fragment main0_out main0(depth2d<float> uDepth [[texture(0)]], texture2d<float> uColor [[texture(1)]], sampler uSamplerShadow [[sampler(0)]], sampler uSampler [[sampler(1)]])
+{
+    main0_out out = {};
+    out.FragColor = uDepth.sample_compare(uSamplerShadow, float3(0.5).xy, 0.5) + uColor.sample(uSampler, float2(0.5)).x;
+    return out;
+}
+
@@ -0,0 +1,19 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+    uint gl_SampleMask [[sample_mask]];
+};
+
+fragment main0_out main0()
+{
+    main0_out out = {};
+    out.FragColor = float4(1.0);
+    out.gl_SampleMask = 0;
+    return out;
+}
+
@@ -0,0 +1,27 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+struct SpecConstArray
+{
+    float4 samples[2];
+};
+
+struct main0_in
+{
+    int Index [[user(locn0)]];
+};
+
+struct main0_out
+{
+    float4 FragColor [[color(0)]];
+};
+
+fragment main0_out main0(main0_in in [[stage_in]], constant SpecConstArray& _15 [[buffer(0)]])
+{
+    main0_out out = {};
+    out.FragColor = _15.samples[in.Index];
+    return out;
+}
+
@@ -75,31 +75,31 @@ inline float spvDet3x3(float a1, float a2, float a3, float b1, float b2, float b
 float4x4 spvInverse4x4(float4x4 m)
 {
    float4x4 adj;	// The adjoint matrix (inverse after dividing by determinant)
-    
+
    // Create the transpose of the cofactors, as the classical adjoint of the matrix.
    adj[0][0] =  spvDet3x3(m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
    adj[0][1] = -spvDet3x3(m[0][1], m[0][2], m[0][3], m[2][1], m[2][2], m[2][3], m[3][1], m[3][2], m[3][3]);
    adj[0][2] =  spvDet3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[3][1], m[3][2], m[3][3]);
    adj[0][3] = -spvDet3x3(m[0][1], m[0][2], m[0][3], m[1][1], m[1][2], m[1][3], m[2][1], m[2][2], m[2][3]);
-    
+
    adj[1][0] = -spvDet3x3(m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
    adj[1][1] =  spvDet3x3(m[0][0], m[0][2], m[0][3], m[2][0], m[2][2], m[2][3], m[3][0], m[3][2], m[3][3]);
    adj[1][2] = -spvDet3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[3][0], m[3][2], m[3][3]);
    adj[1][3] =  spvDet3x3(m[0][0], m[0][2], m[0][3], m[1][0], m[1][2], m[1][3], m[2][0], m[2][2], m[2][3]);
-    
+
    adj[2][0] =  spvDet3x3(m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
    adj[2][1] = -spvDet3x3(m[0][0], m[0][1], m[0][3], m[2][0], m[2][1], m[2][3], m[3][0], m[3][1], m[3][3]);
    adj[2][2] =  spvDet3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[3][0], m[3][1], m[3][3]);
    adj[2][3] = -spvDet3x3(m[0][0], m[0][1], m[0][3], m[1][0], m[1][1], m[1][3], m[2][0], m[2][1], m[2][3]);
-    
+
    adj[3][0] = -spvDet3x3(m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
    adj[3][1] =  spvDet3x3(m[0][0], m[0][1], m[0][2], m[2][0], m[2][1], m[2][2], m[3][0], m[3][1], m[3][2]);
    adj[3][2] = -spvDet3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[3][0], m[3][1], m[3][2]);
    adj[3][3] =  spvDet3x3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]);
-    
+
    // Calculate the determinant as a combination of the cofactors of the first row.
    float det = (adj[0][0] * m[0][0]) + (adj[0][1] * m[1][0]) + (adj[0][2] * m[2][0]) + (adj[0][3] * m[3][0]);
-    
+
    // Divide the classical adjoint matrix by the determinant.
    // If determinant is zero, matrix is not invertable, so leave it unchanged.
    return (det != 0.0f) ? (adj * (1.0f / det)) : m;
@@ -0,0 +1,56 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+typedef float3x4 packed_float4x3;
+
+struct _15
+{
+    packed_float4x3 _m0;
+    packed_float4x3 _m1;
+};
+
+struct _42
+{
+    float4x4 _m0;
+    float4x4 _m1;
+    float _m2;
+    char pad3[12];
+    packed_float3 _m3;
+    float _m4;
+    packed_float3 _m5;
+    float _m6;
+    float _m7;
+    float _m8;
+    float2 _m9;
+};
+
+struct main0_in
+{
+    float4 m_25 [[attribute(0)]];
+};
+
+struct main0_out
+{
+    float3 m_72 [[user(locn0)]];
+    float4 gl_Position [[position]];
+};
+
+vertex main0_out main0(main0_in in [[stage_in]], constant _15& _17 [[buffer(0)]], constant _42& _44 [[buffer(1)]])
+{
+    main0_out out = {};
+    float3 _34;
+    do
+    {
+        _34 = normalize(float4(in.m_25.xyz, 0.0) * _17._m1);
+        break;
+    } while (false);
+    float4 _70 = _44._m0 * float4(_44._m3 + (in.m_25.xyz * (_44._m6 + _44._m7)), 1.0);
+    out.m_72 = _34;
+    float4 _95 = _70;
+    _95.y = -_70.y;
+    out.gl_Position = _95;
+    return out;
+}
+
@@ -0,0 +1,24 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+constant float4 _20[2] = {float4(10.0), float4(20.0)};
+
+struct main0_in
+{
+    float4 vInput1 [[attribute(1)]];
+};
+
+struct main0_out
+{
+    float4 gl_Position [[position]];
+};
+
+vertex main0_out main0(main0_in in [[stage_in]])
+{
+    main0_out out = {};
+    out.gl_Position = float4(10.0) + in.vInput1;
+    return out;
+}
+
@@ -0,0 +1,13 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) in vec4 vA;
+layout(location = 1) in vec4 vB;
+
+void main()
+{
+    FragColor = vA - vB * trunc(vA / vB);
+}
+
@@ -0,0 +1,11 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(location = 0) out vec4 FragColor;
+
+void main()
+{
+    FragColor = (((vec4(1.0) + vec4(1.0)) + (vec3(1.0).xyzz + vec4(1.0))) + (vec4(1.0) + vec4(2.0))) + (vec2(1.0).xyxy + vec4(2.0));
+}
+
@@ -0,0 +1,13 @@
+#version 450
+
+uniform sampler2D SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler;
+uniform sampler2D SPIRV_Cross_CombinedSampledImageSampler;
+
+layout(location = 0) out vec4 _entryPointOutput;
+
+void main()
+{
+    ivec3 _122 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0);
+    _entryPointOutput = ((texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _122.xy, 0) + texelFetch(SPIRV_Cross_CombinedSampledImageSPIRV_Cross_DummySampler, _122.xy, 0)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy)) + texture(SPIRV_Cross_CombinedSampledImageSampler, gl_FragCoord.xy);
+}
+
@@ -0,0 +1,14 @@
+#version 450
+
+layout(set = 0, binding = 0) uniform sampler Sampler;
+layout(set = 0, binding = 0) uniform texture2D SampledImage;
+uniform sampler SPIRV_Cross_DummySampler;
+
+layout(location = 0) out vec4 _entryPointOutput;
+
+void main()
+{
+    ivec3 _122 = ivec3(int(gl_FragCoord.x * 1280.0), int(gl_FragCoord.y * 720.0), 0);
+    _entryPointOutput = ((texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _122.xy, 0) + texelFetch(sampler2D(SampledImage, SPIRV_Cross_DummySampler), _122.xy, 0)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy)) + texture(sampler2D(SampledImage, Sampler), gl_FragCoord.xy);
+}
+
@@ -0,0 +1,9 @@
+#version 450
+
+invariant gl_Position;
+
+void main()
+{
+    gl_Position = vec4(1.0);
+}
+
@@ -0,0 +1,17 @@
+#version 450
+
+out gl_PerVertex
+{
+    vec4 gl_Position;
+    float gl_PointSize;
+    float gl_ClipDistance[1];
+    float gl_CullDistance[1];
+};
+
+invariant gl_Position;
+
+void main()
+{
+    gl_Position = vec4(1.0);
+}
+
@@ -0,0 +1,9 @@
+#version 450
+
+invariant gl_Position;
+
+void main()
+{
+    gl_Position = vec4(1.0);
+}
+
@@ -0,0 +1,14 @@
+#version 450
+
+out gl_PerVertex
+{
+    vec4 gl_Position;
+};
+
+invariant gl_Position;
+
+void main()
+{
+    gl_Position = vec4(1.0);
+}
+
@@ -0,0 +1,12 @@
+#version 450
+
+in float gl_ClipDistance[4];
+in float gl_CullDistance[3];
+
+layout(location = 0) out float FragColor;
+
+void main()
+{
+    FragColor = gl_ClipDistance[0] + gl_CullDistance[0];
+}
+
@@ -0,0 +1,11 @@
+#version 450
+#extension GL_ARB_gpu_shader_int64 : require
+
+layout(location = 0) out vec3 FragColor;
+layout(location = 0) flat in double vTmp;
+
+void main()
+{
+    FragColor = vec3(dvec3(uint64BitsToDouble(0x7ff0000000000000ul), uint64BitsToDouble(0xfff0000000000000ul), uint64BitsToDouble(0xfff8000000000000ul)) + dvec3(vTmp));
+}
+
@@ -0,0 +1,20 @@
+#version 450
+
+out gl_PerVertex
+{
+    vec4 gl_Position;
+    float gl_PointSize;
+    float gl_ClipDistance[4];
+    float gl_CullDistance[3];
+};
+
+void main()
+{
+    gl_Position = vec4(1.0);
+    gl_ClipDistance[0] = 0.0;
+    gl_ClipDistance[1] = 0.0;
+    gl_ClipDistance[2] = 0.0;
+    gl_ClipDistance[3] = 0.0;
+    gl_CullDistance[1] = 4.0;
+}
+
@@ -1,11 +1,15 @@
 #version 450

+out float gl_ClipDistance[4];
+out float gl_CullDistance[3];
+
 void main()
 {
-    gl_Position = vec4(10.0);
-    gl_ClipDistance[0] = 1.0;
-    gl_ClipDistance[1] = 4.0;
-    gl_CullDistance[0] = 4.0;
-    gl_CullDistance[1] = 9.0;
+    gl_Position = vec4(1.0);
+    gl_ClipDistance[0] = 0.0;
+    gl_ClipDistance[1] = 0.0;
+    gl_ClipDistance[2] = 0.0;
+    gl_ClipDistance[3] = 0.0;
+    gl_CullDistance[1] = 4.0;
 }

@@ -0,0 +1,20 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) in vec4 vA;
+layout(location = 1) in vec4 vB;
+
+void main()
+{
+    if (gl_FrontFacing)
+    {
+        FragColor = vA;
+    }
+    else
+    {
+        FragColor = vB;
+    }
+}
+
@@ -0,0 +1,37 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) flat in mediump int vA;
+layout(location = 1) flat in mediump int vB;
+
+void main()
+{
+    FragColor = vec4(0.0);
+    mediump int _49;
+    int _60;
+    for (int _57 = 0, _58 = 0; _58 < vA; _57 = _60, _58 += _49)
+    {
+        if ((vA + _58) == 20)
+        {
+            _60 = 50;
+        }
+        else
+        {
+            int _59;
+            if ((vB + _58) == 40)
+            {
+                _59 = 60;
+            }
+            else
+            {
+                _59 = _57;
+            }
+            _60 = _59;
+        }
+        _49 = _60 + 10;
+        FragColor += vec4(1.0);
+    }
+}
+
@@ -0,0 +1,11 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(location = 0) out highp vec3 FragColor;
+
+void main()
+{
+    FragColor = vec3(uintBitsToFloat(0x7f800000u), uintBitsToFloat(0xff800000u), uintBitsToFloat(0xffc00000u));
+}
+
@@ -0,0 +1,9 @@
+#version 310 es
+
+layout(location = 1) in vec4 vInput1;
+
+void main()
+{
+    gl_Position = vec4(10.0) + vInput1;
+}
+
@@ -0,0 +1,17 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(binding = 0, std140) uniform SpecConstArray
+{
+    vec4 samples[2];
+} _15;
+
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) flat in mediump int Index;
+
+void main()
+{
+    FragColor = _15.samples[Index];
+}
+
@@ -0,0 +1,19 @@
+#version 310 es
+precision mediump float;
+precision highp int;
+
+layout(constant_id = 10) const int Value = 2;
+
+layout(set = 0, binding = 0, std140) uniform SpecConstArray
+{
+    vec4 samples[Value];
+} _15;
+
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) flat in mediump int Index;
+
+void main()
+{
+    FragColor = _15.samples[Index];
+}
+
@@ -0,0 +1,29 @@
+static float4 FragColor;
+static float4 vA;
+static float4 vB;
+
+struct SPIRV_Cross_Input
+{
+    float4 vA : TEXCOORD0;
+    float4 vB : TEXCOORD1;
+};
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+void frag_main()
+{
+    FragColor = fmod(vA, vB);
+}
+
+SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input)
+{
+    vA = stage_input.vA;
+    vB = stage_input.vB;
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}
@@ -0,0 +1,47 @@
+static float4 FragColor;
+
+struct SPIRV_Cross_Output
+{
+    float4 FragColor : SV_Target0;
+};
+
+float4 foo(float4 foo_1)
+{
+    return foo_1 + 1.0f.xxxx;
+}
+
+float4 foo(float3 foo_1)
+{
+    return foo_1.xyzz + 1.0f.xxxx;
+}
+
+float4 foo_1(float4 foo_2)
+{
+    return foo_2 + 2.0f.xxxx;
+}
+
+float4 foo(float2 foo_2)
+{
+    return foo_2.xyxy + 2.0f.xxxx;
+}
+
+void frag_main()
+{
+    float4 foo_3 = 1.0f.xxxx;
+    float4 foo_2 = foo(foo_3);
+    float3 foo_5 = 1.0f.xxx;
+    float4 foo_4 = foo(foo_5);
+    float4 foo_7 = 1.0f.xxxx;
+    float4 foo_6 = foo_1(foo_7);
+    float2 foo_9 = 1.0f.xx;
+    float4 foo_8 = foo(foo_9);
+    FragColor = ((foo_2 + foo_4) + foo_6) + foo_8;
+}
+
+SPIRV_Cross_Output main()
+{
+    frag_main();
+    SPIRV_Cross_Output stage_output;
+    stage_output.FragColor = FragColor;
+    return stage_output;
+}