Bump up to 1.3.6

Correctly place '..' more entry for RGUI
Dehardcore 'more' string
2026-11-09 11:41:35 -10:00 · 2016-07-17 01:05:18 +02:00 · 2016-07-17 01:00:57 +02:00 · 2016-07-17 00:52:56 +02:00 · 2016-07-17 00:42:36 +02:00 · 2016-07-17 00:41:13 +02:00
1071 changed files with 207225 additions and 62905 deletions
@@ -62,6 +62,9 @@ menu/driverspzarch.c
 /media/shaders_glsl/
 /obj-w32/

+# Ctags
+/tags
+
 # Android
 /pkg/android/phoenix/obj/
 /pkg/android/phoenix/assets/
@@ -0,0 +1,6 @@
+[submodule "deps/glslang/glslang"]
+	path = deps/glslang/glslang
+	url = git://github.com/KhronosGroup/glslang.git
+[submodule "deps/SPIRV-Cross"]
+	path = deps/SPIRV-Cross
+	url = git://github.com/KhronosGroup/SPIRV-Cross
@@ -1,4 +1,5 @@
 HAVE_FILE_LOGGER=1
+NEED_CXX_LINKER=0
 MISSING_DECLS   =0

 ifneq ($(C90_BUILD),)
@@ -33,7 +34,7 @@ endif
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)

 ifeq ($(MISSING_DECLS), 1)
-	DEFINES += -Werror=missing-declarations
+   DEFINES += -Werror=missing-declarations
 endif

 ifeq ($(HAVE_DYLIB), 1)
@@ -54,20 +55,26 @@ ifeq ($(DEBUG), 1)
   OPTIMIZE_FLAG = -O0 -g
 else
   OPTIMIZE_FLAG = -O3 -ffast-math
-ifneq ($(findstring Win32,$(OS)),)
-   LDFLAGS += -mwindows
-endif
+   ifneq ($(findstring Win32,$(OS)),)
+      LDFLAGS += -mwindows
+   endif
 endif

 CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
-CXXFLAGS := $(CFLAGS) -std=c++98 -D__STDC_CONSTANT_MACROS
+
+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   := $(CXXFLAGS) -xc++
+   CFLAGS   += -DCXX_BUILD
+   CXXFLAGS += -DCXX_BUILD
 else
-   ifeq ($(findstring Win32,$(OS)),)
+   ifeq ($(NEED_CXX_LINKER),1)
+      LINK = $(CXX)
+   else ifeq ($(findstring Win32,$(OS)),)
      LINK = $(CC)
   else
      # directx-related code is c++
@@ -113,10 +120,14 @@ endif

 all: $(TARGET) config.mk

+ifeq ($(MAKECMDGOALS),clean)
+config.mk:
+else
 -include $(RARCH_OBJ:.o=.d)
 config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1
+endif

 retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
@@ -127,7 +138,7 @@ $(OBJDIR)/%.o: %.c config.h config.mk
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<

-$(OBJDIR)/%.o: %.cpp
+$(OBJDIR)/%.o: %.cpp config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CXX $<),)
 	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
@@ -159,14 +170,14 @@ install: $(TARGET)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(MAN_DIR) 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
 	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
 	install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
-	install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
-	install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
+	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
 	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps

 uninstall:
@@ -174,8 +185,8 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
-	rm -f $(DESTDIR)$(MAN_DIR)/retroarch.1
-	rm -f $(DESTDIR)$(MAN_DIR)/retroarch-cg2glsl.1
+	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
+	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg

 clean:
@@ -18,8 +18,12 @@ ifeq ($(HAVE_LIBRETRODB),)
   HAVE_LIBRETRODB = 1
 endif

+ifeq ($(HAVE_HID), 1)
+   DEFINES += -DHAVE_HID
+endif
+
 ifeq ($(HAVE_LIBRETRODB), 1)
-	DEFINES += -DHAVE_LIBRETRODB
+   DEFINES += -DHAVE_LIBRETRODB
 endif

 ifeq ($(HAVE_FBO), 1)
@@ -44,6 +48,11 @@ ifeq ($(GL_DEBUG), 1)
   CXXFLAGS += -DGL_DEBUG
 endif

+ifeq ($(VULKAN_DEBUG), 1)
+   CFLAGS += -DVULKAN_DEBUG
+   CXXFLAGS += -DVULKAN_DEBUG
+endif
+
 ifeq ($(HAVE_HARD_FLOAT), 1)
   DEFINES += -mfloat-abi=hard
 endif
@@ -56,6 +65,10 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
   CFLAGS += -DHAVE_FILE_LOGGER
 endif

+ifeq ($(HAVE_SHADERPIPELINE), 1)
+   CFLAGS += -DHAVE_SHADERPIPELINE
+endif
+
 CFLAGS += -I./libretro-common/include

 # Switches
@@ -65,6 +78,7 @@ CFLAGS += -I./libretro-common/include

 ifneq ($(findstring BSD,$(OS)),)
   BSD_LOCAL_INC += -I/usr/local/include
+   OBJ += frontend/drivers/platform_bsd.o
 endif

 ifneq ($(findstring Darwin,$(OS)),)
@@ -77,12 +91,13 @@ endif
 ifneq ($(findstring Linux,$(OS)),)
   LIBS += -lrt
   OBJ += input/drivers/linuxraw_input.o \
-			 input/common/linux_common.o \
-			 input/common/epoll_common.o \
+          input/common/linux_common.o \
+          input/common/epoll_common.o \
          input/drivers_joypad/linuxraw_joypad.o \
          frontend/drivers/platform_linux.o
 endif

+
 ifeq ($(findstring Haiku,$(OS)),)
   LIBS += -lm
   DEBUG_FLAG = -g
@@ -107,44 +122,44 @@ OBJ += frontend/frontend.o \
       frontend/drivers/platform_null.o \
       ui/ui_companion_driver.o \
       ui/drivers/ui_null.o \
-       libretro_version_1.o \
+       ui/drivers/null/ui_null_window.o \
+       ui/drivers/null/ui_null_browser_window.o \
+       ui/drivers/null/ui_null_msg_window.o \
+       ui/drivers/null/ui_null_application.o \
+       core_impl.o \
       retroarch.o \
-		 input/input_keyboard.o \
-       command_event.o \
+       input/input_keyboard.o \
+       command.o \
       msg_hash.o \
-       intl/msg_hash_de.o \
-       intl/msg_hash_eo.o \
-       intl/msg_hash_es.o \
-       intl/msg_hash_fr.o \
-       intl/msg_hash_it.o \
-       intl/msg_hash_nl.o \
-       intl/msg_hash_pl.o \
-       intl/msg_hash_pt.o \
       intl/msg_hash_us.o \
       runloop.o \
-       tasks/tasks.o \
+       libretro-common/algorithms/mismatch.o \
+       libretro-common/queues/task_queue.o \
+       tasks/task_content.o \
+       tasks/task_save_ram.o \
+       tasks/task_save_state.o \
       tasks/task_file_transfer.o \
-       content.o \
-		 libretro-common/encodings/encoding_utf.o \
-       libretro-common/file/file_list.o \
-       libretro-common/file/dir_list.o \
+       tasks/task_image.o \
+       libretro-common/encodings/encoding_utf.o \
+       libretro-common/lists/file_list.o \
+       libretro-common/lists/dir_list.o \
       libretro-common/file/retro_dirent.o \
-       libretro-common/file/retro_file.o \
+       libretro-common/streams/file_stream.o \
+       libretro-common/streams/interface_stream.o \
+       libretro-common/streams/memory_stream.o \
       libretro-common/file/retro_stat.o \
-       libretro-common/string/string_list.o \
+       libretro-common/lists/string_list.o \
       libretro-common/string/stdstring.o \
       libretro-common/memmap/memalign.o \
-       dir_list_special.o \
-       string_list_special.o \
-       file_ops.o \
+       list_special.o \
       libretro-common/file/nbio/nbio_stdio.o \
       libretro-common/file/file_path.o \
       file_path_special.o \
+       file_path_str.o \
       libretro-common/hash/rhash.o \
       audio/audio_driver.o \
       input/input_driver.o \
-       input/input_hid_driver.o \
-       gfx/video_common.o \
+       gfx/video_coord_array.o \
       gfx/video_driver.o \
       camera/camera_driver.o \
       location/location_driver.o \
@@ -154,7 +169,7 @@ OBJ += frontend/frontend.o \
       dynamic.o \
       cores/dynamic_dummy.o \
       libretro-common/queues/message_queue.o \
-       rewind.o \
+       managers/state_manager.o \
       gfx/drivers_font_renderer/bitmapfont.o \
       input/input_autodetect.o \
       input/input_joypad_driver.o \
@@ -164,15 +179,15 @@ OBJ += frontend/frontend.o \
       tasks/task_overlay.o \
       input/input_overlay.o \
       patch.o \
-       libretro-common/queues/fifo_buffer.o \
-       core_options.o \
+       libretro-common/queues/fifo_queue.o \
+       managers/core_option_manager.o \
       libretro-common/compat/compat_fnmatch.o \
-		 libretro-common/compat/compat_posix_string.o \
-       cheats.o \
+       libretro-common/compat/compat_posix_string.o \
+       managers/cheat_manager.o \
       core_info.o \
       libretro-common/file/config_file.o \
-       libretro-common/file/config_file_userdata.o \
-       screenshot.o \
+       config_file_userdata.o \
+       tasks/task_screenshot.o \
       libretro-common/gfx/scaler/scaler.o \
       gfx/drivers_shader/shader_null.o \
       gfx/video_shader_driver.o \
@@ -184,8 +199,9 @@ OBJ += frontend/frontend.o \
       gfx/video_filter.o \
       audio/audio_resampler_driver.o \
       audio/audio_dsp_filter.o \
-       audio/drivers_resampler/sinc.o \
-       audio/drivers_resampler/nearest.o \
+       audio/drivers_resampler/sinc_resampler.o \
+       audio/drivers_resampler/nearest_resampler.o \
+       audio/drivers_resampler/null_resampler.o \
       audio/drivers_resampler/cc_resampler.o \
       location/drivers/nulllocation.o \
       camera/drivers/nullcamera.o \
@@ -194,13 +210,26 @@ OBJ += frontend/frontend.o \
       input/drivers/nullinput.o \
       input/drivers_hid/null_hid.o \
       input/drivers_joypad/null_joypad.o \
-       input/drivers_joypad/hid_joypad.o \
       playlist.o \
       movie.o \
       record/record_driver.o \
       record/drivers/record_null.o \
-       performance.o \
-		 verbosity.o
+       libretro-common/features/features_cpu.o \
+       performance_counters.o \
+       verbosity.o
+
+ifeq ($(HAVE_LANGEXTRA), 1)
+DEFINES += -DHAVE_LANGEXTRA
+OBJ += intl/msg_hash_de.o \
+       intl/msg_hash_eo.o \
+       intl/msg_hash_es.o \
+       intl/msg_hash_fr.o \
+       intl/msg_hash_it.o \
+       intl/msg_hash_nl.o \
+       intl/msg_hash_pl.o \
+       intl/msg_hash_pt.o
+
+endif

 ifneq ($(HAVE_GETOPT_LONG), 1)
 OBJ += libretro-common/compat/compat_getopt.o
@@ -214,19 +243,37 @@ ifneq ($(HAVE_STRL), 1)
 OBJ += libretro-common/compat/compat_strl.o
 endif

-OBJ += gfx/image/image.o
+OBJ += libretro-common/formats/image_texture.o

 ifeq ($(HAVE_IMAGEVIEWER), 1)
 DEFINES += -DHAVE_IMAGEVIEWER
-OBJ += cores/image_core.o
+OBJ += cores/libretro-imageviewer/image_core.o
 endif

 # Qt

 ifeq ($(HAVE_QT), 1)
-OBJ += ui/drivers/ui_qt.o
+HAVE_QT_WRAPPER=0
+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_msg_window.o
+
+ifneq ($(findstring Linux,$(OS)),)
+DEFINES += -I/usr/include/qt -fPIC
+endif
+
 # TODO/FIXME - figure out which libraries we need to link against
-LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -lglu32 -lopengl32 -L./ui/drivers/qt/wrapper/build/release -lwrapper
+LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/wrapper/build/release
+
+ifeq ($(HAVE_QT_WRAPPER), 1)
+LIBS += -lwrapper
+endif
+endif
+
+ifeq ($(HAVE_SSA),1)
+LIBS += -lass
 endif

 # LibretroDB
@@ -281,8 +328,11 @@ ifeq ($(HAVE_OSS_BSD), 1)
 endif

 ifeq ($(HAVE_ALSA), 1)
-   OBJ += audio/drivers/alsa.o \
-			 audio/drivers/alsathread.o
+   OBJ += audio/drivers/alsa.o
+
+ifeq ($(HAVE_THREADS), 1)
+   OBJ += audio/drivers/alsathread.o
+endif
   LIBS += $(ALSA_LIBS)
   DEFINES += $(ALSA_CFLAGS)
 endif
@@ -329,6 +379,7 @@ ifeq ($(HAVE_RSOUND), 1)
 endif

 ifeq ($(HAVE_DSOUND), 1)
+   HAVE_DIRECTX=1
   OBJ += audio/drivers/dsound.o
   DEFINES += -DHAVE_DSOUND
   LIBS += -ldxguid -ldsound
@@ -343,24 +394,42 @@ endif
 # Audio Resamplers

 ifeq ($(HAVE_NEON),1)
-   OBJ += audio/drivers_resampler/sinc_neon.o \
+   OBJ += audio/drivers_resampler/sinc_resampler_neon.o \
          audio/drivers_resampler/cc_resampler_neon.o
   # When compiled without this, tries to attempt to compile sinc lerp,
   # which will error out
-	#
-	# TODO - we need to make quality levels of sinc
-	# runtime toggleable instead of going by compile-time
-	# defines
+   #
+   # TODO - we need to make quality levels of sinc
+   # runtime toggleable instead of going by compile-time
+   # defines
   DEFINES += -DSINC_LOWER_QUALITY
 endif

-OBJ += audio/audio_utils.o
+OBJ += libretro-common/conversion/s16_to_float.o \
+       libretro-common/conversion/float_to_s16.o
 ifeq ($(HAVE_NEON),1)
-   OBJ += audio/audio_utils_neon.o
+   OBJ += libretro-common/conversion/s16_to_float_neon.o \
+          libretro-common/conversion/float_to_s16_neon.o
+endif
+
+ifneq ($(findstring Win32,$(OS)),)
+HAVE_VULKAN=1
+DEFINES += -DHAVE_VULKAN
+endif
+
+HW_CONTEXT_MENU_DRIVERS=$(HAVE_RGUI)
+
+ifeq ($(HW_CONTEXT_MENU_DRIVERS),0)
+ifeq ($(HAVE_GL_CONTEXT),1)
+   HW_CONTEXT_MENU_DRIVERS=1
+endif
+ifeq ($(HAVE_VULKAN),1)
+   HW_CONTEXT_MENU_DRIVERS=1
+endif
 endif

 # XMB and MaterialUI are always enabled if supported and not explicitly disabled
-ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
+ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
   ifeq ($(HAVE_ZARCH),)
      HAVE_ZARCH = 1
   endif
@@ -369,12 +438,17 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
      HAVE_MATERIALUI = 1
   endif

+   #ifeq ($(HAVE_NUKLEAR),)
+      #HAVE_NUKLEAR = 1
+   #endif
+
   ifeq ($(HAVE_XMB),)
      HAVE_XMB = 1
   endif
 else
   HAVE_ZARCH = 0
   HAVE_MATERIALUI  = 0
+   #HAVE_NUKLEAR = 0
   HAVE_XMB   = 0
 endif

@@ -386,6 +460,16 @@ ifeq ($(HAVE_MATERIALUI), 1)
   OBJ += menu/drivers/materialui.o
   DEFINES += -DHAVE_MATERIALUI
 endif
+ifeq ($(HAVE_NUKLEAR), 1)
+   OBJ += menu/drivers/nuklear/nk_common.o
+   OBJ += menu/drivers/nuklear/nk_menu.o
+   OBJ += menu/drivers/nuklear/nk_wnd_main.o
+   OBJ += menu/drivers/nuklear/nk_wnd_file_picker.o
+   OBJ += menu/drivers/nuklear/nk_wnd_shader_parameters.o
+   OBJ += menu/drivers/nuklear/nk_wnd_settings.o
+   OBJ += menu/drivers/nuklear.o
+   DEFINES += -DHAVE_NUKLEAR
+endif
 ifeq ($(HAVE_ZARCH), 1)
   OBJ += menu/drivers/zarch.o
   DEFINES += -DHAVE_ZARCH
@@ -398,6 +482,7 @@ endif

 ifeq ($(HAVE_LAKKA), 1)
   DEFINES += -DHAVE_LAKKA
+   DEFINES += -DLAKKA_PROJECT=$(LAKKA_PROJECT)
 endif

 ifeq ($(HAVE_MENU_COMMON), 1)
@@ -406,17 +491,9 @@ ifeq ($(HAVE_MENU_COMMON), 1)
   else
      PSEUDO_NS :=
   endif
-   OBJ += menu/menu_hash.o \
-			 menu/menu_driver.o \
-          menu/intl/menu_hash_de.o \
-          menu/intl/menu_hash_es.o \
-          menu/intl/menu_hash_eo.o \
-          menu/intl/menu_hash_fr.o \
-          menu/intl/menu_hash_it.o \
-          menu/intl/menu_hash_nl.o \
-          menu/intl/menu_hash_pl.o \
-          menu/intl/menu_hash_pt.o \
-          menu/intl/menu_hash_us$(PSEUDO_NS).o \
+
+   OBJ += menu/menu_driver.o \
+          menu/menu_content.o \
          menu/menu_input.o \
          menu/menu_entry.o \
          menu/menu_entries.o \
@@ -435,6 +512,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
          menu/cbs/menu_cbs_deferred_push.o \
          menu/cbs/menu_cbs_scan.o \
          menu/cbs/menu_cbs_get_value.o \
+          menu/cbs/menu_cbs_label.o \
          menu/cbs/menu_cbs_title.o \
          menu/cbs/menu_cbs_up.o \
          menu/cbs/menu_cbs_down.o \
@@ -449,6 +527,8 @@ endif

 ifeq ($(UTF8), 1)
   DEFINES += -DHAVE_UTF8
+   OBJ += intl/msg_hash_ru.o
+   DEFINES += -finput-charset=UTF-8
 endif

 ifeq ($(HAVE_STB_FONT), 1)
@@ -462,36 +542,27 @@ ifeq ($(HAVE_FREETYPE), 1)
 endif

 ifeq ($(HAVE_THREADS), 1)
-   OBJ += autosave.o \
-			 libretro-common/rthreads/rthreads.o \
-			 libretro-common/rthreads/rsemaphore.o  \
-			 libretro-common/rthreads/async_job.o \
-			 gfx/video_thread_wrapper.o \
-			 audio/audio_thread_wrapper.o
+   OBJ += libretro-common/rthreads/rthreads.o \
+          libretro-common/rthreads/rsemaphore.o  \
+          gfx/video_thread_wrapper.o \
+          audio/audio_thread_wrapper.o
   DEFINES += -DHAVE_THREADS
   ifeq ($(findstring Haiku,$(OS)),)
      LIBS += -lpthread
   endif
 endif

-ifeq ($(HAVE_COMMAND), 1)
-   OBJ += command.o
-endif
-
-ifeq ($(HAVE_NETWORK_GAMEPAD), 1)
-   OBJ += remote.o
-endif
-
-#Input
-
 ifeq ($(HAVE_WAYLAND), 1)
- #OBJ += input/drivers/wayland.o
+ OBJ += gfx/drivers_context/wayland_ctx.o
 DEFINES += $(WAYLAND_CFLAGS)
 LIBS += $(WAYLAND_LIBS)
 endif

+#Input
+
 ifeq ($(HAVE_DINPUT), 1)
   LIBS += -ldinput8 -ldxguid -lole32
+   HAVE_DIRECTX=1
   DEFINES += -DHAVE_DINPUT
   OBJ += input/drivers/dinput.o \
          input/drivers_joypad/dinput_joypad.o
@@ -503,19 +574,36 @@ ifeq ($(HAVE_XINPUT), 1)
          input/autoconf/builtin_win.o
 endif

+ifeq ($(HAVE_OPENDINGUX_FBDEV), 1)
+   OBJ += gfx/drivers_context/opendingux_fbdev_ctx.o
+   DEFINES += $(EGL_CFLAGS)
+   LIBS += $(EGL_LIBS)
+endif
+
 ifeq ($(HAVE_X11), 1)
   OBJ += input/common/input_x11_common.o \
-			 input/drivers/x11_input.o \
+          input/drivers/x11_input.o \
          gfx/common/x11_common.o \
          input/drivers_keyboard/keyboard_event_x11.o

   LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
   DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
+ifeq ($(HAVE_XCB),1)
+   LIBS    += -lX11-xcb
+endif
+ifneq ($(HAVE_GLES), 1)
+   OBJ += gfx/drivers_context/x_ctx.o
+endif
+endif
+
+ifeq ($(HAVE_XCB),1)
+   DEFINES += $(XCB_CFLAGS)
+   LIBS    += $(XCB_LIBS)
 endif

 ifeq ($(HAVE_XKBCOMMON), 1)
   DEFINES += $(XKBCOMMON_CFLAGS)
-	OBJ += input/drivers_keyboard/keyboard_event_xkb.o
+   OBJ += input/drivers_keyboard/keyboard_event_xkb.o
   LIBS += $(XKBCOMMON_LIBS)
 endif

@@ -523,37 +611,46 @@ ifeq ($(HAVE_UDEV), 1)
   DEFINES += $(UDEV_CFLAGS)
   LIBS += $(UDEV_LIBS)
   OBJ += input/drivers/udev_input.o \
-			 input/common/udev_common.o \
-			 input/drivers_keyboard/keyboard_event_udev.o \
+          input/drivers_keyboard/keyboard_event_udev.o \
          input/drivers_joypad/udev_joypad.o
 endif

 ifeq ($(HAVE_LIBUSB), 1)
-	DEFINES += -DHAVE_LIBUSB
-	OBJ += input/drivers_hid/libusb_hid.o
-	LIBS += -lusb-1.0
-	HAVE_HID = 1
+ifeq ($(HAVE_THREADS), 1)
+ifeq ($(HAVE_HID), 1)
+   DEFINES += -DHAVE_LIBUSB
+   OBJ += input/drivers_hid/libusb_hid.o
+   LIBS += -lusb-1.0
+endif
+endif
 endif

 ifeq ($(HAVE_IOHIDMANAGER), 1)
-	DEFINES += -DHAVE_IOHIDMANAGER
-	OBJ += input/drivers_hid/iohidmanager_hid.o
-	HAVE_HID = 1
-	LIBS += -framework IOKit
+ifeq ($(HAVE_HID), 1)
+   DEFINES += -DHAVE_IOHIDMANAGER
+   OBJ += input/drivers_hid/iohidmanager_hid.o
+   LIBS += -framework IOKit
+endif
 endif

 ifeq ($(HAVE_CORELOCATION), 1)
-	DEFINES += -DHAVE_CORELOCATION
-	LIBS += -framework CoreLocation
+   DEFINES += -DHAVE_CORELOCATION
+   LIBS += -framework CoreLocation
 endif

 ifeq ($(HAVE_HID), 1)
-	DEFINES += -DHAVE_HID
-	OBJ += input/connect/joypad_connection.o \
+   DEFINES += -DHAVE_HID
+   OBJ +=      input/input_hid_driver.o \
+               input/drivers_joypad/hid_joypad.o \
+               input/connect/joypad_connection.o \
+               input/connect/connect_ps2adapter.o \
               input/connect/connect_ps3.o \
               input/connect/connect_ps4.o \
               input/connect/connect_wii.o \
-               input/connect/connect_wiiupro.o
+               input/connect/connect_nesusb.o \
+               input/connect/connect_snesusb.o \
+               input/connect/connect_wiiupro.o \
+               input/connect/connect_wiiugca.o
 endif

 ifeq ($(HAVE_PARPORT), 1)
@@ -563,7 +660,11 @@ endif
 # Companion UI

 ifneq ($(findstring Win32,$(OS)),)
-OBJ += ui/drivers/ui_win32.o
+OBJ += ui/drivers/ui_win32.o \
+       ui/drivers/win32/ui_win32_window.o \
+       ui/drivers/win32/ui_win32_browser_window.o \
+       ui/drivers/win32/ui_win32_msg_window.o \
+       ui/drivers/win32/ui_win32_application.o
 endif

 # Video
@@ -571,8 +672,21 @@ endif
 OBJ += gfx/video_context_driver.o \
       gfx/drivers_context/gfx_null_ctx.o \
       gfx/video_state_tracker.o \
-		 libretro-common/gfx/math/matrix_4x4.o \
-		 libretro-common/gfx/math/matrix_3x3.o
+       libretro-common/gfx/math/vector_2.o \
+       libretro-common/gfx/math/vector_3.o \
+       libretro-common/gfx/math/matrix_4x4.o \
+       libretro-common/gfx/math/matrix_3x3.o
+
+ifeq ($(HAVE_KMS), 1)
+   HAVE_AND_WILL_USE_DRM = 1
+   OBJ += gfx/drivers_context/drm_ctx.o
+   DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
+   LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
+endif
+
+ifeq ($(HAVE_PLAIN_DRM), 1)
+   OBJ += gfx/drivers/drm_gfx.o
+endif

 ifeq ($(HAVE_GL_CONTEXT), 1)
   DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
@@ -580,16 +694,9 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
          gfx/common/gl_common.o \
          gfx/drivers_font/gl_raster_font.o \
          libretro-common/glsym/rglgen.o
-	
-   ifeq ($(HAVE_MENU_COMMON), 1)
-		OBJ += menu/drivers_display/menu_display_gl.o
-	endif

-   ifeq ($(HAVE_KMS), 1)
-	   HAVE_AND_WILL_USE_DRM = 1
-      OBJ += gfx/drivers_context/drm_egl_ctx.o
-      DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
-      LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
+   ifeq ($(HAVE_MENU_COMMON), 1)
+      OBJ += menu/drivers_display/menu_display_gl.o
   endif

   ifeq ($(HAVE_VIDEOCORE), 1)
@@ -620,16 +727,17 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
         DEFINES += $(EGL_CFLAGS)
         LIBS += $(EGL_LIBS)
      endif
-      ifneq ($(HAVE_GLES), 1)
-			OBJ += gfx/drivers_context/glx_ctx.o
-		endif
   endif

-   ifeq ($(HAVE_WAYLAND), 1)
-	   ifeq ($(HAVE_EGL), 1)
-	     OBJ += gfx/drivers_context/wayland_ctx.o
-      endif
-   endif
+ifeq ($(HAVE_FFMPEG), 1)
+ifneq ($(C89_BUILD), 1)
+ifneq ($(HAVE_GLES), 1)
+   OBJ += cores/libretro-ffmpeg/fft/fft.o
+   DEFINES += -Ideps -DHAVE_GL_FFT
+   NEED_CXX_LINKER=1
+endif
+endif
+endif

   ifeq ($(HAVE_GLES), 1)
      LIBS += $(GLES_LIBS)
@@ -641,7 +749,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
   else
      DEFINES += -DHAVE_GL_SYNC
      OBJ += libretro-common/glsym/glsym_gl.o
-		GL_LIBS := -lGL
+      GL_LIBS := -lGL
      ifeq ($(OSX), 1)
         GL_LIBS := -framework OpenGL
         OBJ += gfx/drivers_context/cgl_ctx.o
@@ -649,7 +757,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
         OBJ += gfx/drivers_context/wgl_ctx.o
      endif
-		LIBS += $(GL_LIBS)
+      LIBS += $(GL_LIBS)
   endif

   OBJ += gfx/drivers_shader/shader_glsl.o
@@ -657,7 +765,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
 endif

 ifeq ($(HAVE_EGL), 1)
-	OBJ += gfx/common/egl_common.o
+   OBJ += gfx/common/egl_common.o
 endif

 ifeq ($(HAVE_SDL2), 1)
@@ -693,6 +801,64 @@ ifeq ($(HAVE_SDL2), 1)
   HAVE_SDL = 0
 endif

+ifeq ($(HAVE_VULKAN), 1)
+   ifneq ($(findstring Win32,$(OS)),)
+      GLSLANG_PLATFORM := Windows
+   else
+      GLSLANG_PLATFORM := Unix
+   endif
+
+   GLSLANG_SOURCES := \
+      $(wildcard deps/glslang/*.cpp) \
+      $(wildcard deps/glslang/glslang/SPIRV/*.cpp) \
+      $(wildcard deps/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
+      $(wildcard deps/glslang/glslang/OGLCompilersDLL/*.cpp) \
+      $(wildcard deps/glslang/glslang/glslang/MachineIndependent/*.cpp) \
+      $(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
+      $(wildcard deps/glslang/glslang/hlsl/*.cpp) \
+      $(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
+
+   SPIRV_CROSS_SOURCES := deps/SPIRV-Cross/spirv_cross.cpp
+   ifneq ($(findstring Win32,$(OS)),)
+      # Trivial temporary workaround for MinGW and glslang.
+      CXXFLAGS += -fpermissive
+   endif
+
+   DEFINES += \
+           -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
+           -Ideps/glslang/glslang/OGLCompilersDLL \
+           -Ideps/glslang/glslang \
+           -Ideps/glslang/glslang/glslang/MachineIndependent \
+           -Ideps/glslang/glslang/glslang/Public \
+           -Ideps/glslang/glslang/SPIRV \
+           -Ideps/glslang \
+           -Ideps/SPIRV-Cross
+
+   CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses -Igfx/include
+   CFLAGS  += -Igfx/include
+
+   GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
+   SPIRV_CROSS_OBJ := $(SPIRV_CROSS_SOURCES:.cpp=.o)
+
+   OBJ += gfx/drivers/vulkan.o \
+          gfx/common/vulkan_common.o \
+          libretro-common/vulkan/vulkan_symbol_wrapper.o \
+          gfx/drivers_font/vulkan_raster_font.o \
+          gfx/drivers_shader/shader_vulkan.o \
+          gfx/drivers_shader/glslang_util.o \
+          gfx/drivers_shader/slang_reflection.o \
+          $(GLSLANG_OBJ) \
+          $(SPIRV_CROSS_OBJ)
+
+   ifeq ($(HAVE_VULKAN_KHR_DISPLAY), 1)
+      OBJ += gfx/drivers_context/khr_display_ctx.o
+   endif
+   ifeq ($(HAVE_MENU_COMMON), 1)
+      OBJ += menu/drivers_display/menu_display_vulkan.o
+   endif
+   LIBS += -lstdc++
+endif
+
 ifeq ($(HAVE_OMAP), 1)
   OBJ += gfx/drivers/omap_gfx.o
 endif
@@ -702,16 +868,16 @@ ifeq ($(HAVE_EXYNOS), 1)
          memory/neon/memcpy-neon.o
   LIBS += $(DRM_LIBS) $(EXYNOS_LIBS)
   DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS)
-	HAVE_AND_WILL_USE_DRM = 1
+   HAVE_AND_WILL_USE_DRM = 1
 endif

 ifeq ($(HAVE_AND_WILL_USE_DRM), 1)
-	OBJ += gfx/common/drm_common.o
+   OBJ += gfx/common/drm_common.o
 endif

 ifeq ($(HAVE_DISPMANX), 1)
   OBJ += gfx/drivers/dispmanx_gfx.o
-	HAVE_VIDEOCORE = 1
+   HAVE_VIDEOCORE = 1
   LIBS += $(DISPMANX_LIBS)
   DEFINES += $(DISPMANX_CFLAGS)
 endif
@@ -733,14 +899,8 @@ ifeq ($(HAVE_XVIDEO), 1)
   DEFINES += $(XVIDEO_CFLAGS)
 endif

-ifeq ($(HAVE_XSHM), 1)
-   OBJ += gfx/drivers/xshm.o
-   LIBS += $(XSHM_LIBS)
-   DEFINES += $(XSHM_CFLAGS)
-endif
-
 ifeq ($(HAVE_CG), 1)
-	DEFINES += -DHAVE_CG
+   DEFINES += -DHAVE_CG
   OBJ += gfx/drivers_shader/shader_gl_cg.o
   LIBS += $(CG_LIBS)
 endif
@@ -752,12 +912,13 @@ ifeq ($(HAVE_D3D9), 1)
          gfx/common/d3d_common.o \
          gfx/drivers_font/d3d_w32_font.o \
          gfx/drivers_context/d3d_ctx.o
+   HAVE_DIRECTX=1
   DEFINES += -DHAVE_D3D -DHAVE_D3D9
   LIBS += -ld3d9 -ld3dx9 -ldxguid

   ifeq ($(HAVE_MENU_COMMON), 1)
-		OBJ += menu/drivers_display/menu_display_d3d.o
-	endif
+      OBJ += menu/drivers_display/menu_display_d3d.o
+   endif

   ifeq ($(HAVE_CG), 1)
      LIBS += -lcgD3D9
@@ -797,31 +958,44 @@ endif


 ifeq ($(HAVE_ZLIB), 1)
-   OBJ += libretro-common/file/file_extract.o \
+   OBJ += libretro-common/file/archive_file.o \
+          libretro-common/file/archive_file_zlib.o \
          tasks/task_decompress.o
   OBJ += $(ZLIB_OBJS)
   DEFINES += -DHAVE_ZLIB
-	HAVE_RPNG = 1
   HAVE_COMPRESSION = 1
   ifeq ($(WANT_ZLIB), 1)
      DEFINES += -DWANT_ZLIB
   else
      LIBS += -lz
-		HAVE_ZLIB_DEFLATE = 1
+      HAVE_ZLIB_DEFLATE = 1
   endif
 endif

-ifdef HAVE_RPNG
-	DEFINES += -DHAVE_RPNG
+ifeq ($(HAVE_RTGA), 1)
+   DEFINES += -DHAVE_RTGA
+   OBJ += libretro-common/formats/tga/rtga.o
 endif

 ifeq ($(HAVE_RPNG), 1)
+   DEFINES += -DHAVE_RPNG
   OBJ += libretro-common/formats/png/rpng.o \
          libretro-common/formats/png/rpng_encode.o
 endif
+
+ifeq ($(HAVE_RJPEG), 1)
+   DEFINES += -DHAVE_RJPEG
+   OBJ += libretro-common/formats/jpeg/rjpeg.o
+endif
+
+ifeq ($(HAVE_RBMP), 1)
+   DEFINES += -DHAVE_RBMP
+   OBJ += libretro-common/formats/bmp/rbmp.o
+endif
+
 OBJ += libretro-common/formats/bmp/rbmp_encode.o \
-       libretro-common/formats/tga/rtga.o \
-       libretro-common/formats/json/jsonsax.o
+       libretro-common/formats/json/jsonsax.o \
+       libretro-common/formats/image_transfer.o

 ifdef HAVE_COMPRESSION
   DEFINES += -DHAVE_COMPRESSION
@@ -841,13 +1015,9 @@ ifeq ($(WANT_ZLIB),1)
          deps/zlib/inftrees.o \
          deps/zlib/trees.o \
          deps/zlib/uncompr.o \
-          deps/zlib/zutil.o \
-          deps/zlib/ioapi.o \
-          deps/zlib/unzip.o
+          deps/zlib/zutil.o
 else
 ifeq ($(HAVE_ZLIB),1)
-ZLIB_OBJS = deps/zlib/unzip.o \
-            deps/zlib/ioapi.o
 OBJ += $(ZLIB_OBJS)
 HAVE_ZLIB_DEFLATE = 1
 endif
@@ -869,29 +1039,47 @@ endif
 ifeq ($(HAVE_NETWORKING), 1)
   DEFINES += -DHAVE_NETWORKING
   OBJ += libretro-common/net/net_compat.o \
-			 libretro-common/net/net_http.o \
-			 net_http_special.o \
-			 tasks/task_http.o
+          libretro-common/net/net_http.o \
+          libretro-common/net/net_socket.o \
+          network/net_http_special.o \
+          tasks/task_http.o
+
+   ifneq ($(HAVE_SOCKET_LEGACY),1)
+   OBJ += libretro-common/net/net_ifinfo.o
+   endif
+
+   ifeq ($(WANT_IFADDRS), 1)
+   DEFINES += -DWANT_IFADDRS
+   OBJ += libretro-common/compat/compat_ifaddrs.o
+   endif

   ifneq ($(findstring Win32,$(OS)),)
-      LIBS += -lws2_32
+      LIBS += -lws2_32 -liphlpapi
   endif

   # Netplay

   ifeq ($(HAVE_NETPLAY), 1)
-      DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD -DHAVE_NETWORK_GAMEPAD
-      OBJ += netplay/netplay_net.o netplay/netplay_spectate.o netplay/netplay_common.o netplay/netplay.o
+      DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
+      OBJ += network/netplay/netplay_net.o \
+             network/netplay/netplay_spectate.o \
+             network/netplay/netplay_common.o \
+             network/netplay/netplay.o
   endif

   # Retro Achievements (also depends on threads)
-   
+
   ifeq ($(HAVE_CHEEVOS), 1)
      ifeq ($(HAVE_THREADS), 1)
         DEFINES += -DHAVE_CHEEVOS
         OBJ += cheevos.o libretro-common/utils/md5.o
      endif
   endif
+
+   ifeq ($(HAVE_NETWORKGAMEPAD), 1)
+      OBJ += input/input_remote.o \
+             cores/libretro-net-retropad/net_retropad_core.o
+   endif
 endif

 ifneq ($(findstring Win32,$(OS)),)
@@ -915,20 +1103,30 @@ endif
 ifeq ($(HAVE_FFMPEG), 1)
   OBJ += record/drivers/record_ffmpeg.o \
          cores/libretro-ffmpeg/ffmpeg_core.o
+
+
   LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
   DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
-	DEFINES += -DHAVE_FFMPEG -Iffmpeg
+   DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg
 endif

 ifeq ($(HAVE_COMPRESSION), 1)
   DEFINES += -DHAVE_COMPRESSION
 endif

+#ifeq ($(HAVE_DIRECTX), 1)
+   #$DEFINES += -I"$(DXSDK_DIR)/Include"
+#endif
+
 ifeq ($(HAVE_COCOA),1)
-	DEFINES += -DHAVE_MAIN
-	OBJ += input/drivers/cocoa_input.o \
+   DEFINES += -DHAVE_MAIN
+   OBJ += input/drivers/cocoa_input.o \
               input/drivers_keyboard/keyboard_event_apple.o \
               ui/drivers/ui_cocoa.o \
+               ui/drivers/cocoa/ui_cocoa_window.o \
+               ui/drivers/cocoa/ui_cocoa_browser_window.o \
+               ui/drivers/cocoa/ui_cocoa_msg_window.o \
+               ui/drivers/cocoa/ui_cocoa_application.o \
               ui/drivers/cocoa/cocoa_common.o \
               gfx/drivers_context/cocoa_gl_ctx.o
 endif
@@ -21,20 +21,32 @@ APP_RSF              = ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
 APP_BIG_TEXT_SECTION = 0
+APP_USE_SVCHAX       = 0

 include ctr/Makefile.cores

 OBJS :=
-OBJS += gfx/drivers/ctr_sprite.o
+OBJS += gfx/drivers/ctr_shaders/ctr_sprite.o
 OBJS += ctr/ctr_system.o
 OBJS += ctr/ctr_memory.o
 OBJS += ctr/ctr_linear.o
-OBJS += ctr/ctr_svchax.o
+
+ifeq ($(APP_BIG_TEXT_SECTION), 1)
+	APP_USE_SVCHAX = 1
+    LDFLAGS  += -Wl,--defsym,__ctr_patch_services=__service_ptr
+endif
+
+ifeq ($(APP_USE_SVCHAX), 1)
+	OBJS += ctr/ctr_svchax.o
+endif

 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJS += griffin/griffin.o
 else
-	OBJS += libretro-common/file/file_extract.o
+	CFLAGS += -DHAVE_COMPRESSION
+	OBJS += libretro-common/file/archive_file.o
+	OBJS += libretro-common/file/archive_file_zlib.o
+	OBJS += libretro-common/encodings/encoding_utf.o
 	OBJS += verbosity.o
 	OBJS += performance.o
 	OBJS += libretro-common/compat/compat_getopt.o
@@ -43,13 +55,13 @@ else
 	OBJS += libretro-common/compat/compat_fnmatch.o
 	OBJS += libretro-common/memmap/memalign.o
 	OBJS += libretro-common/file/config_file.o
-	OBJS += libretro-common/file/config_file_userdata.o
+	OBJS += config_file_userdata.o
 	OBJS += core_options.o
 	OBJS += cheats.o
 	OBJS += libretro-common/hash/rhash.o
 	OBJS += gfx/video_context_driver.o
 	OBJS += gfx/drivers_context/gfx_null_ctx.o
-	OBJS += gfx/image/image.o
+	OBJS += libretro-common/formats/image_texture.o
 	OBJS += libretro-common/formats/tga/rtga.o
 	OBJS += libretro-common/formats/png/rpng.o
 	OBJS += libretro-common/formats/png/rpng_encode.o
@@ -75,10 +87,11 @@ else
 	OBJS += input/drivers_joypad/hid_joypad.o
 	OBJS += input/drivers_hid/null_hid.o
 	OBJS += gfx/video_state_tracker.o
-	OBJS += libretro-common/queues/fifo_buffer.o
+	OBJS += libretro-common/queues/fifo_queue.o
 	OBJS += audio/audio_resampler_driver.o
-	OBJS += audio/drivers_resampler/sinc.o
-	OBJS += audio/drivers_resampler/nearest.o
+	OBJS += audio/drivers_resampler/sinc_resampler.o
+	OBJS += audio/drivers_resampler/nearest_resampler.o
+	OBJS += audio/drivers_resampler/null_resampler.o
 	OBJS += audio/drivers_resampler/cc_resampler.o
 	OBJS += camera/drivers/nullcamera.o
 	OBJS += location/drivers/nulllocation.o
@@ -86,7 +99,7 @@ else
 	OBJS += audio/drivers/ctr_dsp_audio.o
 	OBJS += audio/drivers/nullaudio.o
 	OBJS += gfx/video_driver.o
-	OBJS += gfx/video_common.o
+	OBJS += gfx/video_coord_array.o
 	OBJS += input/input_driver.o
 	OBJS += audio/audio_driver.o
 	OBJS += camera/camera_driver.o
@@ -122,17 +135,15 @@ else
 	OBJS += content.o
 	OBJS += libretro-common/file/file_path.o
 	OBJS += file_path_special.o
-	OBJS += libretro-common/file/dir_list.o
+	OBJS += libretro-common/lists/dir_list.o
 	OBJS += libretro-common/file/retro_dirent.o
-	OBJS += libretro-common/file/retro_file.o
+	OBJS += libretro-common/streams/file_stream.o
 	OBJS += libretro-common/file/retro_stat.o
-	OBJS += dir_list_special.o
-	OBJS += string_list_special.o
-	OBJS += libretro-common/string/string_list.o
+	OBJS += list_special.o
+	OBJS += libretro-common/lists/string_list.o
 	OBJS += libretro-common/string/stdstring.o
-	OBJS += file_ops.o
 	OBJS += libretro-common/file/nbio/nbio_stdio.o
-	OBJS += libretro-common/file/file_list.o
+	OBJS += libretro-common/lists/file_list.o
 	OBJS += libretro-common/queues/message_queue.o
 	OBJS += patch.o
 	OBJS += configuration.o
@@ -147,7 +158,8 @@ else
 	OBJS += libretro_version_1.o
 	OBJS += retroarch.o
 	OBJS += runloop.o
-	OBJS += tasks/tasks.o
+	OBJS += libretro-common/queues/task_queue.o
+	OBJS += tasks/tasks_internal.o
 	OBJS += msg_hash.o
 	OBJS += intl/msg_hash_de.o
 	OBJS += intl/msg_hash_es.o
@@ -161,8 +173,9 @@ else
 	OBJS += movie.o
 	OBJS += record/record_driver.o
 	OBJS += record/drivers/record_null.o
-	OBJS += tasks/task_decompress.o
+	OBJS += tasks/task_content.o
 	OBJS += tasks/task_file_transfer.o
+	OBJS += tasks/task_decompress.o
 	OBJS += screenshot.o
 	OBJS += playlist.o
 	OBJS += menu/menu_driver.o
@@ -172,6 +185,7 @@ else
 	OBJS += menu/menu_entries.o
 	OBJS += menu/menu_setting.o
 	OBJS += menu/menu_cbs.o
+	OBJS += menu/menu_content.o
 	OBJS += menu/cbs/menu_cbs_ok.o
 	OBJS += menu/cbs/menu_cbs_cancel.o
 	OBJS += menu/cbs/menu_cbs_select.o
@@ -220,8 +234,6 @@ else
 	OBJS += deps/zlib/trees.o
 	OBJS += deps/zlib/uncompr.o
 	OBJS += deps/zlib/zutil.o
-	OBJS += deps/zlib/ioapi.o
-	OBJS += deps/zlib/unzip.o
 	OBJS += audio/audio_utils.o
 endif

@@ -280,14 +292,12 @@ CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
 CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
-CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
-#-DHAVE_LIBRETRO_MANAGEMENT -DWANT_RPNG -DHAVE_7ZIP
-
+CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG

 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

 ASFLAGS	:=	-g $(ARCH) -O3
-LDFLAGS   =	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

 CFLAGS   += -std=gnu99 -ffast-math

@@ -315,11 +325,6 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJS) libretro_ctr.a

-ctr_sprite_shader_shbin.h: gfx/drivers/ctr_sprite.o
-gfx/drivers/ctr_gfx.c: ctr_sprite_shader_shbin.h
-griffin/griffin.o: gfx/drivers/ctr_gfx.c
-
-
 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-

 CC      := $(PREFIX)gcc
@@ -342,14 +347,15 @@ else
 	BANNERTOOL = ctr/tools/bannertool.exe
 endif

-%.o: %.shader
-	python $(AEMSTRO)/aemstro_as.py $< $(notdir $<).shbin
-	$(DEVKITARM)/bin/bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
-	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
-	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
-	echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h
-	rm $(notdir $<).shbin
+%.o: %.vsh %.gsh
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	rm $*.shbin

+%.o: %.vsh
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	rm $*.shbin

 %.o: %.cpp
 	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
@@ -405,7 +411,6 @@ clean:
 	rm -f $(TARGET).smdh
 	rm -f $(TARGET).bnr
 	rm -f $(TARGET).icn
-	rm -f *_shader_shbin.h
 	rm -f ctr/ctr_config_*.o
 	rm -f ctr/3dsx_custom_crt0.o

@@ -72,7 +72,7 @@ else
   CFLAGS += -O2
 endif

-CFLAGS += -DWANT_RPNG -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
+CFLAGS += -DHAVE_RPNG -DHAVE_RJPEG -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
          -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"

 all: $(TARGET)
@@ -127,6 +127,9 @@ endif
  HAVE_FILTERS_BUILTIN     := 1
  HAVE_THREADS             := 1
  HAVE_RPNG						:= 1
+  HAVE_RJPEG					:= 1
+  HAVE_RBMP					   := 1
+  HAVE_RTGA					   := 1
  HAVE_OVERLAY             := 1
  HAVE_BUILTIN_AUTOCONFIG  := 1
  HAVE_ZLIB                := 1
@@ -134,10 +137,10 @@ endif
  RARCH_CONSOLE          = 1

 ifeq ($(platform), wii)
+  HAVE_LANGEXTRA				:= 1
  HAVE_WIIUSB_HID          := 1
  HAVE_RARCH_EXEC          := 1
  HAVE_RSOUND              := 1
-  HAVE_LIBRETRO_MANAGEMENT := 1

  APP_BOOTER_DIR = wii/app_booter
  PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
@@ -185,9 +188,12 @@ else ifeq ($(platform), psp1)
  LDFLAGS +=  -Wl,-q

  BUILD_PRX                 = 1
-  HAVE_LIBRETRO_MANAGEMENT := 1
  HAVE_RPNG                := 1
+  HAVE_RJPEG					:= 1
+  HAVE_RBMP					   := 1
+  HAVE_RTGA					   := 1
  HAVE_KERNEL_PRX          := 1
+  HAVE_LANGEXTRA				:= 1
  RARCH_CONSOLE          = 1

 ifeq ($(BUILD_PRX), 1)
@@ -207,16 +213,20 @@ else ifeq ($(platform), vita)
 			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lUVLoader_stub \
 			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng

-  PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \
+  PLATOBJS += libretro-common/conversion/s16_to_float_neon.o \
+				  audio/drivers_resampler/sinc_resampler_neon.o \
              audio/drivers_resampler/cc_resampler_neon.o

  LIBDIRS += -L.
  LDFLAGS +=  -Wl,-q

  HAVE_FILTERS_BUILTIN     := 1
-  HAVE_LIBRETRO_MANAGEMENT := 1
  HAVE_BUILTIN_AUTOCONFIG  := 1
+  HAVE_LANGEXTRA				:= 1
  HAVE_RPNG                := 1
+  HAVE_RJPEG					:= 1
+  HAVE_RBMP					   := 1
+  HAVE_RTGA					   := 1
  HAVE_ZLIB                := 1
  HAVE_VITA2D              := 1
  HAVE_NETWORKING          := 1
@@ -245,10 +255,6 @@ ifeq ($(platform), vita)
 CFLAGS      += -DHAVE_SOCKET_LEGACY
 endif

-ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
-CFLAGS		+= -DHAVE_LIBRETRO_MANAGEMENT
-endif
-
 ifeq ($(HAVE_KERNEL_PRX), 1)
 CFLAGS      += -DHAVE_KERNEL_PRX
 endif
@@ -269,8 +275,8 @@ ifeq ($(BIG_STACK),1)
 CFLAGS		+= -DBIG_STACK
 endif

-ifeq ($(HAVE_RPNG), 1)
-CFLAGS      += -DWANT_RPNG
+ifeq ($(HAVE_RJPEG), 1)
+CFLAGS      += -DHAVE_RJPEG
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
@@ -289,6 +295,14 @@ ifeq ($(HAVE_RPNG), 1)
 CFLAGS      += -DHAVE_RPNG
 endif

+ifeq ($(HAVE_RBMP), 1)
+CFLAGS		+= -DHAVE_RBMP
+endif
+
+ifeq ($(HAVE_RTGA), 1)
+CFLAGS		+=	-DHAVE_RTGA
+endif
+
 ifeq ($(HAVE_7ZIP), 1)
 CFLAGS      += -DHAVE_7ZIP
 endif
@@ -319,6 +333,10 @@ endif

 CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts  -DRARCH_INTERNAL

+ifeq ($(HAVE_LANGEXTRA), 1)
+CFLAGS += -DHAVE_LANGEXTRA
+endif
+
 ifeq ($(HAVE_FILTERS_BUILTIN), 1)
 CFLAGS += -DHAVE_FILTERS_BUILTIN
 endif
@@ -357,7 +375,7 @@ all: $(EXT_TARGET)

 %.velf: %.elf
 	arm-vita-eabi-strip -g $<
-	vita-elf-create $< $@ $(VITASDK)/bin/db.json $(VITASDK)/bin/extra.json
+	vita-elf-create $< $@ $(VITASDK)/share/db.json $(VITASDK)/share/extra.json

 %.elf32: %.elf
 ifeq ($(platform), xenon360)
@@ -10,12 +10,12 @@ TARGET := retroarch-pandora
 LDDIRS = -L. -L$(PNDSDK)/usr/lib
 INCDIRS = -I. -I$(PNDSDK)/usr/include

-OBJ = griffin/griffin.o audio/resamplers/sinc_neon.o audio/audio_utils_neon.o
+OBJ = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o libretro-common/conversion/s16_to_float_neon.o libretro-common/conversion/float_to_s16_neon.o
 LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib

 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
 DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -D__ARM_ARCH_6__ -DSINC_LOWER_QUALITY -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DWANT_RPNG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -D__ARM_ARCH_6__ -DSINC_LOWER_QUALITY -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
 DEFINES += $(INCDIRS)
 DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize
@@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1)
 	DEFINES += -DHAVE_RLAUNCH
 endif

-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -106,7 +106,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe

-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LIBRETRODB -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -104,7 +104,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe

-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -24,20 +24,23 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/drivers/platform_ps3.c \
 				  frontend/drivers/platform_null.c \
 				  libretro-common/file/file_path.c \
-				  libretro-common/file/dir_list.c \
+				  libretro-common/lists/dir_list.c \
+				  libretro-common/lists/string_list.c \
 				  libretro-common/file/retro_dirent.c \
 				  libretro-common/file/retro_stat.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/stdstring.c \
-				  libretro-common/string/string_list.c \
 				  libretro-common/compat/compat_strl.c \
-				  libretro-common/file/retro_file.c \
+				  libretro-common/streams/file_stream.c \
 				  libretro-common/file/config_file.c \
+				  file_path_str.c \
 				  verbosity.c

 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER 
-PPU_SRCS		   += netlogger.c
+PPU_SRCS		   += network/net_logger.c \
+						libretro-common/net/net_compat.c \
+						libretro-common/net/net_socket.c
 endif

 PPU_TARGET		= retroarch-salamander_ps3.elf
@@ -83,7 +83,6 @@ OBJ = griffin/griffin.o

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
-CFLAGS		+= -Ilogger/netlogger
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
@@ -23,7 +23,7 @@ INCDIR = deps/zlib deps/7zip libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)

-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP

 LIBDIR =
 LDFLAGS =
@@ -37,14 +37,15 @@ OBJS = frontend/frontend_salamander.o \
 		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
 		 libretro-common/string/stdstring.o \
-		 libretro-common/string/string_list.o \
-		 libretro-common/file/dir_list.o \
+		 libretro-common/lists/string_list.o \
+		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/file/config_file.o \
-		 libretro-common/file/retro_file.o \
+		 libretro-common/streams/file_stream.o \
 		 libretro-common/file/retro_stat.o \
 		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
 		 verbosity.o \
 		 bootstrap/psp1/kernel_functions.o 

@@ -47,20 +47,23 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/file_path.o \
 		libretro-common/hash/rhash.o \
 		libretro-common/string/stdstring.o \
-		libretro-common/string/string_list.o \
-		libretro-common/file/dir_list.o \
-		libretro-common/file/retro_file.o \
+		libretro-common/lists/string_list.o \
+		libretro-common/lists/dir_list.o \
+		libretro-common/streams/file_stream.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/file/retro_stat.o \
 		libretro-common/compat/compat_strl.o \
 		libretro-common/file/config_file.o \
+		file_path_str.o \
 		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-OBJ             += logger/netlogger.o
+OBJ             += network/net_logger.o \
+						 libretro-common/net/net_compat.o \
+						 libretro-common/net/net_socket.o
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
@@ -1,5 +1,4 @@
 TARGET = retroarch.exe
-JTARGET = tools/retroarch-joyconfig.exe

 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
@@ -84,9 +83,7 @@ OBJDIR           := obj-w32

 OS               := Win32
 OBJ              :=
-JOYCONFIG_OBJ    :=
 LIBS             := -lm
-JOYCONFIG_LIBS   :=
 DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc

@@ -123,7 +120,6 @@ ifeq ($(DEBUG), 1)
 else
   CFLAGS += -O3 -ffast-math
   CXXFLAGS += -O3 -ffast-math
-   LDCXXFLAGS += -s
 endif

 CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I.
@@ -137,11 +133,10 @@ else
 endif

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))

-all: $(TARGET) $(JTARGET)
+all: $(TARGET)

-include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d)

 $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
@@ -170,37 +165,10 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 	@$(if $(Q), $(shell echo echo WINDRES $<),)
 	$(Q)$(WINDRES) -o $@ $<

-$(JTARGET): $(RARCH_JOYCONFIG_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-ifeq ($(CXX_BUILD), 1)
-	$(Q)$(CXX) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
-else
-	$(Q)$(CC) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
-endif
-
 clean:
 	rm -rf $(OBJDIR)
 	rm -f $(TARGET)
 	rm -f *.d
-	rm -f tools/retroarch-joyconfig.exe

-dist_x86: all
-	zip -r retroarch-win32-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
-
-dist_x86_64: all
-	zip -r retroarch-win64-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
-
-libs_x86:
-	wget http://themaister.net/retroarch-dl/RetroArch-win32-libs.zip
-	unzip RetroArch-win32-libs.zip
-	wget http://themaister.net/retroarch-dl/RetroArch-win32-headers.zip
-	unzip RetroArch-win32-headers.zip
-
-libs_x86_64:
-	wget http://themaister.net/retroarch-dl/RetroArch-win64-libs.zip
-	unzip RetroArch-win64-libs.zip
-	wget http://themaister.net/retroarch-dl/RetroArch-win64-headers.zip
-	unzip RetroArch-win64-headers.zip
-
-.PHONY: all install uninstall clean dist_x86 dist_x86_64 libs_x86 libs_x86_64
+.PHONY: all install uninstall clean

@@ -14,7 +14,7 @@ A libretro core written in portable C or C++ can run seamlessly on many platform
 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.

-[libretro API header](https://github.com/libretro/RetroArch/blob/master/libretro.h)
+[libretro API header](https://github.com/libretro/RetroArch/blob/master/libretro-common/include/libretro.h)

 ## Binaries

@@ -55,6 +55,7 @@ RetroArch has been ported to the following platforms outside PC:
   - Xbox 360 (Libxenon/XeXDK)
   - Xbox 1
   - Wii, Gamecube (Libogc)
+   - Nintendo 3DS
   - Raspberry Pi
   - Android
   - iOS
@@ -62,9 +63,14 @@ RetroArch has been ported to the following platforms outside PC:

 ## Dependencies (PC)

-On Windows, RetroArch can run with only Win32 as dependency. On Linux, you need:
+There are no true hard dependencies per se.

-   - GL headers
+On Windows, RetroArch can run with only Win32 as dependency.
+
+On Linux, there are no true dependencies. For optimal usage, the
+following dependencies come as recommended:
+
+   - GL headers / Vulkan headers
   - X11 headers and libs, or EGL/KMS/GBM

 OSX port of RetroArch requires latest versions of XCode to build.
@@ -20,39 +20,21 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>
+
 #include <boolean.h>
+#include <retro_common_api.h>
+
 #include "audio_dsp_filter.h"
+#include "audio_resampler_driver.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS

-enum rarch_audio_ctl_state
-{
-   RARCH_AUDIO_CTL_NONE = 0,
-   RARCH_AUDIO_CTL_INIT,
-   RARCH_AUDIO_CTL_DEINIT,
-   RARCH_AUDIO_CTL_DESTROY,
-   RARCH_AUDIO_CTL_DESTROY_DATA,
-   RARCH_AUDIO_CTL_START,
-   RARCH_AUDIO_CTL_STOP,
-   RARCH_AUDIO_CTL_FIND_DRIVER,
-   RARCH_AUDIO_CTL_SETUP_REWIND,
-   /* Sets audio monitor refresh rate to new value. */
-   RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
-   RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
-   RARCH_AUDIO_CTL_MUTE_TOGGLE,
-   RARCH_AUDIO_CTL_CALLBACK,
-   RARCH_AUDIO_CTL_HAS_CALLBACK,
-   RARCH_AUDIO_CTL_ALIVE,
-   RARCH_AUDIO_CTL_FRAME_IS_REVERSE,
-   RARCH_AUDIO_CTL_SET_OWN_DRIVER,
-   RARCH_AUDIO_CTL_UNSET_OWN_DRIVER,
-   RARCH_AUDIO_CTL_OWNS_DRIVER,
-   RARCH_AUDIO_CTL_SET_ACTIVE,
-   RARCH_AUDIO_CTL_UNSET_ACTIVE,
-   RARCH_AUDIO_CTL_IS_ACTIVE
-};
+#define AUDIO_CHUNK_SIZE_BLOCKING      512
+
+/* So we don't get complete line-noise when fast-forwarding audio. */
+#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
+
+#define AUDIO_MAX_RATIO                16

 typedef struct audio_driver
 {
@@ -93,14 +75,45 @@ typedef struct audio_driver
   /* Human-readable identifier. */
   const char *ident;

+   /* Optional. Get audio device list (allocates, caller has to free this) */
+   void *(*device_list_new)(void *data);
+
+   /* Optional. Frees audio device list */
+   void (*device_list_free)(void *data, void *data2);
+
   /* Optional. */
   size_t (*write_avail)(void *data);

   size_t (*buffer_size)(void *data);
 } audio_driver_t;

+void audio_driver_destroy_data(void);

-bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data);
+void audio_driver_set_own_driver(void);
+
+void audio_driver_unset_own_driver(void);
+
+void audio_driver_set_active(void);
+
+void audio_driver_unset_active(void);
+
+bool audio_driver_is_active(void);
+
+void audio_driver_destroy(void);
+
+void audio_driver_deinit_resampler(void);
+
+bool audio_driver_init_resampler(void);
+
+void audio_driver_process_resampler(struct resampler_data *data);
+
+bool audio_driver_free_devices_list(void);
+
+bool audio_driver_new_devices_list(void);
+
+bool audio_driver_enable_callback(void);
+
+bool audio_driver_disable_callback(void);

 /**
 * audio_driver_find_handle:
@@ -147,11 +160,40 @@ void audio_driver_dsp_filter_init(const char *device);

 void audio_driver_set_buffer_size(size_t bufsize);

-void audio_driver_set_callback(const void *info);
+bool audio_driver_get_devices_list(void **ptr);
+
+void audio_driver_setup_rewind(void);
+
+void audio_driver_monitor_adjust_system_rates(void);
+
+bool audio_driver_set_callback(const void *data);
+
+bool audio_driver_callback(void);
+
+bool audio_driver_has_callback(void);
+
+/* Sets audio monitor rate to new value. */
+void audio_driver_monitor_set_rate(void);
+
+bool audio_driver_find_driver(void);
+
+bool audio_driver_toggle_mute(void);
+
+bool audio_driver_start(void);
+
+bool audio_driver_stop(void);
+
+bool audio_driver_owns_driver(void);
+
 void audio_driver_unset_callback(void);

-void audio_driver_callback_set_state(bool state);
+void audio_driver_frame_is_reverse(void);

+bool audio_driver_alive(void);
+
+bool audio_driver_deinit(void);
+
+bool audio_driver_init(void);

 extern audio_driver_t audio_rsound;
 extern audio_driver_t audio_oss;
@@ -175,8 +217,6 @@ extern audio_driver_t audio_ctr_dsp;
 extern audio_driver_t audio_rwebaudio;
 extern audio_driver_t audio_null;

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
@@ -22,16 +22,16 @@
 #include <dynamic/dylib.h>

 #include <file/file_path.h>
-#include <file/config_file_userdata.h>
-#include <file/dir_list.h>
-
-#include "../performance.h"
+#include <lists/dir_list.h>
+#include <features/features_cpu.h>

 #include "audio_dsp_filter.h"
-#include "../dynamic.h"
 #include "audio_filters/dspfilter.h"
-#include "../file_ext.h"

+#include "../config_file_userdata.h"
+#include "../frontend/frontend_driver.h"
+#include "../performance_counters.h"
+#include "../dynamic.h"

 struct rarch_dsp_plug
 {
@@ -147,7 +147,7 @@ static const dspfilter_get_implementation_t dsp_plugs_builtin[] = {
 static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
 {
   unsigned i;
-   dspfilter_simd_mask_t mask = retro_get_cpu_features();
+   dspfilter_simd_mask_t mask = cpu_features_get();

   (void)list;

@@ -171,7 +171,7 @@ static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
 static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
 {
   unsigned i;
-   dspfilter_simd_mask_t mask = retro_get_cpu_features();
+   dspfilter_simd_mask_t mask = cpu_features_get();

   for (i = 0; i < list->size; i++)
   {
@@ -226,12 +226,13 @@ static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
 rarch_dsp_filter_t *rarch_dsp_filter_new(
      const char *filter_config, float sample_rate)
 {
-   char basedir[PATH_MAX_LENGTH] = {0};
+#if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
+   char basedir[PATH_MAX_LENGTH];
+   char ext_name[PATH_MAX_LENGTH];
+#endif
   struct string_list *plugs     = NULL;
   rarch_dsp_filter_t *dsp       = NULL;

-   (void)basedir;
-   
   dsp = (rarch_dsp_filter_t*)calloc(1, sizeof(*dsp));
   if (!dsp)
      return NULL;
@@ -243,7 +244,10 @@ rarch_dsp_filter_t *rarch_dsp_filter_new(
 #if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
   fill_pathname_basedir(basedir, filter_config, sizeof(basedir));

-   plugs = dir_list_new(basedir, EXT_EXECUTABLES, false, false);
+   if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+         goto error;
+
+   plugs = dir_list_new(basedir, ext_name, false, false);
   if (!plugs)
      goto error;
 #endif
@@ -17,9 +17,9 @@
 #ifndef __AUDIO_DSP_FILTER_H__
 #define __AUDIO_DSP_FILTER_H__

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS

 typedef struct rarch_dsp_filter rarch_dsp_filter_t;

@@ -41,9 +41,7 @@ struct rarch_dsp_data
 void rarch_dsp_filter_process(rarch_dsp_filter_t *dsp,
      struct rarch_dsp_data *data);

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif

@@ -18,9 +18,9 @@
 #ifndef DSPFILTER_API_H__
 #define DSPFILTER_API_H__

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS

 #define DSPFILTER_SIMD_SSE      (1 << 0)
 #define DSPFILTER_SIMD_SSE2     (1 << 1)
@@ -177,8 +177,6 @@ struct dspfilter_implementation
   const char *short_ident; 
 };

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
@@ -107,7 +107,7 @@ static void *echo_init(const struct dspfilter_info *info,
   config->get_float_array(userdata, "feedback", &feedback, &num_feedback, default_feedback, 1);
   config->get_float(userdata, "amp", &echo->amp, 0.2f);

-   channels       = num_feedback = num_delay = min(num_delay, num_feedback);
+   channels       = num_feedback = num_delay = MIN(num_delay, num_feedback);

   echo->channels = (struct echo_channel*)calloc(channels, sizeof(*echo->channels));
   if (!echo->channels)
@@ -276,7 +276,7 @@ static void *eq_init(const struct dspfilter_info *info,
      filter_path = NULL;
   }

-   num_gain = num_freq = min(num_gain, num_freq);
+   num_gain = num_freq = MIN(num_gain, num_freq);

   gains = (struct eq_gain*)calloc(num_gain, sizeof(*gains));
   if (!gains)
@@ -17,61 +17,10 @@
 #define RARCH_FFT_H__

 #include <retro_inline.h>
+#include <math/complex.h>

 typedef struct fft fft_t;

-// C99 <complex.h> would be nice.
-typedef struct
-{
-   float real;
-   float imag;
-} fft_complex_t;
-
-static INLINE fft_complex_t fft_complex_mul(fft_complex_t a,
-      fft_complex_t b)
-{
-   fft_complex_t out = {
-      a.real * b.real - a.imag * b.imag,
-      a.imag * b.real + a.real * b.imag,
-   };
-
-   return out;
-
-}
-
-static INLINE fft_complex_t fft_complex_add(fft_complex_t a,
-      fft_complex_t b)
-{
-   fft_complex_t out = {
-      a.real + b.real,
-      a.imag + b.imag,
-   };
-
-   return out;
-
-}
-
-static INLINE fft_complex_t fft_complex_sub(fft_complex_t a,
-      fft_complex_t b)
-{
-   fft_complex_t out = {
-      a.real - b.real,
-      a.imag - b.imag,
-   };
-
-   return out;
-
-}
-
-static INLINE fft_complex_t fft_complex_conj(fft_complex_t a)
-{
-   fft_complex_t out = {
-      a.real, -a.imag,
-   };
-
-   return out;
-}
-
 fft_t *fft_new(unsigned block_size_log2);

 void fft_free(fft_t *fft);
@@ -14,20 +14,23 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "audio_resampler_driver.h"
-#ifdef RARCH_INTERNAL
-#include "../performance.h"
-#endif
-#include <file/config_file_userdata.h>
 #include <string.h>
-#ifndef DONT_HAVE_STRING_LIST
-#include "../string_list_special.h"
+
+#include <string/stdstring.h>
+#include <features/features_cpu.h>
+
+#include "audio_resampler_driver.h"
+#include "../config_file_userdata.h"
+#ifdef RARCH_INTERNAL
+#include "../performance_counters.h"
 #endif
+#include "../list_special.h"

 static const rarch_resampler_t *resampler_drivers[] = {
   &sinc_resampler,
   &CC_resampler,
   &nearest_resampler,
+   &null_resampler,
   NULL,
 };

@@ -54,7 +57,7 @@ static int find_resampler_driver_index(const char *ident)
   unsigned i;

   for (i = 0; resampler_drivers[i]; i++)
-      if (strcasecmp(ident, resampler_drivers[i]->ident) == 0)
+      if (string_is_equal_noncase(ident, resampler_drivers[i]->ident))
         return i;
   return -1;
 }
@@ -89,7 +92,6 @@ const char *audio_resampler_driver_find_ident(int idx)
   return drv->ident;
 }

-#ifndef DONT_HAVE_STRING_LIST
 /**
 * config_get_audio_resampler_driver_options:
 *
@@ -101,7 +103,6 @@ const char* config_get_audio_resampler_driver_options(void)
 {
   return char_list_new_special(STRING_LIST_AUDIO_RESAMPLER_DRIVERS, NULL);
 }
-#endif

 /**
 * find_resampler_driver:
@@ -122,26 +123,9 @@ static const rarch_resampler_t *find_resampler_driver(const char *ident)
   return resampler_drivers[0];
 }

-#ifndef RARCH_INTERNAL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-retro_get_cpu_features_t perf_get_cpu_features_cb;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
 static resampler_simd_mask_t resampler_get_cpu_features(void)
 {
-#ifdef RARCH_INTERNAL
-   return retro_get_cpu_features();
-#else
-   return perf_get_cpu_features_cb();
-#endif
+   return cpu_features_get();
 }

 /**
@@ -18,16 +18,16 @@
 #ifndef __AUDIO_RESAMPLER_DRIVER_H
 #define __AUDIO_RESAMPLER_DRIVER_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
 #include <stdint.h>
+#include <stddef.h>
 #include <math.h>
-#include <boolean.h>

+#include <boolean.h>
+#include <retro_common_api.h>
 #include <retro_miscellaneous.h>
+#include <libretro.h>
+
+RETRO_BEGIN_DECLS

 #define RESAMPLER_SIMD_SSE      (1 << 0)
 #define RESAMPLER_SIMD_SSE2     (1 << 1)
@@ -140,6 +140,7 @@ typedef struct audio_frame_float
 extern rarch_resampler_t sinc_resampler;
 extern rarch_resampler_t CC_resampler;
 extern rarch_resampler_t nearest_resampler;
+extern rarch_resampler_t null_resampler;

 #ifndef DONT_HAVE_STRING_LIST
 /**
@@ -199,14 +200,6 @@ bool rarch_resampler_realloc(void **re, const rarch_resampler_t **backend,
   (backend)->process(handle, data); \
 } while(0)

-#ifndef RARCH_INTERNAL
-#include "libretro.h"
-extern retro_get_cpu_features_t perf_get_cpu_features_cb;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
-
@@ -17,11 +17,11 @@
 #include <stdlib.h>
 #include <string.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

 #include "audio_thread_wrapper.h"
-#include "../performance.h"
+#include "../performance_counters.h"
 #include "../verbosity.h"

 typedef struct audio_thread
@@ -34,6 +34,7 @@ typedef struct audio_thread
   scond_t *cond;
   bool alive;
   bool stopped;
+   bool stopped_ack;
   bool is_paused;
   bool use_float;

@@ -80,6 +81,7 @@ static void audio_thread_loop(void *data)
      if (!thr->alive)
      {
         scond_signal(thr->cond);
+         thr->stopped_ack = true;
         slock_unlock(thr->lock);
         break;
      }
@@ -88,12 +90,19 @@ static void audio_thread_loop(void *data)
      {
         thr->driver->stop(thr->driver_data);
         while (thr->stopped)
+         {
+            /* If we stop right after start, we might not be able to properly ack.
+             * Signal in the loop instead. */
+            thr->stopped_ack = true;
+            scond_signal(thr->cond);
+
            scond_wait(thr->cond, thr->lock);
+         }
         thr->driver->start(thr->driver_data);
      }

      slock_unlock(thr->lock);
-      audio_driver_ctl(RARCH_AUDIO_CTL_CALLBACK, NULL);
+      audio_driver_callback();
   }

   RARCH_LOG("[Audio Thread]: Tearing down driver.\n");
@@ -105,9 +114,18 @@ static void audio_thread_block(audio_thread_t *thr)
   if (!thr)
      return;

+   if (thr->stopped)
+      return;
+
   slock_lock(thr->lock);
+   thr->stopped_ack = false;
   thr->stopped = true;
   scond_signal(thr->cond);
+
+   /* Wait until audio driver actually goes to sleep. */
+   while (!thr->stopped_ack)
+      scond_wait(thr->cond, thr->lock);
+
   slock_unlock(thr->lock);
 }

@@ -167,11 +185,12 @@ static bool audio_thread_stop(void *data)
   audio_thread_t *thr = (audio_thread_t*)data;

   if (!thr)
-      return false;
+      return false; 

   audio_thread_block(thr);
   thr->is_paused = true;
-   audio_driver_callback_set_state(false);
+
+   audio_driver_disable_callback();

   return true;
 }
@@ -183,7 +202,8 @@ static bool audio_thread_start(void *data)
   if (!thr)
      return false;

-   audio_driver_callback_set_state(true);
+   audio_driver_enable_callback();
+
   thr->is_paused = false;
   audio_thread_unblock(thr);

@@ -240,7 +260,7 @@ static const audio_driver_t audio_thread = {
 };

 /**
- * rarch_threaded_audio_init:
+ * audio_init_thread:
 * @out_driver                : output driver
 * @out_data                  : output audio data
 * @device                    : audio device (optional)
@@ -255,7 +275,7 @@ static const audio_driver_t audio_thread = {
 *
 * Returns: true (1) if successful, otherwise false (0).
 **/
-bool rarch_threaded_audio_init(const audio_driver_t **out_driver,
+bool audio_init_thread(const audio_driver_t **out_driver,
      void **out_data, const char *device, unsigned audio_out_rate,
      unsigned latency, const audio_driver_t *drv)
 {
@@ -22,7 +22,7 @@
 #include "audio_driver.h"

 /**
- * rarch_threaded_audio_init:
+ * audio_init_thread:
 * @out_driver                : output driver
 * @out_data                  : output audio data
 * @device                    : audio device (optional)
@@ -36,7 +36,7 @@
 *
 * Returns: true (1) if successful, otherwise false (0).
 **/
-bool rarch_threaded_audio_init(const audio_driver_t **out_driver, void **out_data,
+bool audio_init_thread(const audio_driver_t **out_driver, void **out_data,
      const char *device, unsigned out_rate, unsigned latency,
      const audio_driver_t *driver);

@@ -1,435 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2014-2016 - Ali Bouhlel ( [email protected] )
- *
- *  RetroArch 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 Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch 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 RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <boolean.h>
-#include "audio_utils.h"
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#elif defined(__ALTIVEC__)
-#include <altivec.h>
-#endif
-
-#ifdef RARCH_INTERNAL
-#include "../performance.h"
-#endif
-
-/**
- * audio_convert_s16_to_float_C:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * C implementation callback function.
- **/
-void audio_convert_s16_to_float_C(float *out,
-      const int16_t *in, size_t samples, float gain)
-{
-   size_t i;
-   gain = gain / 0x8000;
-   for (i = 0; i < samples; i++)
-      out[i] = (float)in[i] * gain; 
-}
-
-/**
- * audio_convert_float_to_s16_C:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * C implementation callback function.
- **/
-void audio_convert_float_to_s16_C(int16_t *out,
-      const float *in, size_t samples)
-{
-   size_t i;
-   for (i = 0; i < samples; i++)
-   {
-      int32_t val = (int32_t)(in[i] * 0x8000);
-      out[i]      = (val > 0x7FFF) ? 0x7FFF :
-         (val < -0x8000 ? -0x8000 : (int16_t)val);
-   }
-}
-
-#if defined(__SSE2__)
-/**
- * audio_convert_s16_to_float_SSE2:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * SSE2 implementation callback function.
- **/
-void audio_convert_s16_to_float_SSE2(float *out,
-      const int16_t *in, size_t samples, float gain)
-{
-   size_t i;
-   float fgain   = gain / UINT32_C(0x80000000);
-   __m128 factor = _mm_set1_ps(fgain);
-
-   for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-   {
-      __m128i input    = _mm_loadu_si128((const __m128i *)in);
-      __m128i regs_l   = _mm_unpacklo_epi16(_mm_setzero_si128(), input);
-      __m128i regs_r   = _mm_unpackhi_epi16(_mm_setzero_si128(), input);
-      __m128 output_l  = _mm_mul_ps(_mm_cvtepi32_ps(regs_l), factor);
-      __m128 output_r  = _mm_mul_ps(_mm_cvtepi32_ps(regs_r), factor);
-
-      _mm_storeu_ps(out + 0, output_l);
-      _mm_storeu_ps(out + 4, output_r);
-   }
-
-   audio_convert_s16_to_float_C(out, in, samples - i, gain);
-}
-
-/**
- * audio_convert_float_to_s16_SSE2:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * SSE2 implementation callback function.
- **/
-void audio_convert_float_to_s16_SSE2(int16_t *out,
-      const float *in, size_t samples)
-{
-   size_t i;
-   __m128 factor = _mm_set1_ps((float)0x8000);
-
-   for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-   {
-      __m128 input_l = _mm_loadu_ps(in + 0);
-      __m128 input_r = _mm_loadu_ps(in + 4);
-      __m128 res_l   = _mm_mul_ps(input_l, factor);
-      __m128 res_r   = _mm_mul_ps(input_r, factor);
-      __m128i ints_l = _mm_cvtps_epi32(res_l);
-      __m128i ints_r = _mm_cvtps_epi32(res_r);
-      __m128i packed = _mm_packs_epi32(ints_l, ints_r);
-
-      _mm_storeu_si128((__m128i *)out, packed);
-   }
-
-   audio_convert_float_to_s16_C(out, in, samples - i);
-}
-#elif defined(__ALTIVEC__)
-/**
- * audio_convert_s16_to_float_altivec:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * AltiVec implementation callback function.
- **/
-void audio_convert_s16_to_float_altivec(float *out,
-      const int16_t *in, size_t samples, float gain)
-{
-   size_t samples_in = samples;
-
-   /* Unaligned loads/store is a bit expensive, so we 
-    * optimize for the good path (very likely). */
-   if (((uintptr_t)out & 15) + ((uintptr_t)in & 15) == 0)
-   {
-      size_t i;
-      const vector float gain_vec = { gain, gain , gain, gain };
-      const vector float zero_vec = { 0.0f, 0.0f, 0.0f, 0.0f};
-
-      for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-      {
-         vector signed short input = vec_ld(0, in);
-         vector signed int hi      = vec_unpackh(input);
-         vector signed int lo      = vec_unpackl(input);
-         vector float out_hi       = vec_madd(vec_ctf(hi, 15), gain_vec, zero_vec);
-         vector float out_lo       = vec_madd(vec_ctf(lo, 15), gain_vec, zero_vec);
-
-         vec_st(out_hi,  0, out);
-         vec_st(out_lo, 16, out);
-      }
-
-      samples_in -= i;
-   }
-   audio_convert_s16_to_float_C(out, in, samples_in, gain);
-}
-
-/**
- * audio_convert_float_to_s16_altivec:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * AltiVec implementation callback function.
- **/
-void audio_convert_float_to_s16_altivec(int16_t *out,
-      const float *in, size_t samples)
-{
-   int samples_in = samples;
-
-   /* Unaligned loads/store is a bit expensive, 
-    * so we optimize for the good path (very likely). */
-   if (((uintptr_t)out & 15) + ((uintptr_t)in & 15) == 0)
-   {
-      size_t i;
-      for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-      {
-         vector float       input0 = vec_ld( 0, in);
-         vector float       input1 = vec_ld(16, in);
-         vector signed int result0 = vec_cts(input0, 15);
-         vector signed int result1 = vec_cts(input1, 15);
-         vec_st(vec_packs(result0, result1), 0, out);
-      }
-
-      samples_in -= i;
-   }
-   audio_convert_float_to_s16_C(out, in, samples_in);
-}
-#elif defined(__ARM_NEON__) && !defined(VITA)
-/* Avoid potential hard-float/soft-float ABI issues. */
-void audio_convert_s16_float_asm(float *out, const int16_t *in,
-      size_t samples, const float *gain);
-
-/**
- * audio_convert_s16_to_float_neon:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * ARM NEON implementation callback function.
- **/
-static void audio_convert_s16_to_float_neon(float *out,
-      const int16_t *in, size_t samples, float gain)
-{
-   size_t aligned_samples = samples & ~7;
-   if (aligned_samples)
-      audio_convert_s16_float_asm(out, in, aligned_samples, &gain);
-
-   /* Could do all conversion in ASM, but keep it simple for now. */
-   audio_convert_s16_to_float_C(out + aligned_samples, in + aligned_samples,
-         samples - aligned_samples, gain);
-}
-
-void audio_convert_float_s16_asm(int16_t *out, const float *in, size_t samples);
-
-/**
- * audio_convert_float_to_s16_neon:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * ARM NEON implementation callback function.
- **/
-static void audio_convert_float_to_s16_neon(int16_t *out,
-      const float *in, size_t samples)
-{
-   size_t aligned_samples = samples & ~7;
-   if (aligned_samples)
-      audio_convert_float_s16_asm(out, in, aligned_samples);
-
-   audio_convert_float_to_s16_C(out + aligned_samples, in + aligned_samples,
-         samples - aligned_samples);
-}
-#elif defined(_MIPS_ARCH_ALLEGREX)
-
-/**
- * audio_convert_s16_to_float_ALLEGREX:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * MIPS ALLEGREX implementation callback function.
- **/
-void audio_convert_s16_to_float_ALLEGREX(float *out,
-      const int16_t *in, size_t samples, float gain)
-{
-#ifdef DEBUG
-   /* Make sure the buffer is 16 byte aligned, this should be the 
-    * default behaviour of malloc in the PSPSDK.
-    * Only the output buffer can be assumed to be 16-byte aligned. */
-   retro_assert(((uintptr_t)out & 0xf) == 0);
-#endif
-
-   size_t i;
-   gain = gain / 0x8000;
-   __asm__ (
-         ".set    push                    \n"
-         ".set    noreorder               \n"
-         "mtv     %0, s200                \n"
-         ".set    pop                     \n"
-         ::"r"(gain));
-
-   for (i = 0; i + 16 <= samples; i += 16)
-   {
-      __asm__ (
-            ".set    push                 \n"
-            ".set    noreorder            \n"
-
-            "lv.s    s100,  0(%0)         \n"
-            "lv.s    s101,  4(%0)         \n"
-            "lv.s    s110,  8(%0)         \n"
-            "lv.s    s111, 12(%0)         \n"
-            "lv.s    s120, 16(%0)         \n"
-            "lv.s    s121, 20(%0)         \n"
-            "lv.s    s130, 24(%0)         \n"
-            "lv.s    s131, 28(%0)         \n"
-
-            "vs2i.p  c100, c100           \n"
-            "vs2i.p  c110, c110           \n"
-            "vs2i.p  c120, c120           \n"
-            "vs2i.p  c130, c130           \n"
-
-            "vi2f.q  c100, c100, 16       \n"
-            "vi2f.q  c110, c110, 16       \n"
-            "vi2f.q  c120, c120, 16       \n"
-            "vi2f.q  c130, c130, 16       \n"
-
-            "vmscl.q e100, e100, s200     \n"
-
-            "sv.q    c100,  0(%1)         \n"
-            "sv.q    c110, 16(%1)         \n"
-            "sv.q    c120, 32(%1)         \n"
-            "sv.q    c130, 48(%1)         \n"
-
-            ".set    pop                  \n"
-            :: "r"(in + i), "r"(out + i));
-   }
-
-   for (; i < samples; i++)
-      out[i] = (float)in[i] * gain;
-}
-
-/**
- * audio_convert_float_to_s16_ALLEGREX:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * MIPS ALLEGREX implementation callback function.
- **/
-void audio_convert_float_to_s16_ALLEGREX(int16_t *out,
-      const float *in, size_t samples)
-{
-   size_t i;
-
-#ifdef DEBUG
-   /* Make sure the buffers are 16 byte aligned, this should be 
-    * the default behaviour of malloc in the PSPSDK.
-    * Both buffers are allocated by RetroArch, so can assume alignment. */
-   retro_assert(((uintptr_t)in  & 0xf) == 0);
-   retro_assert(((uintptr_t)out & 0xf) == 0);
-#endif
-
-   for (i = 0; i + 8 <= samples; i += 8)
-   {
-      __asm__ (
-            ".set    push                 \n"
-            ".set    noreorder            \n"
-
-            "lv.q    c100,  0(%0)         \n"
-            "lv.q    c110,  16(%0)        \n"
-
-            "vf2in.q c100, c100, 31       \n"
-            "vf2in.q c110, c110, 31       \n"
-            "vi2s.q  c100, c100           \n"
-            "vi2s.q  c102, c110           \n"
-
-            "sv.q    c100,  0(%1)         \n"
-
-            ".set    pop                  \n"
-            :: "r"(in + i), "r"(out + i));
-   }
-
-   for (; i < samples; i++)
-   {
-      int32_t val = (int32_t)(in[i] * 0x8000);
-      out[i]      = (val > 0x7FFF) ? 0x7FFF :
-         (val < -0x8000 ? -0x8000 : (int16_t)val);
-   }
-}
-#endif
-
-#ifndef RARCH_INTERNAL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-retro_get_cpu_features_t perf_get_cpu_features_cb;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-static unsigned audio_convert_get_cpu_features(void)
-{
-#ifdef RARCH_INTERNAL
-   return retro_get_cpu_features();
-#else
-   return perf_get_cpu_features_cb();
-#endif
-}
-
-/**
- * audio_convert_init_simd:
- *
- * Sets up function pointers for audio conversion
- * functions based on CPU features.
- **/
-void audio_convert_init_simd(void)
-{
-   unsigned cpu = audio_convert_get_cpu_features();
-
-   (void)cpu;
-#if defined(__ARM_NEON__) && !defined(VITA)
-   audio_convert_s16_to_float_arm = (cpu & RETRO_SIMD_NEON) ?
-      audio_convert_s16_to_float_neon : audio_convert_s16_to_float_C;
-   audio_convert_float_to_s16_arm = (cpu & RETRO_SIMD_NEON) ?
-      audio_convert_float_to_s16_neon : audio_convert_float_to_s16_C;
-#endif
-}
@@ -1,184 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *
- *  RetroArch 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 Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch 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 RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef AUDIO_UTILS_H
-#define AUDIO_UTILS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#if defined(__SSE2__)
-#define audio_convert_s16_to_float audio_convert_s16_to_float_SSE2
-#define audio_convert_float_to_s16 audio_convert_float_to_s16_SSE2
-
-/**
- * audio_convert_s16_to_float_SSE2:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * SSE2 implementation callback function.
- **/
-void audio_convert_s16_to_float_SSE2(float *out,
-      const int16_t *in, size_t samples, float gain);
-
-/**
- * audio_convert_float_to_s16_SSE2:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * SSE2 implementation callback function.
- **/
-void audio_convert_float_to_s16_SSE2(int16_t *out,
-      const float *in, size_t samples);
-
-#elif defined(__ALTIVEC__)
-#define audio_convert_s16_to_float audio_convert_s16_to_float_altivec
-#define audio_convert_float_to_s16 audio_convert_float_to_s16_altivec
-
-/**
- * audio_convert_s16_to_float_altivec:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * AltiVec implementation callback function.
- **/
-void audio_convert_s16_to_float_altivec(float *out,
-      const int16_t *in, size_t samples, float gain);
-
-/**
- * audio_convert_float_to_s16_altivec:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * AltiVec implementation callback function.
- **/
-void audio_convert_float_to_s16_altivec(int16_t *out,
-      const float *in, size_t samples);
-
-#elif defined(__ARM_NEON__) && !defined(VITA)
-#define audio_convert_s16_to_float audio_convert_s16_to_float_arm
-#define audio_convert_float_to_s16 audio_convert_float_to_s16_arm
-
-void (*audio_convert_s16_to_float_arm)(float *out,
-      const int16_t *in, size_t samples, float gain);
-
-void (*audio_convert_float_to_s16_arm)(int16_t *out,
-      const float *in, size_t samples);
-
-#elif defined(_MIPS_ARCH_ALLEGREX)
-#define audio_convert_s16_to_float audio_convert_s16_to_float_ALLEGREX
-#define audio_convert_float_to_s16 audio_convert_float_to_s16_ALLEGREX
-
-/**
- * audio_convert_s16_to_float_ALLEGREX:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * MIPS ALLEGREX implementation callback function.
- **/
-void audio_convert_s16_to_float_ALLEGREX(float *out,
-      const int16_t *in, size_t samples, float gain);
-
-/**
- * audio_convert_float_to_s16_ALLEGREX:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * MIPS ALLEGREX implementation callback function.
- **/
-void audio_convert_float_to_s16_ALLEGREX(int16_t *out,
-      const float *in, size_t samples);
-#else
-#define audio_convert_s16_to_float audio_convert_s16_to_float_C
-#define audio_convert_float_to_s16 audio_convert_float_to_s16_C
-#endif
-
-/**
- * audio_convert_s16_to_float_C:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied to the audio volume
- *
- * Converts audio samples from signed integer 16-bit
- * to floating point.
- *
- * C implementation callback function.
- **/
-void audio_convert_s16_to_float_C(float *out,
-      const int16_t *in, size_t samples, float gain);
-
-/**
- * audio_convert_float_to_s16_C:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts audio samples from floating point 
- * to signed integer 16-bit.
- *
- * C implementation callback function.
- **/
-void audio_convert_float_to_s16_C(int16_t *out,
-      const float *in, size_t samples);
-
-/**
- * audio_convert_init_simd:
- *
- * Sets up function pointers for audio conversion
- * functions based on CPU features.
- **/
-void audio_convert_init_simd(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
@@ -15,6 +15,8 @@

 #include <stdlib.h>

+#include <lists/string_list.h>
+
 #include <alsa/asoundlib.h>

 #include "../audio_driver.h"
@@ -154,7 +156,10 @@ error:
   if (alsa)
   {
      if (alsa->pcm)
+      {
         snd_pcm_close(alsa->pcm);
+         snd_config_update_free_global();
+      }

      free(alsa);
   }
@@ -296,7 +301,9 @@ static void alsa_free(void *data)
      {
         snd_pcm_drop(alsa->pcm);
         snd_pcm_close(alsa->pcm);
+         snd_config_update_free_global();
      }
+
      free(alsa);
   }
 }
@@ -324,6 +331,64 @@ static size_t alsa_buffer_size(void *data)
   return alsa->buffer_size;
 }

+static void *alsa_device_list_new(void *data)
+{
+   void **hints, **n;
+   union string_list_elem_attr attr;
+   struct string_list *s = string_list_new();
+
+   if (!s)
+      return NULL;
+
+   attr.i = 0;
+
+   if (snd_device_name_hint(-1, "pcm", &hints) != 0)
+      goto error;
+
+   n      = hints;
+
+   while (*n != NULL)
+   {
+      char *name = snd_device_name_get_hint(*n, "NAME");
+      char *io   = snd_device_name_get_hint(*n, "IOID");
+      char *desc = snd_device_name_get_hint(*n, "DESC");
+
+      /* description of device IOID - input / output identifcation
+       * ("Input" or "Output"), NULL means both) */
+
+      if (!io || !strcmp(io,"Output"))
+         string_list_append(s, name, attr);
+
+      if (name)
+         free(name);
+      if (io)
+         free(io);
+      if (desc)
+         free(desc);
+
+      n++;
+   }
+
+   /* free hint buffer too */
+   snd_device_name_free_hint(hints);
+
+   return s;
+
+error:
+   string_list_free(s);
+   return NULL;
+}
+
+static void alsa_device_list_free(void *data, void *array_list_data)
+{
+   struct string_list *s = (struct string_list*)array_list_data;
+
+   if (!s)
+      return;
+
+   string_list_free(s);
+}
+
 audio_driver_t audio_alsa = {
   alsa_init,
   alsa_write,
@@ -334,6 +399,8 @@ audio_driver_t audio_alsa = {
   alsa_free,
   alsa_use_float,
   "alsa",
+   alsa_device_list_new,
+   alsa_device_list_free,
   alsa_write_avail,
   alsa_buffer_size,
 };
@@ -227,7 +227,8 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)

   while (size)
   {
-      size_t avail_write = min(alsa->buf_size - alsa->buffer_ptr, size);
+      size_t avail_write = MIN(alsa->buf_size - alsa->buffer_ptr, size);
+
      if (avail_write)
      {
         memcpy(alsa->buffer[alsa->buffer_index] + 
@@ -376,6 +377,8 @@ audio_driver_t audio_alsa = {
   alsa_qsa_free,
   alsa_qsa_use_float,
   "alsa",
+   NULL,
+   NULL,
   alsa_qsa_write_avail,
   alsa_qsa_buffer_size,
 };
@@ -16,10 +16,12 @@

 #include <stdlib.h>

+#include <lists/string_list.h>
+
 #include <alsa/asoundlib.h>

 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -66,7 +68,7 @@ static void alsa_worker_thread(void *data)
      snd_pcm_sframes_t frames;
      slock_lock(alsa->fifo_lock);
      avail = fifo_read_avail(alsa->buffer);
-      fifo_size = min(alsa->period_size, avail);
+      fifo_size = MIN(alsa->period_size, avail);
      fifo_read(alsa->buffer, buf, fifo_size);
      scond_signal(alsa->cond);
      slock_unlock(alsa->fifo_lock);
@@ -130,7 +132,9 @@ static void alsa_thread_free(void *data)
   {
      if (alsa->worker_thread)
      {
+         slock_lock(alsa->cond_lock);
         alsa->thread_dead = true;
+         slock_unlock(alsa->cond_lock);
         sthread_join(alsa->worker_thread);
      }
      if (alsa->buffer)
@@ -252,11 +256,14 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
   {
      size_t avail;
      size_t write_amt;
+
      slock_lock(alsa->fifo_lock);
-      avail = fifo_write_avail(alsa->buffer);
-      write_amt = min(avail, size);
+      avail           = fifo_write_avail(alsa->buffer);
+      write_amt       = MIN(avail, size);
+
      fifo_write(alsa->buffer, buf, write_amt);
      slock_unlock(alsa->fifo_lock);
+
      return write_amt;
   }
   else
@@ -278,7 +285,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
         }
         else
         {
-            size_t write_amt = min(size - written, avail);
+            size_t write_amt = MIN(size - written, avail);
            fifo_write(alsa->buffer, (const char*)buf + written, write_amt);
            slock_unlock(alsa->fifo_lock);
            written += write_amt;
@@ -339,6 +346,64 @@ static size_t alsa_thread_buffer_size(void *data)
   return alsa->buffer_size;
 }

+static void *alsa_device_list_new(void *data)
+{
+   void **hints, **n;
+   union string_list_elem_attr attr;
+   struct string_list *s = string_list_new();
+
+   if (!s)
+      return NULL;
+
+   attr.i = 0;
+
+   if (snd_device_name_hint(-1, "pcm", &hints) != 0)
+      goto error;
+
+   n      = hints;
+
+   while (*n != NULL)
+   {
+      char *name = snd_device_name_get_hint(*n, "NAME");
+      char *io   = snd_device_name_get_hint(*n, "IOID");
+      char *desc = snd_device_name_get_hint(*n, "DESC");
+
+      /* description of device IOID - input / output identifcation
+       * ("Input" or "Output"), NULL means both) */
+
+      if (!io || !strcmp(io,"Output"))
+         string_list_append(s, name, attr);
+
+      if (name)
+         free(name);
+      if (io)
+         free(io);
+      if (desc)
+         free(desc);
+
+      n++;
+   }
+
+   /* free hint buffer too */
+   snd_device_name_free_hint(hints);
+
+   return s;
+
+error:
+   string_list_free(s);
+   return NULL;
+}
+
+static void alsa_device_list_free(void *data, void *array_list_data)
+{
+   struct string_list *s = (struct string_list*)array_list_data;
+
+   if (!s)
+      return;
+
+   string_list_free(s);
+}
+
 audio_driver_t audio_alsathread = {
   alsa_thread_init,
   alsa_thread_write,
@@ -349,6 +414,8 @@ audio_driver_t audio_alsathread = {
   alsa_thread_free,
   alsa_thread_use_float,
   "alsathread",
+   alsa_device_list_new,
+   alsa_device_list_free,
   alsa_thread_write_avail,
   alsa_thread_buffer_size,
 };
@@ -27,9 +27,10 @@
 #include <AudioUnit/AUComponent.h>

 #include <boolean.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <retro_endianness.h>
+#include <string/stdstring.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -174,7 +175,7 @@ static void choose_output_device(coreaudio_t *dev, const char* device)

      if (AudioObjectGetPropertyData(devices[i],
               &propaddr, 0, 0, &size, device_name) == noErr 
-            && !strcmp(device_name, device))
+            && string_is_equal(device_name, device))
      {
         AudioUnitSetProperty(dev->dev, kAudioOutputUnitProperty_CurrentDevice, 
               kAudioUnitScope_Global, 0, &devices[i], sizeof(AudioDeviceID));
@@ -439,6 +440,17 @@ static size_t coreaudio_buffer_size(void *data)
   return dev->buffer_size;
 }

+static void *coreaudio_device_list_new(void *data)
+{
+   /* TODO/FIXME */
+   return NULL;
+}
+
+static void coreaudio_device_list_free(void *data, void *array_list_data)
+{
+   /* TODO/FIXME */
+}
+
 audio_driver_t audio_coreaudio = {
   coreaudio_init,
   coreaudio_write,
@@ -449,6 +461,8 @@ audio_driver_t audio_coreaudio = {
   coreaudio_free,
   coreaudio_use_float,
   "coreaudio",
+   coreaudio_device_list_new,
+   coreaudio_device_list_free,
   coreaudio_write_avail,
   coreaudio_buffer_size,
 };
@@ -18,7 +18,7 @@

 #include "../audio_driver.h"
 #include "../../configuration.h"
-#include "../../performance.h"
+#include "../../performance_counters.h"
 #include "../../runloop.h"

 typedef struct
@@ -169,8 +169,8 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
   (void)samples_played;
   (void)current_tick;

-   rarch_perf_init(&ctraudio_f, "ctraudio_f");
-   retro_perf_start(&ctraudio_f);
+   performance_counter_init(&ctraudio_f, "ctraudio_f");
+   performance_counter_start(&ctraudio_f);

   ctr_csnd_audio_update_playpos(ctr);

@@ -202,7 +202,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
   GSPGPU_FlushDataCache(ctr->l, CTR_CSND_AUDIO_SIZE);
   GSPGPU_FlushDataCache(ctr->r, CTR_CSND_AUDIO_SIZE);

-   retro_perf_stop(&ctraudio_f);
+   performance_counter_stop(&ctraudio_f);

   return size;
 }
@@ -300,6 +300,8 @@ audio_driver_t audio_ctr_csnd = {
   ctr_csnd_audio_free,
   ctr_csnd_audio_use_float,
   "csnd",
+   NULL,
+   NULL,
   ctr_csnd_audio_write_avail,
   ctr_csnd_audio_buffer_size
 };
@@ -18,7 +18,7 @@

 #include "../audio_driver.h"
 #include "../../configuration.h"
-#include "../../performance.h"
+#include "../../performance_counters.h"
 #include "../../runloop.h"
 #include "../../ctr/ctr_debug.h"

@@ -116,8 +116,8 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
      }
   }

-   rarch_perf_init(&ctraudio_dsp_f, "ctraudio_dsp_f");
-   retro_perf_start(&ctraudio_dsp_f);
+   performance_counter_init(&ctraudio_dsp_f, "ctraudio_dsp_f");
+   performance_counter_start(&ctraudio_dsp_f);

   pos = ctr->pos << 2;

@@ -140,7 +140,7 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
   ctr->pos += size >> 2;
   ctr->pos &= CTR_DSP_AUDIO_COUNT_MASK;

-   retro_perf_stop(&ctraudio_dsp_f);
+   performance_counter_stop(&ctraudio_dsp_f);

   return size;
 }
@@ -214,6 +214,8 @@ audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_free,
   ctr_dsp_audio_use_float,
   "dsp",
+   NULL,
+   NULL,
   ctr_dsp_audio_write_avail,
   ctr_dsp_audio_buffer_size
 };
@@ -32,7 +32,7 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -489,6 +489,8 @@ audio_driver_t audio_dsound = {
   dsound_free,
   dsound_use_float,
   "dsound",
+   NULL,
+   NULL,
   dsound_write_avail,
   dsound_buffer_size,
 };
@@ -31,19 +31,6 @@
 #include "../../configuration.h"
 #include "../../defines/gx_defines.h"

-#define CHUNK_FRAMES 64
-#define CHUNK_SIZE (CHUNK_FRAMES * sizeof(uint32_t))
-#define BLOCKS 16
-
-#ifdef GEKKO
-#define AIInit AUDIO_Init
-#define AIInitDMA AUDIO_InitDMA
-#define AIStartDMA AUDIO_StartDMA
-#define AIStopDMA AUDIO_StopDMA
-#define AIRegisterDMACallback AUDIO_RegisterDMACallback
-#define AISetDSPSampleRate AUDIO_SetDSPSampleRate
-#endif
-
 typedef struct
 {
   uint32_t data[BLOCKS][CHUNK_FRAMES];
@@ -218,7 +205,7 @@ static void gx_audio_free(void *data)
   AIRegisterDMACallback(NULL);

   if (wa->cond)
-      LWP_CloseQueue(wa->cond);
+      OSCloseThreadQueue(wa->cond);
   wa->cond = 0;

   free(data);
@@ -254,6 +241,8 @@ audio_driver_t audio_gx = {
   gx_audio_free,
   gx_audio_use_float,
   "gx",
+   NULL,
+   NULL,
   gx_audio_write_avail,
   gx_audio_buffer_size,
 };
@@ -41,8 +41,10 @@ typedef struct jack
   bool nonblock;
   bool is_paused;

+#ifdef HAVE_THREADS
   scond_t *cond;
   slock_t *cond_lock;
+#endif
   size_t buffer_size;
 } jack_t;

@@ -54,7 +56,9 @@ static int process_cb(jack_nframes_t nframes, void *data)

   if (nframes <= 0)
   {
+#ifdef HAVE_THREADS
      scond_signal(jd->cond);
+#endif
      return 0;
   }

@@ -74,7 +78,9 @@ static int process_cb(jack_nframes_t nframes, void *data)
      for (f = min_avail; f < nframes; f++)
         out[f] = 0.0f;
   }
+#ifdef HAVE_THREADS
   scond_signal(jd->cond);
+#endif
   return 0;
 }

@@ -86,7 +92,9 @@ static void shutdown_cb(void *data)
      return;

   jd->shutdown = true;
+#ifdef HAVE_THREADS
   scond_signal(jd->cond);
+#endif
 }

 static int parse_ports(char **dest_ports, const char **jports)
@@ -149,8 +157,10 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency)
   if (!jd)
      return NULL;

+#ifdef HAVE_THREADS
   jd->cond      = scond_new();
   jd->cond_lock = slock_new();
+#endif

   jd->client = jack_client_open("RetroArch", JackNullOption, NULL);
   if (jd->client == NULL)
@@ -216,6 +226,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency)
 error:
   if (jports != NULL)
      jack_free(jports);
+   free(jd);
   return NULL;
 }

@@ -258,12 +269,14 @@ static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
         }
         written += write_frames;
      }
+#ifdef HAVE_THREADS
      else
      {
         slock_lock(jd->cond_lock);
         scond_wait(jd->cond, jd->cond_lock);
         slock_unlock(jd->cond_lock);
      }
+#endif

      if (jd->nonblock)
         break;
@@ -327,10 +340,12 @@ static void ja_free(void *data)
      if (jd->buffer[i] != NULL)
         jack_ringbuffer_free(jd->buffer[i]);

+#ifdef HAVE_THREADS
   if (jd->cond_lock)
      slock_free(jd->cond_lock);
   if (jd->cond)
      scond_free(jd->cond);
+#endif
   free(jd);
 }

@@ -362,6 +377,8 @@ audio_driver_t audio_jack = {
   ja_free,
   ja_use_float,
   "jack",
+   NULL,
+   NULL,
   ja_write_avail,
   ja_buffer_size,
 };
@@ -85,6 +85,8 @@ audio_driver_t audio_null = {
   null_audio_free,
   null_audio_use_float,
   "null",
+   NULL,
+   NULL,
   null_audio_write_avail,
   NULL
 };
@@ -162,7 +162,7 @@ static bool al_get_buffer(al_t *al, ALuint *buffer)

 static size_t al_fill_internal_buf(al_t *al, const void *buf, size_t size)
 {
-   size_t read_size = min(BUFSIZE - al->tmpbuf_ptr, size);
+   size_t read_size = MIN(BUFSIZE - al->tmpbuf_ptr, size);
   memcpy(al->tmpbuf + al->tmpbuf_ptr, buf, read_size);
   al->tmpbuf_ptr += read_size;
   return read_size;
@@ -267,6 +267,8 @@ audio_driver_t audio_openal = {
   al_free,
   al_use_float,
   "openal",
+   NULL,
+   NULL,
   al_write_avail,
   al_buffer_size,
 };
@@ -255,7 +255,7 @@ static ssize_t sl_write(void *data, const void *buf_, size_t size)
         slock_unlock(sl->lock);
      }

-      avail_write = min(sl->buf_size - sl->buffer_ptr, size);
+      avail_write = MIN(sl->buf_size - sl->buffer_ptr, size);

      if (avail_write)
      {
@@ -313,6 +313,8 @@ audio_driver_t audio_opensl = {
   sl_free,
   sl_use_float,
   "opensl",
+   NULL,
+   NULL,
   sl_write_avail,
   sl_buffer_size,
 };
@@ -212,6 +212,8 @@ audio_driver_t audio_oss = {
   oss_free,
   oss_use_float,
   "oss",
+   NULL,
+   NULL,
   oss_write_avail,
   oss_buffer_size,
 };
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -247,6 +247,8 @@ audio_driver_t audio_ps3 = {
   ps3_audio_free,
   ps3_audio_use_float,
   "ps3",
+   NULL,
+   NULL,
   ps3_audio_write_avail,
   NULL
 };
@@ -49,7 +49,7 @@ typedef struct psp_audio
 #define AUDIO_BUFFER_SIZE_MASK (AUDIO_BUFFER_SIZE-1)

 #ifdef VITA
-#define PSP_THREAD_STOPPED PSP2_THREAD_STOPPED
+#define PSP_THREAD_STOPPED SCE_THREAD_STOPPED
 #else
 #define SceKernelThreadInfo SceKernelThreadRunStatus
 #define sceKernelGetThreadInfo sceKernelReferThreadRunStatus
@@ -60,8 +60,8 @@ static int audioMainLoop(SceSize args, void* argp)
   psp_audio_t* psp = *((psp_audio_t**)argp);

 #ifdef VITA
-   int port = sceAudioOutOpenPort(PSP2_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
-      psp->rate, PSP2_AUDIO_OUT_MODE_STEREO);
+   int port = sceAudioOutOpenPort(SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
+      psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
 #else
   sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2);
 #endif
@@ -286,6 +286,8 @@ audio_driver_t audio_psp = {
 #else
   "psp",
 #endif
+   NULL,
+   NULL,
   psp_write_avail,
   psp_buffer_size,
 };
@@ -238,9 +238,7 @@ static ssize_t pulse_write(void *data, const void *buf_, size_t size)
   pa_threaded_mainloop_lock(pa->mainloop);
   while (size)
   {
-      size_t writable = pa_stream_writable_size(pa->stream);
-
-      writable = min(size, writable);
+      size_t writable = MIN(size, pa_stream_writable_size(pa->stream));

      if (writable)
      {
@@ -345,6 +343,8 @@ audio_driver_t audio_pulse = {
   pulse_free,
   pulse_use_float,
   "pulse",
+   NULL,
+   NULL,
   pulse_write_avail,
   pulse_buffer_size,
 };
@@ -24,11 +24,13 @@

 #include "../audio_driver.h"
 #include "../../configuration.h"
+#include "../../verbosity.h"

 typedef struct
 {
   roar_vs_t *vss;
   bool nonblocking;
+   bool is_paused;
 } roar_t;

 static void *ra_init(const char *device, unsigned rate, unsigned latency)
@@ -142,6 +144,8 @@ audio_driver_t audio_roar = {
   ra_free,
   ra_use_float,
   "roar",
+   NULL,
+   NULL,
   ra_write_avail,
   NULL
 };
@@ -17,7 +17,7 @@

 #include <boolean.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

 #include "../audio_driver.h"
@@ -233,6 +233,8 @@ audio_driver_t audio_rsound = {
   rs_free,
   rs_use_float,
   "rsound",
+   NULL,
+   NULL,
   rs_write_avail,
   rs_buffer_size,
 };
@@ -16,14 +16,6 @@
 #ifndef __RSOUND_H
 #define __RSOUND_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if 0
-#define STANDALONE
-#endif
-
 #include <sys/types.h>
 #include <unistd.h>
 #include <rthreads/rthreads.h>
@@ -32,7 +24,10 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>

-#include <queues/fifo_buffer.h>
+#include <retro_common_api.h>
+#include <queues/fifo_queue.h>
+
+RETRO_BEGIN_DECLS

 #ifdef _WIN32
 #define RSD_DEFAULT_HOST "127.0.0.1" /* Stupid Windows. */
@@ -323,8 +318,6 @@ int rsd_pause (rsound_t *rd, int enable);
 /* Frees an rsound_t struct. Make sure that the stream is properly closed down with rsd_stop() before calling rsd_free(). */
 int rsd_free (rsound_t *rd);

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
@@ -110,6 +110,8 @@ audio_driver_t audio_rwebaudio = {
   rwebaudio_free,
   rwebaudio_use_float,
   "rwebaudio",
+   NULL,
+   NULL,
   rwebaudio_write_avail,
   rwebaudio_buffer_size,
 };
@@ -23,7 +23,7 @@

 #include <boolean.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <retro_inline.h>

 #include "../audio_driver.h"
@@ -35,8 +35,10 @@ typedef struct sdl_audio
   bool nonblock;
   bool is_paused;

+#ifdef HAVE_THREADS
   slock_t *lock;
   scond_t *cond;
+#endif
   fifo_buffer_t *buffer;
 } sdl_audio_t;

@@ -47,7 +49,9 @@ static void sdl_audio_cb(void *data, Uint8 *stream, int len)
   size_t write_size = len > (int)avail ? avail : len;

   fifo_read(sdl->buffer, stream, write_size);
+#ifdef HAVE_THREADS
   scond_signal(sdl->cond);
+#endif

   /* If underrun, fill rest with silence. */
   memset(stream + write_size, 0, len - write_size);
@@ -109,8 +113,10 @@ static void *sdl_audio_init(const char *device,

   settings->audio.out_rate = out.freq;

+#ifdef HAVE_THREADS
   sdl->lock = slock_new();
   sdl->cond = scond_new();
+#endif

   RARCH_LOG("SDL audio: Requested %u ms latency, got %d ms\n", 
         latency, (int)(out.samples * 4 * 1000 / settings->audio.out_rate));
@@ -160,9 +166,11 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
         if (avail == 0)
         {
            SDL_UnlockAudio();
+#ifdef HAVE_THREADS
            slock_lock(sdl->lock);
            scond_wait(sdl->cond, sdl->lock);
            slock_unlock(sdl->lock);
+#endif
         }
         else
         {
@@ -220,8 +228,10 @@ static void sdl_audio_free(void *data)
   if (sdl)
   {
      fifo_free(sdl->buffer);
+#ifdef HAVE_THREADS
      slock_free(sdl->lock);
      scond_free(sdl->cond);
+#endif
   }
   free(sdl);
 }
@@ -253,6 +263,8 @@ audio_driver_t audio_sdl = {
 #else
   "sdl",
 #endif
+   NULL,
+   NULL,
   sdl_audio_write_avail,
   NULL
 };
@@ -194,7 +194,7 @@ static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)

   while (bytes)
   {
-      unsigned need   = min(bytes, handle->bufsize - handle->bufptr);
+      unsigned need   = MIN(bytes, handle->bufsize - handle->bufptr);

      memcpy(handle->buf + handle->write_buffer * handle->bufsize + handle->bufptr,
            buffer, need);
@@ -347,6 +347,8 @@ audio_driver_t audio_xa = {
   xa_free,
   xa_use_float,
   "xaudio",
+   NULL,
+   NULL,
   xa_write_avail,
   xa_buffer_size,
 };
@@ -146,6 +146,8 @@ audio_driver_t audio_xenon360 = {
   xenon360_audio_free,
   xenon360_use_float,
   "xenon360",
+   NULL,
+   NULL,
   xenon360_write_avail,
   NULL
 };
@@ -271,7 +271,7 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
   audio_frame_float_t *inp     = (audio_frame_float_t*)data->data_in;
   audio_frame_float_t *inp_max = (audio_frame_float_t*)(inp + data->input_frames);
   audio_frame_float_t *outp    = (audio_frame_float_t*)data->data_out;
-   float b                      = min(data->ratio, 1.00); /* cutoff frequency. */
+   float b                      = MIN(data->ratio, 1.00); /* cutoff frequency. */
   float ratio                  = 1.0 / data->ratio;
   __m128 vec_previous          = _mm_loadu_ps((float*)&re->buffer[0]);
   __m128 vec_current           = _mm_loadu_ps((float*)&re->buffer[2]);
@@ -446,7 +446,7 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
   audio_frame_float_t *inp_max = (audio_frame_float_t*)
      (inp + data->input_frames);
   audio_frame_float_t *outp    = (audio_frame_float_t*)data->data_out;
-   float                      b = min(data->ratio, 1.00); /* cutoff frequency. */
+   float                      b = MIN(data->ratio, 1.00); /* cutoff frequency. */
   float                  ratio = 1.0 / data->ratio;

   while (inp != inp_max)
@@ -0,0 +1,48 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2016 - Ali Bouhlel ( [email protected] )
+ *
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <math.h>
+ 
+#include "../audio_resampler_driver.h"
+typedef struct rarch_null_resampler
+{
+   void *empty;
+} rarch_null_resampler_t;
+ 
+static void resampler_null_process(
+      void *re_, struct resampler_data *data)
+{
+}
+ 
+static void resampler_null_free(void *re_)
+{
+}
+ 
+static void *resampler_null_init(const struct resampler_config *config,
+      double bandwidth_mod, resampler_simd_mask_t mask)
+{
+   return (void*)0;
+}
+ 
+rarch_resampler_t null_resampler = {
+   resampler_null_init,
+   resampler_null_process,
+   resampler_null_free,
+   RESAMPLER_API_VERSION,
+   "null",
+   "null"
+};
@@ -20,22 +20,19 @@ CFLAGS += -I$(LIBRETRO_COMM_DIR)/include -I../../
 LDFLAGS += -lm

 SHAREDOBJ += $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
-				 $(LIBRETRO_COMM_DIR)/string/string_list.o \
-				 $(LIBRETRO_COMM_DIR)/file/config_file_userdata.o \
+				 $(LIBRETRO_COMM_DIR)/lists/string_list.o \
+				 ../..//config_file_userdata.o \
+				 ../audio_resampler_driver.o \
 				 $(LIBRETRO_COMM_DIR)/file/config_file.o \
-				 $(LIBRETRO_COMM_DIR)/file/retro_file.o \
+				 $(LIBRETRO_COMM_DIR)/streams/file_stream.o \
+				 $(LIBRETRO_COMM_DIR)/string/stdstring.o \
 				 $(LIBRETRO_COMM_DIR)/file/file_path.o \
-				 $(LIBRETRO_COMM_DIR)/compat/compat.o \
+				 $(LIBRETRO_COMM_DIR)/file/retro_stat.o \
+				 $(LIBRETRO_COMM_DIR)/compat/compat_strl.o \
 				 $(LIBRETRO_COMM_DIR)/hash/rhash.o \

 all: $(TESTS)

-resampler-sinc.o: ../audio_resampler_driver.c $(SHAREDOBJ)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-resampler-cc.o: ../audio_resampler_driver.c $(SHAREDOBJ)
-	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
-
 main-cc.o: main.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'

@@ -45,16 +42,16 @@ snr-cc.o: snr.c
 cc-resampler.o: ../drivers_resampler/cc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)

-sinc-lowest.o: ../drivers_resampler/sinc.c
+sinc-lowest.o: ../drivers_resampler/sinc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWEST_QUALITY

-sinc-lower.o: ../drivers_resampler/sinc.c
+sinc-lower.o: ../drivers_resampler/sinc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWER_QUALITY

-sinc.o: ../drivers_resampler/sinc.c
+sinc.o: ../drivers_resampler/sinc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)

-nearest.o: ../drivers_resampler/nearest.c
+nearest_resampler.o: ../drivers_resampler/nearest_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)

 sinc-higher.o: ../drivers_resampler/sinc.c
@@ -63,40 +60,40 @@ sinc-higher.o: ../drivers_resampler/sinc.c
 sinc-highest.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHEST_QUALITY

-test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc-lower: sinc-lower.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-lower: sinc-lower.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc: sinc.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc: sinc.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc: sinc.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o  nearest.o $(SHAREDOBJ)
+test-snr-sinc: sinc.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc-higher: sinc-higher.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-higher: sinc-higher.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc-highest: sinc-highest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-highest: sinc-highest.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o  nearest.o $(SHAREDOBJ)
+test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ)
+test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o sinc.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ)
+test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

 %.o: %.c
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
      uniform = (2.0 * rand()) / RAND_MAX - 1.0;
      rate_mod = 1.0 + ratio_max_deviation * uniform;

-      audio_convert_s16_to_float(input_f, input_i, 1024, 1.0f);
+      convert_s16_to_float(input_f, input_i, 1024, 1.0f);

      data.data_in = input_f;
      data.data_out = output_f;
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])

      output_samples = data.output_frames * 2;

-      audio_convert_float_to_s16(output_i, output_f, output_samples);
+      convert_float_to_s16(output_i, output_f, output_samples);

      if (fwrite(output_i, sizeof(int16_t), output_samples, stdout) != output_samples)
         break;
@@ -17,57 +17,32 @@
 #ifndef __RARCH_AUTOSAVE_H
 #define __RARCH_AUTOSAVE_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stddef.h>

+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
 typedef struct autosave autosave_t;

 /**
- * autosave_new:
- * @path            : path to autosave file
- * @data            : pointer to buffer
- * @size            : size of @data buffer
- * @interval        : interval at which saves should be performed.
- *
- * Create and initialize autosave object.
- *
- * Returns: pointer to new autosave_t object if successful, otherwise
- * NULL.
- **/
-autosave_t *autosave_new(const char *path, const void *data,
-      size_t size, unsigned interval);
-
-/**
- * autosave_free:
- * @handle          : pointer to autosave object
- *
- * Frees autosave object.
- **/
-void autosave_free(autosave_t *handle);
-
-/**
- * lock_autosave:
+ * autosave_lock:
 *
 * Lock autosave.
 **/
-void lock_autosave(void);
+void autosave_lock(void);

 /**
- * unlock_autosave:
+ * autosave_unlock:
 *
 * Unlocks autosave.
 **/
-void unlock_autosave(void);
+void autosave_unlock(void);

-void autosave_event_init(void);
+void autosave_init(void);

-void autosave_event_deinit(void);
+void autosave_deinit(void);

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
@@ -17,9 +17,11 @@
 #include <string.h>

 #include "camera_driver.h"
-#include "../general.h"
-#include "../string_list_special.h"
-#include "../system.h"
+
+#include "../configuration.h"
+#include "../retroarch.h"
+#include "../runloop.h"
+#include "../list_special.h"
 #include "../verbosity.h"

 static const camera_driver_t *camera_drivers[] = {
@@ -41,9 +43,6 @@ static const camera_driver_t *camera_drivers[] = {
   NULL,
 };

-static const camera_driver_t *camera_driver;
-static void *camera_data;
-
 /**
 * camera_driver_find_handle:
 * @idx                : index of driver to get handle to.
@@ -88,138 +87,22 @@ const char* config_get_camera_driver_options(void)
   return char_list_new_special(STRING_LIST_CAMERA_DRIVERS, NULL);
 }

-void find_camera_driver(void)
-{
-   settings_t *settings = config_get_ptr();
-   int i = find_driver_index("camera_driver", settings->camera.driver);
-
-   if (i >= 0)
-      camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
-   else
-   {
-      unsigned d;
-      RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
-            settings->camera.driver);
-      RARCH_LOG_OUTPUT("Available camera drivers are:\n");
-      for (d = 0; camera_driver_find_handle(d); d++)
-         RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
-       
-      RARCH_WARN("Going to default to first camera driver...\n");
-       
-      camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
-       
-      if (!camera_driver)
-         retro_fail(1, "find_camera_driver()");
-   }
-}
-
-/**
- * driver_camera_start:
- *
- * Starts camera driver interface.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool driver_camera_start(void)
-{
-   settings_t *settings = config_get_ptr();
-
-   if (camera_driver && camera_data && camera_driver->start)
-   {
-      if (settings->camera.allow)
-         return camera_driver->start(camera_data);
-
-      runloop_msg_queue_push(
-            "Camera is explicitly disabled.\n", 1, 180, false);
-   }
-   return false;
-}
-
-/**
- * driver_camera_stop:
- *
- * Stops camera driver.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
 void driver_camera_stop(void)
 {
-   if (camera_driver && camera_driver->stop && camera_data)
-      camera_driver->stop(camera_data);
+   camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
 }

-/**
- * driver_camera_poll:
- *
- * Call camera driver's poll function.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_camera_poll(void)
+bool driver_camera_start(void)
 {
-   rarch_system_info_t *system = NULL;
-
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   if (camera_driver && camera_driver->poll && camera_data)
-      camera_driver->poll(camera_data,
-            system->camera_callback.frame_raw_framebuffer,
-            system->camera_callback.frame_opengl_texture);
-}
-
-void init_camera(void)
-{
-   settings_t        *settings = config_get_ptr();
-   rarch_system_info_t *system = NULL;
-
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   /* Resource leaks will follow if camera is initialized twice. */
-   if (camera_data)
-      return;
-
-   find_camera_driver();
-
-   camera_data = camera_driver->init(
-         *settings->camera.device ? settings->camera.device : NULL,
-         system->camera_callback.caps,
-         settings->camera.width ?
-         settings->camera.width : system->camera_callback.width,
-         settings->camera.height ?
-         settings->camera.height : system->camera_callback.height);
-
-   if (!camera_data)
-   {
-      RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
-      camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
-   }
-
-   if (system->camera_callback.initialized)
-      system->camera_callback.initialized();
-}
-
-static void uninit_camera(void)
-{
-   rarch_system_info_t *system = NULL;
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   if (camera_data && camera_driver)
-   {
-      if (system->camera_callback.deinitialized)
-         system->camera_callback.deinitialized();
-
-      if (camera_driver->free)
-         camera_driver->free(camera_data);
-   }
-
-   camera_data = NULL;
+   return camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
 }

 bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
 {
+   settings_t        *settings = config_get_ptr();
+   static struct retro_camera_callback camera_cb;
+   static const camera_driver_t *camera_driver   = NULL;
+   static void *camera_data                      = NULL;
   static bool camera_driver_active              = false;
   static bool camera_driver_data_own            = false;

@@ -229,6 +112,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
         camera_driver_active   = false;
         camera_driver_data_own = false;
         camera_driver          = NULL;
+         camera_data            = NULL;
         break;
      case RARCH_CAMERA_CTL_SET_OWN_DRIVER:
         camera_driver_data_own = true;
@@ -241,13 +125,110 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
      case RARCH_CAMERA_CTL_SET_ACTIVE:
         camera_driver_active = true; 
         break;
+      case RARCH_CAMERA_CTL_FIND_DRIVER:
+         {
+            int i;
+            driver_ctx_info_t drv;
+
+            drv.label = "camera_driver";
+            drv.s     = settings->camera.driver;
+
+            driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv);
+
+            i = drv.len;
+
+            if (i >= 0)
+               camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
+            else
+            {
+               unsigned d;
+               RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
+                     settings->camera.driver);
+               RARCH_LOG_OUTPUT("Available camera drivers are:\n");
+               for (d = 0; camera_driver_find_handle(d); d++)
+                  RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
+
+               RARCH_WARN("Going to default to first camera driver...\n");
+
+               camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
+
+               if (!camera_driver)
+                  retroarch_fail(1, "find_camera_driver()");
+            }
+         }
+         break;
      case RARCH_CAMERA_CTL_UNSET_ACTIVE:
         camera_driver_active = false; 
         break;
      case RARCH_CAMERA_CTL_IS_ACTIVE:
        return camera_driver_active; 
      case RARCH_CAMERA_CTL_DEINIT:
-        uninit_camera();
+        if (camera_data && camera_driver)
+        {
+           if (camera_cb.deinitialized)
+              camera_cb.deinitialized();
+
+           if (camera_driver->free)
+              camera_driver->free(camera_data);
+        }
+
+        camera_data = NULL;
+        break;
+      case RARCH_CAMERA_CTL_STOP:
+        if (     camera_driver 
+              && camera_driver->stop 
+              && camera_data)
+           camera_driver->stop(camera_data);
+        break;
+      case RARCH_CAMERA_CTL_START:
+        if (camera_driver && camera_data && camera_driver->start)
+        {
+           if (settings->camera.allow)
+              return camera_driver->start(camera_data);
+
+           runloop_msg_queue_push(
+                 "Camera is explicitly disabled.\n", 1, 180, false);
+        }
+        return false;
+      case RARCH_CAMERA_CTL_POLL:
+        if (!camera_cb.caps)
+           return false;
+        if (!camera_driver || !camera_driver->poll || !camera_data)
+           return false;
+        camera_driver->poll(camera_data,
+              camera_cb.frame_raw_framebuffer,
+              camera_cb.frame_opengl_texture);
+        break;
+      case RARCH_CAMERA_CTL_SET_CB:
+        {
+           struct retro_camera_callback *cb =
+              (struct retro_camera_callback*)data;
+           camera_cb          = *cb;
+        }
+        break;
+      case RARCH_CAMERA_CTL_INIT:
+        /* Resource leaks will follow if camera is initialized twice. */
+        if (camera_data)
+           return false;
+
+        camera_driver_ctl(RARCH_CAMERA_CTL_FIND_DRIVER, NULL);
+
+        camera_data = camera_driver->init(
+              *settings->camera.device ? settings->camera.device : NULL,
+              camera_cb.caps,
+              settings->camera.width ?
+              settings->camera.width : camera_cb.width,
+              settings->camera.height ?
+              settings->camera.height : camera_cb.height);
+
+        if (!camera_data)
+        {
+           RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
+           camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
+        }
+
+        if (camera_cb.initialized)
+           camera_cb.initialized();
        break;
      default:
         break;
@@ -18,12 +18,12 @@
 #define __CAMERA_DRIVER__H

 #include <stdint.h>
-#include <boolean.h>
-#include "../libretro.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>
+#include <libretro.h>
+
+RETRO_BEGIN_DECLS

 enum rarch_camera_ctl_state
 {
@@ -35,7 +35,13 @@ enum rarch_camera_ctl_state
   RARCH_CAMERA_CTL_OWNS_DRIVER,
   RARCH_CAMERA_CTL_SET_ACTIVE,
   RARCH_CAMERA_CTL_UNSET_ACTIVE,
-   RARCH_CAMERA_CTL_IS_ACTIVE
+   RARCH_CAMERA_CTL_IS_ACTIVE,
+   RARCH_CAMERA_CTL_FIND_DRIVER,
+   RARCH_CAMERA_CTL_POLL,
+   RARCH_CAMERA_CTL_SET_CB,
+   RARCH_CAMERA_CTL_STOP,
+   RARCH_CAMERA_CTL_START,
+   RARCH_CAMERA_CTL_INIT
 };

 typedef struct camera_driver
@@ -66,36 +72,6 @@ extern camera_driver_t camera_rwebcam;
 extern camera_driver_t camera_avfoundation;
 extern camera_driver_t camera_null;

-/**
- * driver_camera_start:
- *
- * Starts camera driver.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool driver_camera_start(void);
-
-/**
- * driver_camera_stop:
- *
- * Stops camera driver.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_camera_stop(void);
-
-/**
- * driver_camera_poll:
- *
- * Call camera driver's poll function.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_camera_poll(void);
-
 /**
 * config_get_camera_driver_options:
 *
@@ -125,14 +101,12 @@ const void *camera_driver_find_handle(int index);
 **/
 const char *camera_driver_find_ident(int index);

-void find_camera_driver(void);
+void driver_camera_stop(void);

-void init_camera(void);
+bool driver_camera_start(void);

 bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data);

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
@@ -41,7 +41,7 @@
 #include <compat/strl.h>

 #include "../camera_driver.h"
-#include "../../performance.h"
+#include "../../performance_counters.h"
 #include "../../verbosity.h"

 struct buffer
@@ -70,10 +70,10 @@ static void process_image(video4linux_t *v4l, const uint8_t *buffer_yuv)
 {
   static struct retro_perf_counter yuv_convert_direct = {0};

-   rarch_perf_init(&yuv_convert_direct, "yuv_convert_direct");
-   retro_perf_start(&yuv_convert_direct);
+   performance_counter_init(&yuv_convert_direct, "yuv_convert_direct");
+   performance_counter_start(&yuv_convert_direct);
   scaler_ctx_scale(&v4l->scaler, v4l->buffer_output, buffer_yuv);
-   retro_perf_stop(&yuv_convert_direct);
+   performance_counter_stop(&yuv_convert_direct);
 }

 static int xioctl(int fd, int request, void *args)
@@ -95,8 +95,8 @@ static bool init_mmap(void *data)

   memset(&req, 0, sizeof(req));

-   req.count = 4;
-   req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   req.count  = 4;
+   req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   req.memory = V4L2_MEMORY_MMAP;

   if (xioctl(v4l->fd, (uint8_t)VIDIOC_REQBUFS, &req) == -1)
@@ -210,9 +210,9 @@ static bool init_device(void *data)
   }

   /* VIDIOC_S_FMT may change width, height and pitch. */
-   v4l->width = fmt.fmt.pix.width;
+   v4l->width  = fmt.fmt.pix.width;
   v4l->height = fmt.fmt.pix.height;
-   v4l->pitch = max(fmt.fmt.pix.bytesperline, v4l->width * 2);
+   v4l->pitch  = MAX(fmt.fmt.pix.bytesperline, v4l->width * 2);

   /* Sanity check to see if our assumptions are met.
    * It is possible to support whatever the device gives us,
@@ -249,9 +249,9 @@ static void v4l_stop(void *data)

 static bool v4l_start(void *data)
 {
-   video4linux_t *v4l = (video4linux_t*)data;
   unsigned i;
   enum v4l2_buf_type type;
+   video4linux_t *v4l = (video4linux_t*)data;

   for (i = 0; i < v4l->n_buffers; i++)
   {
@@ -259,9 +259,9 @@ static bool v4l_start(void *data)

      memset(&buf, 0, sizeof(buf));

-      buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      buf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
      buf.memory = V4L2_MEMORY_MMAP;
-      buf.index = i;
+      buf.index  = i;

      if (xioctl(v4l->fd, (uint8_t)VIDIOC_QBUF, &buf) == -1)
      {
@@ -19,20 +19,48 @@
 #include <stdint.h>
 #include <stdlib.h>

-int cheevos_load(const void *data);
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef struct cheevos_ctx_desc
+{
+   unsigned idx;
+   char *s;
+   size_t len;
+} cheevos_ctx_desc_t;
+
+bool cheevos_load(const void *data);

-#ifdef HAVE_MENU
 void cheevos_populate_menu(void *data);
-#endif

-void cheevos_get_description(unsigned cheevo_ndx, char *str, size_t len);
+bool cheevos_get_description(cheevos_ctx_desc_t *desc);

-void cheevos_set_cheats(void);
+bool cheevos_apply_cheats(bool *data_bool);

-void cheevos_apply_cheats(bool enable);
+bool cheevos_unload(void);

-void cheevos_test(void);
+bool cheevos_toggle_hardcore_mode(void);

-void cheevos_unload(void);
+bool cheevos_test(void);
+
+bool cheevos_set_cheats(void);
+
+void cheevos_set_support_cheevos(bool state);
+
+
+typedef struct
+{
+   unsigned size;
+   unsigned type;
+   int      bank_id;
+   unsigned value;
+   unsigned previous;
+} cheevos_var_t;
+
+void cheevos_parse_guest_addr(cheevos_var_t *var, unsigned value);
+uint8_t *cheevos_get_memory(const cheevos_var_t *var);
+
+RETRO_END_DECLS

 #endif /* __RARCH_CHEEVOS_H */
@@ -23,31 +23,230 @@

 #include <stdint.h>
 #include <boolean.h>
+#include <retro_common_api.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS

-typedef struct rarch_cmd rarch_cmd_t;
+typedef struct command command_t;

-rarch_cmd_t *rarch_cmd_new(bool stdin_enable,
-      bool network_enable, uint16_t port);
+typedef struct command_handle
+{
+   command_t *handle;
+   unsigned id;
+} command_handle_t;

-void rarch_cmd_free(rarch_cmd_t *handle);
-
-void rarch_cmd_poll(rarch_cmd_t *handle);
-
-void rarch_cmd_set(rarch_cmd_t *handle, unsigned id);
-
-bool rarch_cmd_get(rarch_cmd_t *handle, unsigned id);
+enum event_command
+{
+   CMD_EVENT_NONE = 0,
+   /* Resets RetroArch. */
+   CMD_EVENT_RESET,
+   CMD_EVENT_SET_PER_GAME_RESOLUTION,
+   CMD_EVENT_SET_FRAME_LIMIT,
+   /* Loads core. */
+   CMD_EVENT_LOAD_CORE_DEINIT,
+   CMD_EVENT_LOAD_CORE,
+   CMD_EVENT_LOAD_CORE_PERSIST,
+   CMD_EVENT_UNLOAD_CORE,
+   CMD_EVENT_LOAD_STATE,
+   /* Swaps the current state with what's on the undo load buffer */
+   CMD_EVENT_UNDO_LOAD_STATE,
+   /* Rewrites a savestate on disk */
+   CMD_EVENT_UNDO_SAVE_STATE,
+   CMD_EVENT_SAVE_STATE,
+   CMD_EVENT_SAVE_STATE_DECREMENT,
+   CMD_EVENT_SAVE_STATE_INCREMENT,
+   /* Takes screenshot. */
+   CMD_EVENT_TAKE_SCREENSHOT,
+   /* Quits RetroArch. */
+   CMD_EVENT_QUIT,
+   /* Reinitialize all drivers. */
+   CMD_EVENT_REINIT,
+   /* Toggles cheevos hardcore mode. */
+   CMD_EVENT_CHEEVOS_HARDCORE_MODE_TOGGLE,
+   /* Deinitialize rewind. */
+   CMD_EVENT_REWIND_DEINIT,
+   /* Initializes rewind. */
+   CMD_EVENT_REWIND_INIT,
+   /* Toggles rewind. */
+   CMD_EVENT_REWIND_TOGGLE,
+   /* Deinitializes autosave. */
+   CMD_EVENT_AUTOSAVE_DEINIT,
+   /* Initializes autosave. */
+   CMD_EVENT_AUTOSAVE_INIT,
+   CMD_EVENT_AUTOSAVE_STATE,
+   /* Stops audio. */
+   CMD_EVENT_AUDIO_STOP,
+   /* Starts audio. */
+   CMD_EVENT_AUDIO_START,
+   /* Mutes audio. */
+   CMD_EVENT_AUDIO_MUTE_TOGGLE,
+   /* Initializes overlay. */
+   CMD_EVENT_OVERLAY_INIT,
+   /* Deinitializes overlay. */
+   CMD_EVENT_OVERLAY_DEINIT,
+   /* Sets current scale factor for overlay. */
+   CMD_EVENT_OVERLAY_SET_SCALE_FACTOR,
+   /* Sets current alpha modulation for overlay. */
+   CMD_EVENT_OVERLAY_SET_ALPHA_MOD,
+   /* Cycle to next overlay. */
+   CMD_EVENT_OVERLAY_NEXT,
+   /* Deinitializes overlay. */
+   CMD_EVENT_DSP_FILTER_INIT,
+   /* Deinitializes graphics filter. */
+   CMD_EVENT_DSP_FILTER_DEINIT,
+   /* Deinitializes GPU recoring. */
+   CMD_EVENT_GPU_RECORD_DEINIT,
+   /* Initializes recording system. */
+   CMD_EVENT_RECORD_INIT,
+   /* Deinitializes recording system. */
+   CMD_EVENT_RECORD_DEINIT,
+   /* Deinitializes history playlist. */
+   CMD_EVENT_HISTORY_DEINIT,
+   /* Initializes history playlist. */
+   CMD_EVENT_HISTORY_INIT,
+   /* Deinitializes core information. */
+   CMD_EVENT_CORE_INFO_DEINIT,
+   /* Initializes core information. */
+   CMD_EVENT_CORE_INFO_INIT,
+   /* Deinitializes core. */
+   CMD_EVENT_CORE_DEINIT,
+   /* Initializes core. */
+   CMD_EVENT_CORE_INIT,
+   /* Set audio blocking state. */
+   CMD_EVENT_AUDIO_SET_BLOCKING_STATE,
+   /* Set audio nonblocking state. */
+   CMD_EVENT_AUDIO_SET_NONBLOCKING_STATE,
+   /* Apply video state changes. */
+   CMD_EVENT_VIDEO_APPLY_STATE_CHANGES,
+   /* Set video blocking state. */
+   CMD_EVENT_VIDEO_SET_BLOCKING_STATE,
+   /* Set video nonblocking state. */
+   CMD_EVENT_VIDEO_SET_NONBLOCKING_STATE,
+   /* Sets current aspect ratio index. */
+   CMD_EVENT_VIDEO_SET_ASPECT_RATIO,
+   CMD_EVENT_RESET_CONTEXT,
+   /* Restarts RetroArch. */
+   CMD_EVENT_RESTART_RETROARCH,
+   /* Shutdown the OS */
+   CMD_EVENT_SHUTDOWN,
+   /* Reboot the OS */
+   CMD_EVENT_REBOOT,
+   /* Resume RetroArch when in menu. */
+   CMD_EVENT_RESUME,
+   /* Toggles pause. */
+   CMD_EVENT_PAUSE_TOGGLE,
+   /* Pauses RetroArch. */
+   CMD_EVENT_UNPAUSE,
+   /* Unpauses retroArch. */
+   CMD_EVENT_PAUSE,
+   CMD_EVENT_PAUSE_CHECKS,
+   CMD_EVENT_MENU_SAVE_CURRENT_CONFIG,
+   CMD_EVENT_MENU_SAVE_CONFIG,
+   CMD_EVENT_MENU_PAUSE_LIBRETRO,
+   /* Toggles menu on/off. */
+   CMD_EVENT_MENU_TOGGLE,
+   CMD_EVENT_MENU_REFRESH,
+   /* Applies shader changes. */
+   CMD_EVENT_SHADERS_APPLY_CHANGES,
+   /* Initializes shader directory. */
+   CMD_EVENT_SHADER_DIR_INIT,
+   /* Deinitializes shader directory. */
+   CMD_EVENT_SHADER_DIR_DEINIT,
+   /* Initializes controllers. */
+   CMD_EVENT_CONTROLLERS_INIT,
+   CMD_EVENT_SAVEFILES,
+   /* Initializes savefiles. */
+   CMD_EVENT_SAVEFILES_INIT,
+   /* Deinitializes savefiles. */
+   CMD_EVENT_SAVEFILES_DEINIT,
+   /* Initializes cheats. */
+   CMD_EVENT_CHEATS_INIT,
+   /* Deinitializes cheats. */
+   CMD_EVENT_CHEATS_DEINIT,
+   /* Apply cheats. */
+   CMD_EVENT_CHEATS_APPLY,
+   /* Deinitializes network system. */
+   CMD_EVENT_NETWORK_DEINIT,
+   /* Initializes network system. */
+   CMD_EVENT_NETWORK_INIT,
+   /* Initializes netplay system. */
+   CMD_EVENT_NETPLAY_INIT,
+   /* Deinitializes netplay system. */
+   CMD_EVENT_NETPLAY_DEINIT,
+   /* Flip netplay players. */
+   CMD_EVENT_NETPLAY_FLIP_PLAYERS,
+   /* Initializes BSV movie. */
+   CMD_EVENT_BSV_MOVIE_INIT,
+   /* Deinitializes BSV movie. */
+   CMD_EVENT_BSV_MOVIE_DEINIT,
+   /* Initializes command interface. */
+   CMD_EVENT_COMMAND_INIT,
+   /* Deinitialize command interface. */
+   CMD_EVENT_COMMAND_DEINIT,
+   /* Initializes remote gamepad interface. */
+   CMD_EVENT_REMOTE_INIT,
+   /* Deinitializes remote gamepad interface. */
+   CMD_EVENT_REMOTE_DEINIT,
+   /* Reinitializes audio driver. */
+   CMD_EVENT_AUDIO_REINIT,
+   /* Resizes windowed scale. Will reinitialize video driver. */
+   CMD_EVENT_RESIZE_WINDOWED_SCALE,
+   /* Deinitializes temporary content. */
+   CMD_EVENT_TEMPORARY_CONTENT_DEINIT,
+   CMD_EVENT_SUBSYSTEM_FULLPATHS_DEINIT,
+   CMD_EVENT_LOG_FILE_DEINIT,
+   /* Toggles disk eject. */
+   CMD_EVENT_DISK_EJECT_TOGGLE,
+   /* Cycle to next disk. */
+   CMD_EVENT_DISK_NEXT,
+   /* Cycle to previous disk. */
+   CMD_EVENT_DISK_PREV,
+   /* Appends disk image to disk image list. */
+   CMD_EVENT_DISK_APPEND_IMAGE,
+   /* Stops rumbling. */
+   CMD_EVENT_RUMBLE_STOP,
+   /* Toggles mouse grab. */
+   CMD_EVENT_GRAB_MOUSE_TOGGLE,
+   /* Toggles fullscreen mode. */
+   CMD_EVENT_FULLSCREEN_TOGGLE,
+   CMD_EVENT_PERFCNT_REPORT_FRONTEND_LOG,
+   CMD_EVENT_VOLUME_UP,
+   CMD_EVENT_VOLUME_DOWN,
+   CMD_EVENT_DISABLE_OVERRIDES
+};

+#ifdef HAVE_COMMAND
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-bool network_cmd_send(const char *cmd);
+bool command_network_send(const char *cmd_);
+#endif
 #endif

-#ifdef __cplusplus
-}
-#endif
+bool command_network_new(
+      command_t *handle,
+      bool stdin_enable,
+      bool network_enable,
+      uint16_t port);
+
+command_t *command_new(bool local_enable);
+
+bool command_poll(command_t *handle);
+
+bool command_get(command_handle_t *handle);
+
+bool command_set(command_handle_t *handle);
+
+bool command_free(command_t *handle);
+
+/**
+ * command_event:
+ * @cmd                  : Command index.
+ *
+ * Performs RetroArch command with index @cmd.
+ *
+ * Returns: true (1) on success, otherwise false (0).
+ **/
+bool command_event(enum event_command action, void *data);
+
+RETRO_END_DECLS

 #endif
-
@@ -1,232 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
- *  RetroArch 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 Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch 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 RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef COMMAND_EVENT_H__
-#define COMMAND_EVENT_H__
-
-#include <stdint.h>
-#include <boolean.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum event_command
-{
-   EVENT_CMD_NONE = 0,
-   /* Resets RetroArch. */
-   EVENT_CMD_RESET,
-   /* Loads content file. */
-   EVENT_CMD_LOAD_CONTENT,
-   EVENT_CMD_LOAD_CONTENT_PERSIST,
-#ifdef HAVE_FFMPEG
-   EVENT_CMD_LOAD_CONTENT_FFMPEG,
-#endif
-   EVENT_CMD_LOAD_CONTENT_IMAGEVIEWER,
-   EVENT_CMD_SET_PER_GAME_RESOLUTION,
-   EVENT_CMD_SET_FRAME_LIMIT,
-   /* Loads core. */
-   EVENT_CMD_LOAD_CORE_DEINIT,
-   EVENT_CMD_LOAD_CORE,
-   EVENT_CMD_LOAD_CORE_PERSIST,
-   EVENT_CMD_UNLOAD_CORE,
-   EVENT_CMD_LOAD_STATE,
-   EVENT_CMD_SAVE_STATE,
-   EVENT_CMD_SAVE_STATE_DECREMENT,
-   EVENT_CMD_SAVE_STATE_INCREMENT,
-   /* Takes screenshot. */
-   EVENT_CMD_TAKE_SCREENSHOT,
-   /* Quits RetroArch. */
-   EVENT_CMD_QUIT,
-   /* Reinitialize all drivers. */
-   EVENT_CMD_REINIT,
-   /* Deinitialize rewind. */
-   EVENT_CMD_REWIND_DEINIT,
-   /* Initializes rewind. */
-   EVENT_CMD_REWIND_INIT,
-   /* Toggles rewind. */
-   EVENT_CMD_REWIND_TOGGLE,
-   /* Deinitializes autosave. */
-   EVENT_CMD_AUTOSAVE_DEINIT,
-   /* Initializes autosave. */
-   EVENT_CMD_AUTOSAVE_INIT,
-   EVENT_CMD_AUTOSAVE_STATE,
-   /* Stops audio. */
-   EVENT_CMD_AUDIO_STOP,
-   /* Starts audio. */
-   EVENT_CMD_AUDIO_START,
-   /* Mutes audio. */
-   EVENT_CMD_AUDIO_MUTE_TOGGLE,
-   /* Initializes overlay. */
-   EVENT_CMD_OVERLAY_INIT,
-   /* Deinitializes overlay. */
-   EVENT_CMD_OVERLAY_DEINIT,
-   /* Sets current scale factor for overlay. */
-   EVENT_CMD_OVERLAY_SET_SCALE_FACTOR,
-   /* Sets current alpha modulation for overlay. */
-   EVENT_CMD_OVERLAY_SET_ALPHA_MOD,
-   /* Cycle to next overlay. */
-   EVENT_CMD_OVERLAY_NEXT,
-   /* Deinitializes overlay. */
-   EVENT_CMD_DSP_FILTER_INIT,
-   /* Deinitializes graphics filter. */
-   EVENT_CMD_DSP_FILTER_DEINIT,
-   /* Deinitializes GPU recoring. */
-   EVENT_CMD_GPU_RECORD_DEINIT,
-   /* Initializes recording system. */
-   EVENT_CMD_RECORD_INIT,
-   /* Deinitializes recording system. */
-   EVENT_CMD_RECORD_DEINIT,
-   /* Deinitializes history playlist. */
-   EVENT_CMD_HISTORY_DEINIT,
-   /* Initializes history playlist. */
-   EVENT_CMD_HISTORY_INIT,
-   /* Deinitializes core information. */
-   EVENT_CMD_CORE_INFO_DEINIT,
-   /* Initializes core information. */
-   EVENT_CMD_CORE_INFO_INIT,
-   /* Deinitializes core. */
-   EVENT_CMD_CORE_DEINIT,
-   /* Initializes core. */
-   EVENT_CMD_CORE_INIT,
-   /* Set audio blocking state. */
-   EVENT_CMD_AUDIO_SET_BLOCKING_STATE,
-   /* Set audio nonblocking state. */
-   EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE,
-   /* Apply video state changes. */
-   EVENT_CMD_VIDEO_APPLY_STATE_CHANGES,
-   /* Set video blocking state. */
-   EVENT_CMD_VIDEO_SET_BLOCKING_STATE,
-   /* Set video nonblocking state. */
-   EVENT_CMD_VIDEO_SET_NONBLOCKING_STATE,
-   /* Sets current aspect ratio index. */
-   EVENT_CMD_VIDEO_SET_ASPECT_RATIO,
-   EVENT_CMD_RESET_CONTEXT,
-   /* Restarts RetroArch. */
-   EVENT_CMD_RESTART_RETROARCH,
-   /* Force-quit RetroArch. */
-   EVENT_CMD_QUIT_RETROARCH,
-   /* Shutdown the OS */
-   EVENT_CMD_SHUTDOWN,
-   /* Resume RetroArch when in menu. */
-   EVENT_CMD_RESUME,
-   /* Toggles pause. */
-   EVENT_CMD_PAUSE_TOGGLE,
-   /* Pauses RetroArch. */
-   EVENT_CMD_UNPAUSE,
-   /* Unpauses retroArch. */
-   EVENT_CMD_PAUSE,
-   EVENT_CMD_PAUSE_CHECKS,
-   EVENT_CMD_MENU_SAVE_CURRENT_CONFIG,
-   EVENT_CMD_MENU_SAVE_CONFIG,
-   EVENT_CMD_MENU_PAUSE_LIBRETRO,
-   /* Toggles menu on/off. */
-   EVENT_CMD_MENU_TOGGLE,
-   EVENT_CMD_MENU_REFRESH,
-   /* Applies shader changes. */
-   EVENT_CMD_SHADERS_APPLY_CHANGES,
-   /* Initializes shader directory. */
-   EVENT_CMD_SHADER_DIR_INIT,
-   /* Deinitializes shader directory. */
-   EVENT_CMD_SHADER_DIR_DEINIT,
-   /* Initializes controllers. */
-   EVENT_CMD_CONTROLLERS_INIT,
-   EVENT_CMD_SAVEFILES,
-   /* Initializes savefiles. */
-   EVENT_CMD_SAVEFILES_INIT,
-   /* Deinitializes savefiles. */
-   EVENT_CMD_SAVEFILES_DEINIT,
-   /* Initializes cheats. */
-   EVENT_CMD_CHEATS_INIT,
-   /* Deinitializes cheats. */
-   EVENT_CMD_CHEATS_DEINIT,
-   /* Apply cheats. */
-   EVENT_CMD_CHEATS_APPLY,
-   /* Deinitializes network system. */
-   EVENT_CMD_NETWORK_DEINIT,
-   /* Initializes network system. */
-   EVENT_CMD_NETWORK_INIT,
-   /* Initializes netplay system. */
-   EVENT_CMD_NETPLAY_INIT,
-   /* Deinitializes netplay system. */
-   EVENT_CMD_NETPLAY_DEINIT,
-   /* Flip netplay players. */
-   EVENT_CMD_NETPLAY_FLIP_PLAYERS,
-   /* Initializes BSV movie. */
-   EVENT_CMD_BSV_MOVIE_INIT,
-   /* Deinitializes BSV movie. */
-   EVENT_CMD_BSV_MOVIE_DEINIT,
-   /* Initializes command interface. */
-   EVENT_CMD_COMMAND_INIT,
-   /* Deinitialize command interface. */
-   EVENT_CMD_COMMAND_DEINIT,
-   /* Initializes remote gamepad interface. */
-   EVENT_CMD_REMOTE_INIT,
-   /* Deinitializes remote gamepad interface. */
-   EVENT_CMD_REMOTE_DEINIT,
-   /* Deinitializes drivers. */
-   EVENT_CMD_DRIVERS_DEINIT,
-   /* Initializes drivers. */
-   EVENT_CMD_DRIVERS_INIT,
-   /* Reinitializes audio driver. */
-   EVENT_CMD_AUDIO_REINIT,
-   /* Resizes windowed scale. Will reinitialize video driver. */
-   EVENT_CMD_RESIZE_WINDOWED_SCALE,
-   /* Deinitializes temporary content. */
-   EVENT_CMD_TEMPORARY_CONTENT_DEINIT,
-   EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT,
-   EVENT_CMD_LOG_FILE_DEINIT,
-   /* Toggles disk eject. */
-   EVENT_CMD_DISK_EJECT_TOGGLE,
-   /* Cycle to next disk. */
-   EVENT_CMD_DISK_NEXT,
-   /* Cycle to previous disk. */
-   EVENT_CMD_DISK_PREV,
-   /* Stops rumbling. */
-   EVENT_CMD_RUMBLE_STOP,
-   /* Toggles mouse grab. */
-   EVENT_CMD_GRAB_MOUSE_TOGGLE,
-   /* Toggles fullscreen mode. */
-   EVENT_CMD_FULLSCREEN_TOGGLE,
-   EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG,
-   EVENT_CMD_REMAPPING_INIT,
-   EVENT_CMD_REMAPPING_DEINIT,
-   EVENT_CMD_VOLUME_UP,
-   EVENT_CMD_VOLUME_DOWN
-};
-
-/**
- * event_disk_control_append_image:
- * @path                 : Path to disk image. 
- *
- * Appends disk image to disk image list.
- **/
-void event_disk_control_append_image(const char *path);
-
-/**
- * event_command:
- * @cmd                  : Command index.
- *
- * Performs RetroArch command with index @cmd.
- *
- * Returns: true (1) on success, otherwise false (0).
- **/
-bool event_command(enum event_command action);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
@@ -18,7 +18,6 @@
 #define __CONFIG_DEF_H

 #include <boolean.h>
-#include "libretro.h"
 #include "driver.h"
 #include "gfx/video_driver.h"

@@ -29,6 +28,8 @@
 enum
 {
   VIDEO_GL = 0,
+   VIDEO_VULKAN,
+   VIDEO_DRM,
   VIDEO_XVIDEO,
   VIDEO_SDL,
   VIDEO_SDL2,
@@ -125,12 +126,15 @@ enum
   MENU_XUI,
   MENU_MATERIALUI,
   MENU_XMB,
+   MENU_NUKLEAR,

   RECORD_FFMPEG,
   RECORD_NULL
 };

-#ifdef GEKKO
+#if defined(HW_RVL)
+#define MAX_GAMMA_SETTING 30
+#elif defined(GEKKO)
 #define MAX_GAMMA_SETTING 2
 #else
 #define MAX_GAMMA_SETTING 1
@@ -320,7 +324,7 @@ enum

 #if defined(HAVE_XUI)
 #define MENU_DEFAULT_DRIVER MENU_XUI
-#elif defined(IOS) || defined(ANDROID)
+#elif defined(IOS) || defined(ANDROID) || defined(__QNX__)
 #define MENU_DEFAULT_DRIVER MENU_MATERIALUI
 #elif defined(__MACH__) && defined(HAVE_XMB) || defined(__CELLOS_LV2__)
 #define MENU_DEFAULT_DRIVER MENU_XMB
@@ -358,7 +362,7 @@ static const bool def_history_list_enable = true;

 static const unsigned int def_user_language = 0;

-#if (defined(__APPLE__) && defined(__MACH__) && defined(OSX)) || (defined(_WIN32) && !defined(_XBOX))
+#if (defined(_WIN32) && !defined(_XBOX))
 static const bool def_mouse_enable = true;
 #else
 static const bool def_mouse_enable = false;
@@ -408,6 +412,8 @@ static const bool disable_composition = false;
 /* Video VSYNC (recommended) */
 static const bool vsync = true;

+static const unsigned max_swapchain_images = 3;
+
 /* Attempts to hard-synchronize CPU and GPU.
 * Can reduce latency at cost of performance. */
 static const bool hard_sync = false;
@@ -506,8 +512,38 @@ static const bool default_overlay_enable = false;
 static const bool overlay_hide_in_menu = true;

 #ifdef HAVE_MENU
+#include "menu/menu_display.h"
+
 static bool default_block_config_read = true;

+static unsigned xmb_scale_factor = 100;
+static unsigned xmb_alpha_factor = 75;
+
+static unsigned xmb_icon_theme   = XMB_ICON_THEME_MONOCHROME;
+static unsigned xmb_theme        = XMB_THEME_ELECTRIC_BLUE;
+
+#ifdef HAVE_LAKKA
+static bool xmb_shadows_enable   = false;
+#else
+static bool xmb_shadows_enable   = true;
+#endif
+
+static float menu_wallpaper_opacity = 0.300;
+
+static float menu_footer_opacity = 1.000;
+
+static float menu_header_opacity = 1.000;
+
+static unsigned menu_background_gradient = 4;
+
+#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
+#if defined(HAVE_OPENGLES2) || defined(OSX_PPC)
+static unsigned menu_shader_pipeline = 1;
+#else
+static unsigned menu_shader_pipeline = 2;
+#endif
+#endif
+
 static bool show_advanced_settings    = true;
 static const uint32_t menu_entry_normal_color = 0xffffffff;
 static const uint32_t menu_entry_hover_color  = 0xff64ff64;
@@ -577,6 +613,9 @@ static const bool post_filter_record = false;
 /* Screenshots post-shaded GPU output if available. */
 static const bool gpu_screenshot = true;

+/* Screenshots named automatically. */
+static const bool auto_screenshot_filename = true;
+
 /* Record post-shaded GPU output instead of raw game footage if available. */
 static const bool gpu_record = false;

@@ -625,7 +664,12 @@ static const char *audio_device = NULL;

 /* Desired audio latency in milliseconds. Might not be honored
 * if driver can't provide given latency. */
+#ifdef ANDROID
+/* For most Android devices, 64ms is way too low. */
+static const int out_latency = 128;
+#else
 static const int out_latency = 64;
+#endif

 /* Will sync audio. (recommended) */
 static const bool audio_sync = true;
@@ -751,12 +795,20 @@ static const bool input_descriptor_hide_unbound = false;

 static const unsigned input_max_users = 5;

+static const unsigned input_poll_type_behavior = 2;
+
+static const unsigned input_bind_timeout = 5;
+
+static const unsigned menu_thumbnails_default = 3;
+
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
 #else
 static const bool ui_companion_start_on_boot = true;
 #endif

+static const bool ui_companion_enable = false;
+
 #if defined(ANDROID)
 #if defined(ANDROID_ARM)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
@@ -32,7 +32,7 @@ static const bool _network_command_supp = true;
 static const bool _network_command_supp = false;
 #endif

-#ifdef HAVE_NETWORK_GAMEPAD
+#ifdef HAVE_NETWORKGAMEPAD
 static const bool _network_gamepad_supp = true;
 #else
 static const bool _network_gamepad_supp = false;
@@ -74,7 +74,13 @@ static const bool _opengl_supp = true;
 static const bool _opengl_supp = false;
 #endif

-#if defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3)
+#ifdef HAVE_VULKAN
+static const bool _vulkan_supp = true;
+#else
+static const bool _vulkan_supp = false;
+#endif
+
+#if defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
 static const bool _opengles_supp = true;
 #else
 static const bool _opengles_supp = false;
@@ -296,6 +302,24 @@ static const bool _rpng_supp = true;
 static const bool _rpng_supp = false;
 #endif

+#ifdef HAVE_RJPEG
+static const bool _rjpeg_supp = true;
+#else
+static const bool _rjpeg_supp = false;
+#endif
+
+#ifdef HAVE_RBMP
+static const bool _rbmp_supp = true;
+#else
+static const bool _rbmp_supp = false;
+#endif
+
+#ifdef HAVE_RTGA
+static const bool _rtga_supp = true;
+#else
+static const bool _rtga_supp = false;
+#endif
+
 #ifdef HAVE_CORETEXT
 static const bool _coretext_supp = true;
 #else
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (config_file_userdata.c).
@@ -20,39 +20,10 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-#include <file/config_file_userdata.h>
 #include <file/file_path.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>

-#define get_array_setup() \
-   char key[2][256]; \
-   bool got; \
-   struct config_file_userdata *usr = (struct config_file_userdata*)userdata; \
-   char *str = NULL; \
-   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0])); \
-   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1])); \
-   got = config_get_string(usr->conf, key[0], &str); \
-   got = got || config_get_string(usr->conf, key[1], &str);
-
-#define get_array_body(T) \
-   if (got) \
-   { \
-      unsigned i; \
-      struct string_list *list = string_split(str, " "); \
-      *values = (T*)calloc(list->size, sizeof(T)); \
-      for (i = 0; i < list->size; i++) \
-         (*values)[i] = (T)strtod(list->elems[i].data, NULL); \
-      *out_num_values = list->size; \
-      string_list_free(list); \
-      return true; \
-   } \
-   else \
-   { \
-      *values = (T*)calloc(num_default_values, sizeof(T)); \
-      memcpy(*values, default_values, sizeof(T) * num_default_values); \
-      *out_num_values = num_default_values; \
-      return false; \
-   }
+#include "config_file_userdata.h"

 int config_userdata_get_float(void *userdata, const char *key_str,
      float *value, float default_value)
@@ -94,24 +65,74 @@ int config_userdata_get_float_array(void *userdata, const char *key_str,
      float **values, unsigned *out_num_values,
      const float *default_values, unsigned num_default_values)
 {
-   get_array_setup()
-   get_array_body(float)
+   char key[2][256];
+   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
+   char *str = NULL;
+
+   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
+   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
+
+   if (  config_get_string(usr->conf, key[0], &str) ||
+         config_get_string(usr->conf, key[1], &str))
+   {
+      unsigned i;
+      struct string_list *list = string_split(str, " ");
+      *values = (float*)calloc(list->size, sizeof(float));
+      for (i = 0; i < list->size; i++)
+         (*values)[i] = (float)strtod(list->elems[i].data, NULL);
+      *out_num_values = list->size;
+      string_list_free(list);
+      free(str);
+      return true;
+   }
+
+   *values = (float*)calloc(num_default_values, sizeof(float));
+   memcpy(*values, default_values, sizeof(float) * num_default_values); 
+   *out_num_values = num_default_values; 
+   return false; 
 }

 int config_userdata_get_int_array(void *userdata, const char *key_str,
      int **values, unsigned *out_num_values,
      const int *default_values, unsigned num_default_values)
 {
-   get_array_setup()
-   get_array_body(int)
+   char key[2][256];
+   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
+   char *str = NULL;
+   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
+   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
+
+   if (  config_get_string(usr->conf, key[0], &str) ||
+         config_get_string(usr->conf, key[1], &str))
+   {
+      unsigned i;
+      struct string_list *list = string_split(str, " ");
+      *values = (int*)calloc(list->size, sizeof(int));
+      for (i = 0; i < list->size; i++)
+         (*values)[i] = (int)strtod(list->elems[i].data, NULL);
+      *out_num_values = list->size;
+      string_list_free(list);
+      free(str);
+      return true;
+   }
+
+   *values = (int*)calloc(num_default_values, sizeof(int));
+   memcpy(*values, default_values, sizeof(int) * num_default_values);
+   *out_num_values = num_default_values;
+   return false;
 }

 int config_userdata_get_string(void *userdata, const char *key_str,
      char **output, const char *default_output)
 {
-   get_array_setup()
+   char key[2][256];
+   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
+   char *str = NULL;
+   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
+   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));

-   if (got)
+   if (  config_get_string(usr->conf, key[0], &str) ||
+         config_get_string(usr->conf, key[1], &str))
   {
      *output = str;
      return true; 
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (config_file_userdata.h).
@@ -25,7 +25,7 @@

 #include <string.h>

-#include "config_file.h"
+#include <file/config_file.h>

 struct config_file_userdata
 {
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
+ *
 *  RetroArch 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 Found-
 *  ation, either version 3 of the License, or (at your option) any later version.
@@ -20,6 +20,7 @@
 #include <stdint.h>

 #include <boolean.h>
+#include <retro_common_api.h>

 #include "gfx/video_driver.h"
 #include "driver.h"
@@ -28,9 +29,7 @@
 #define MAX_USERS 16
 #endif

-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS

 /* All config related settings go here. */

@@ -56,6 +55,7 @@ typedef struct settings
      bool vsync;
      bool hard_sync;
      bool black_frame_insertion;
+      unsigned max_swapchain_images;
      unsigned swap_interval;
      unsigned hard_sync_frames;
      unsigned frame_delay;
@@ -72,17 +72,12 @@ typedef struct settings
      unsigned aspect_ratio_idx;
      unsigned rotation;

-      char shader_path[PATH_MAX_LENGTH];
      bool shader_enable;

-      char softfilter_plugin[PATH_MAX_LENGTH];
      float refresh_rate;
      bool threaded;

-      char filter_dir[PATH_MAX_LENGTH];
-      char shader_dir[PATH_MAX_LENGTH];

-      char font_path[PATH_MAX_LENGTH];
      float font_size;
      bool font_enable;
      float msg_pos_x;
@@ -112,6 +107,7 @@ typedef struct settings
      bool menubar_enable;
      bool suspend_screensaver_enable;
      bool companion_start_on_boot;
+      bool companion_enable;
   } ui;

 #ifdef HAVE_MENU
@@ -122,9 +118,23 @@ typedef struct settings
      bool timedate_enable;
      bool core_enable;
      bool dynamic_wallpaper_enable;
-      bool boxart_enable;
+      unsigned thumbnails;
      bool throttle;
-      char wallpaper[PATH_MAX_LENGTH];
+
+      struct
+      {
+         float opacity;
+      } wallpaper;
+
+      struct
+      {
+         float opacity;
+      } footer;
+
+      struct
+      {
+         float opacity;
+      } header;

      struct
      {
@@ -163,6 +173,24 @@ typedef struct settings
      unsigned entry_normal_color;
      unsigned entry_hover_color;
      unsigned title_color;
+      bool throttle_framerate;
+      bool linear_filter;
+
+      struct
+      {
+         unsigned shader_pipeline;
+         char     font[PATH_MAX_LENGTH];
+         unsigned scale_factor;
+         unsigned alpha_factor;
+         unsigned theme;
+         unsigned menu_color_theme;
+         bool     shadows_enable;
+      } xmb;
+
+      struct
+      {
+         unsigned menu_color_theme;
+      } materialui;
   } menu;
 #endif

@@ -190,22 +218,20 @@ typedef struct settings
   struct
   {
      char driver[32];
+      char resampler[32];
+      char device[PATH_MAX_LENGTH];
      bool enable;
      bool mute_enable;
      unsigned out_rate;
      unsigned block_frames;
-      char device[PATH_MAX_LENGTH];
      unsigned latency;
      bool sync;

-      char dsp_plugin[PATH_MAX_LENGTH];
-      char filter_dir[PATH_MAX_LENGTH];

      bool rate_control;
      float rate_control_delta;
      float max_timing_skew;
      float volume; /* dB scale. */
-      char resampler[32];
   } audio;

   struct
@@ -213,6 +239,7 @@ typedef struct settings
      char driver[32];
      char joypad_driver[32];
      char keyboard_layout[64];
+      char device_names[MAX_USERS][64];

      unsigned remap_ids[MAX_USERS][RARCH_BIND_LIST_END];
      struct retro_keybind binds[MAX_USERS][RARCH_BIND_LIST_END];
@@ -233,7 +260,6 @@ typedef struct settings
      float axis_threshold;
      unsigned joypad_map[MAX_USERS];
      unsigned device[MAX_USERS];
-      char device_names[MAX_USERS][64];
      unsigned device_name_index[MAX_USERS];
      bool autodetect_enable;
      bool netplay_client_swap_input;
@@ -244,16 +270,13 @@ typedef struct settings
      bool overlay_enable;
      bool overlay_enable_autopreferred;
      bool overlay_hide_in_menu;
-      char overlay[PATH_MAX_LENGTH];
      float overlay_opacity;
      float overlay_scale;

-      char autoconfig_dir[PATH_MAX_LENGTH];
+      unsigned bind_timeout;
      bool input_descriptor_label_show;
      bool input_descriptor_hide_unbound;

-      char remapping_path[PATH_MAX_LENGTH];
-      
      unsigned menu_toggle_gamepad_combo;
      bool back_as_menu_toggle_enable;

@@ -262,12 +285,12 @@ typedef struct settings
 #endif
      bool keyboard_gamepad_enable;
      unsigned keyboard_gamepad_mapping_type;
+      unsigned poll_type_behavior;
   } input;

   struct
   {
      bool enable;
-      char overlay[PATH_MAX_LENGTH];
      float opacity;
      float scale;
   } osk;
@@ -284,10 +307,7 @@ typedef struct settings
      bool buildbot_auto_extract_archive;
   } network;

-   struct
-   {
-      bool set_supports_no_game_enable;
-   } core;
+   bool set_supports_no_game_enable;

   struct
   {
@@ -300,6 +320,7 @@ typedef struct settings
   {
      bool enable;
      bool test_unofficial;
+      bool hardcore_mode_enable;
      char username[32];
      char password[32];
   } cheevos;
@@ -310,32 +331,57 @@ typedef struct settings
   bool bundle_assets_extract_enable;
   unsigned bundle_assets_extract_version_current;
   unsigned bundle_assets_extract_last_version;
-   char bundle_assets_src_path[PATH_MAX_LENGTH];
-   char bundle_assets_dst_path[PATH_MAX_LENGTH];
-   char bundle_assets_dst_path_subdir[PATH_MAX_LENGTH];

-   char core_options_path[PATH_MAX_LENGTH];
-   char content_history_path[PATH_MAX_LENGTH];
-   char content_history_directory[PATH_MAX_LENGTH];
+   struct
+   {
+      char cheat_database[PATH_MAX_LENGTH];
+      char content_database[PATH_MAX_LENGTH];
+      char libretro[PATH_MAX_LENGTH];
+      char osk_overlay[PATH_MAX_LENGTH];
+      char overlay[PATH_MAX_LENGTH];
+      char menu_wallpaper[PATH_MAX_LENGTH];
+      char audio_dsp_plugin[PATH_MAX_LENGTH];
+      char softfilter_plugin[PATH_MAX_LENGTH];
+      char core_options[PATH_MAX_LENGTH];
+      char content_history[PATH_MAX_LENGTH];
+      char libretro_info[PATH_MAX_LENGTH];
+      char cheat_settings[PATH_MAX_LENGTH];
+      char bundle_assets_src[PATH_MAX_LENGTH];
+      char bundle_assets_dst[PATH_MAX_LENGTH];
+      char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
+      char shader[PATH_MAX_LENGTH];
+      char font[PATH_MAX_LENGTH];
+   } path;
+
+   struct
+   {
+      char audio_filter[PATH_MAX_LENGTH];
+      char autoconfig[PATH_MAX_LENGTH];
+      char video_filter[PATH_MAX_LENGTH];
+      char video_shader[PATH_MAX_LENGTH];
+      char content_history[PATH_MAX_LENGTH];
+      char libretro[PATH_MAX_LENGTH];
+      char cursor[PATH_MAX_LENGTH];
+      char input_remapping[PATH_MAX_LENGTH];
+      char overlay[PATH_MAX_LENGTH];
+      char resampler[PATH_MAX_LENGTH];
+      char screenshot[PATH_MAX_LENGTH];
+      char system[PATH_MAX_LENGTH];
+      char cache[PATH_MAX_LENGTH];
+      char playlist[PATH_MAX_LENGTH];
+      char core_assets[PATH_MAX_LENGTH];
+      char assets[PATH_MAX_LENGTH];
+      char dynamic_wallpapers[PATH_MAX_LENGTH];
+      char thumbnails[PATH_MAX_LENGTH];
+      char menu_config[PATH_MAX_LENGTH];
+      char menu_content[PATH_MAX_LENGTH];
+   } directory;
+
   unsigned content_history_size;

-   char libretro[PATH_MAX_LENGTH];
-   char libretro_directory[PATH_MAX_LENGTH];
   unsigned libretro_log_level;
-   char libretro_info_path[PATH_MAX_LENGTH];
-   char content_database[PATH_MAX_LENGTH];
-   char cheat_database[PATH_MAX_LENGTH];
-   char cursor_directory[PATH_MAX_LENGTH];
-   char cheat_settings_path[PATH_MAX_LENGTH];
-   char input_remapping_directory[PATH_MAX_LENGTH];

-   char overlay_directory[PATH_MAX_LENGTH];
-   char resampler_directory[PATH_MAX_LENGTH];
-   char screenshot_directory[PATH_MAX_LENGTH];
-   char system_directory[PATH_MAX_LENGTH];
-
-   char cache_directory[PATH_MAX_LENGTH];
-   char playlist_directory[PATH_MAX_LENGTH];
+   bool auto_screenshot_filename;

   bool history_list_enable;
   bool rewind_enable;
@@ -361,13 +407,7 @@ typedef struct settings
   unsigned network_remote_base_port;
   bool debug_panel_enable;

-   char core_assets_directory[PATH_MAX_LENGTH];
-   char assets_directory[PATH_MAX_LENGTH];
-   char dynamic_wallpapers_directory[PATH_MAX_LENGTH];
-   char boxarts_directory[PATH_MAX_LENGTH];
-   char menu_config_directory[PATH_MAX_LENGTH];
 #if defined(HAVE_MENU)
-   char menu_content_directory[PATH_MAX_LENGTH];
   bool menu_show_start_screen;
 #endif
   bool fps_show;
@@ -390,9 +430,18 @@ typedef struct settings
   unsigned menu_scroll_up_btn;

   char username[32];
+#ifdef HAVE_LANGEXTRA
   unsigned int user_language;
+#endif

   bool config_save_on_exit;
+
+#ifdef HAVE_SYSTEMD
+   bool ssh_enable;
+   bool samba_enable;
+   bool bluetooth_enable;
+#endif
+
 } settings_t;

 /**
@@ -520,16 +569,6 @@ bool config_unload_override(void);
 */
 bool config_load_remap(void);

-/**
- * config_save_keybinds_file:
- * @path            : Path that shall be written to.
- *
- * Writes a keybinds config file to disk.
- *
- * Returns: true (1) on success, otherwise returns false (0).
- **/
-bool config_save_keybinds_file(const char *path);
-
 /**
 * config_save_autoconf_profile:
 * @path            : Path that shall be written to.
@@ -548,14 +587,17 @@ bool config_save_autoconf_profile(const char *path, unsigned user);
 **/
 bool config_save_file(const char *path);

-bool config_realloc(void);
+/* Replaces currently loaded configuration file with
+ * another one. Will load a dummy core to flush state
+ * properly. */
+bool config_replace(char *path);
+
+bool config_init(void);

 void config_free(void);

 settings_t *config_get_ptr(void);

-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS

 #endif
@@ -1,709 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *
- *  RetroArch 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 Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch 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 RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <stdlib.h>
-#include <boolean.h>
-#include <string.h>
-#include <time.h>
-
-#ifdef _WIN32
-#ifdef _XBOX
-#include <xtl.h>
-#define setmode _setmode
-#define INVALID_FILE_ATTRIBUTES -1
-#else
-#include <io.h>
-#include <fcntl.h>
-#include <windows.h>
-#endif
-#endif
-
-#include <compat/strl.h>
-#include <file/file_path.h>
-#include <file/file_extract.h>
-#include <retro_file.h>
-#include <retro_stat.h>
-
-#include "msg_hash.h"
-#include "content.h"
-#include "file_ops.h"
-#include "general.h"
-#include "dynamic.h"
-#include "movie.h"
-#include "patch.h"
-#include "system.h"
-#include "verbosity.h"
-
-#ifdef HAVE_CHEEVOS
-#include "cheevos.h"
-#endif
-
-struct sram_block
-{
-   unsigned type;
-   void *data;
-   size_t size;
-};
-
-static struct string_list *temporary_content;
-
-/**
- * read_content_file:
- * @path         : buffer of the content file.
- * @buf          : size   of the content file.
- * @length       : size of the content file that has been read from.
- *
- * Read the content file. If read into memory, also performs soft patching
- * (see patch_content function) in case soft patching has not been
- * blocked by the enduser.
- *
- * Returns: true if successful, false on error.
- **/
-static bool read_content_file(unsigned i, const char *path, void **buf,
-      ssize_t *length)
-{
-   uint8_t *ret_buf = NULL;
-   global_t *global = global_get_ptr();
-
-   RARCH_LOG("%s: %s.\n",
-         msg_hash_to_str(MSG_LOADING_CONTENT_FILE), path);
-   if (!read_file(path, (void**) &ret_buf, length))
-      return false;
-
-   if (*length < 0)
-      return false;
-
-   if (i != 0)
-      return true;
-
-   /* Attempt to apply a patch. */
-   if (!global->patch.block_patch)
-      patch_content(&ret_buf, length);
-
-#ifdef HAVE_ZLIB
-   global->content_crc = zlib_crc32_calculate(ret_buf, *length);
-
-   RARCH_LOG("CRC32: 0x%x .\n", (unsigned)global->content_crc);
-#endif
-   *buf = ret_buf;
-
-   return true;
-}
-
-/**
- * dump_to_file_desperate:
- * @data         : pointer to data buffer.
- * @size         : size of @data.
- * @type         : type of file to be saved.
- *
- * Attempt to save valuable RAM data somewhere.
- **/
-static void dump_to_file_desperate(const void *data,
-      size_t size, unsigned type)
-{
-   time_t time_;
-   char timebuf[256];
-   char path[PATH_MAX_LENGTH]    = {0};
-#if defined(_WIN32) && !defined(_XBOX)
-   const char *base = getenv("APPDATA");
-#elif defined(__CELLOS_LV2__) || defined(_XBOX)
-   const char *base = NULL;
-#else
-   const char *base = getenv("HOME");
-#endif
-
-   if (!base)
-      goto error;
-
-   snprintf(path, sizeof(path), "%s/RetroArch-recovery-%u", base, type);
-
-   time(&time_);
-
-   strftime(timebuf, sizeof(timebuf), "%Y-%m-%d-%H-%M-%S", localtime(&time_));
-   strlcat(path, timebuf, sizeof(path));
-
-   if (retro_write_file(path, data, size))
-      RARCH_WARN("Succeeded in saving RAM data to \"%s\".\n", path);
-   else
-      goto error;
-
-   return;
-
-error:
-   RARCH_WARN("Failed ... Cannot recover save file.\n");
-}
-
-
-/**
- * save_state:
- * @path      : path of saved state that shall be written to.
- *
- * Save a state from memory to disk.
- *
- * Returns: true if successful, false otherwise.
- **/
-bool save_state(const char *path)
-{
-   bool ret    = false;
-   void *data  = NULL;
-   size_t size = core.retro_serialize_size();
-
-   RARCH_LOG("%s: \"%s\".\n",
-         msg_hash_to_str(MSG_SAVING_STATE),
-         path);
-
-   if (size == 0)
-      return false;
-
-   data = malloc(size);
-
-   if (!data)
-      return false;
-
-   RARCH_LOG("%s: %d %s.\n",
-         msg_hash_to_str(MSG_STATE_SIZE),
-         (int)size,
-         msg_hash_to_str(MSG_BYTES));
-   ret = core.retro_serialize(data, size);
-
-   if (ret)
-      ret = retro_write_file(path, data, size);
-
-   if (!ret)
-      RARCH_ERR("%s \"%s\".\n",
-            msg_hash_to_str(MSG_FAILED_TO_SAVE_STATE_TO),
-            path);
-
-   free(data);
-
-   return ret;
-}
-
-/**
- * load_state:
- * @path      : path that state will be loaded from.
- *
- * Load a state from disk to memory.
- *
- * Returns: true if successful, false otherwise.
- **/
-bool load_state(const char *path)
-{
-   unsigned i;
-   ssize_t size;
-   unsigned num_blocks       = 0;
-   void *buf                 = NULL;
-   struct sram_block *blocks = NULL;
-   settings_t *settings      = config_get_ptr();
-   global_t *global          = global_get_ptr();
-   bool ret                  = read_file(path, &buf, &size);
-
-   RARCH_LOG("%s: \"%s\".\n",
-         msg_hash_to_str(MSG_LOADING_STATE),
-         path);
-
-   if (!ret || size < 0)
-   {
-      RARCH_ERR("%s \"%s\".\n",
-            msg_hash_to_str(MSG_FAILED_TO_LOAD_STATE),
-            path);
-      return false;
-   }
-
-   RARCH_LOG("%s: %u %s.\n",
-         msg_hash_to_str(MSG_STATE_SIZE),
-         (unsigned)size,
-         msg_hash_to_str(MSG_BYTES));
-
-   if (settings->block_sram_overwrite && global->savefiles
-         && global->savefiles->size)
-   {
-      RARCH_LOG("%s.\n",
-            msg_hash_to_str(MSG_BLOCKING_SRAM_OVERWRITE));
-      blocks = (struct sram_block*)
-         calloc(global->savefiles->size, sizeof(*blocks));
-
-      if (blocks)
-      {
-         num_blocks = global->savefiles->size;
-         for (i = 0; i < num_blocks; i++)
-            blocks[i].type = global->savefiles->elems[i].attr.i;
-      }
-   }
-
-   for (i = 0; i < num_blocks; i++)
-      blocks[i].size = core.retro_get_memory_size(blocks[i].type);
-
-   for (i = 0; i < num_blocks; i++)
-      if (blocks[i].size)
-         blocks[i].data = malloc(blocks[i].size);
-
-   /* Backup current SRAM which is overwritten by unserialize. */
-   for (i = 0; i < num_blocks; i++)
-   {
-      if (blocks[i].data)
-      {
-         const void *ptr = core.retro_get_memory_data(blocks[i].type);
-         if (ptr)
-            memcpy(blocks[i].data, ptr, blocks[i].size);
-      }
-   }
-
-   ret = core.retro_unserialize(buf, size);
-
-   /* Flush back. */
-   for (i = 0; i < num_blocks; i++)
-   {
-      if (blocks[i].data)
-      {
-         void *ptr = core.retro_get_memory_data(blocks[i].type);
-         if (ptr)
-            memcpy(ptr, blocks[i].data, blocks[i].size);
-      }
-   }
-
-   for (i = 0; i < num_blocks; i++)
-      free(blocks[i].data);
-   free(blocks);
-   free(buf);
-   return ret;
-}
-
-/**
- * load_ram_file:
- * @path             : path of RAM state that will be loaded from.
- * @type             : type of memory
- *
- * Load a RAM state from disk to memory.
- */
-void load_ram_file(const char *path, int type)
-{
-   ssize_t rc;
-   bool ret    = false;
-   void *buf   = NULL;
-   size_t size = core.retro_get_memory_size(type);
-   void *data  = core.retro_get_memory_data(type);
-
-   if (size == 0 || !data)
-      return;
-
-   ret = read_file(path, &buf, &rc);
-
-   if (!ret)
-      return;
-
-   if (rc > 0)
-   {
-      if (rc > (ssize_t)size)
-      {
-         RARCH_WARN("SRAM is larger than implementation expects, doing partial load (truncating %u %s %s %u).\n",
-               (unsigned)rc,
-               msg_hash_to_str(MSG_BYTES),
-               msg_hash_to_str(MSG_TO),
-               (unsigned)size);
-         rc = size;
-      }
-      memcpy(data, buf, rc);
-   }
-
-   if (buf)
-      free(buf);
-}
-
-/**
- * save_ram_file:
- * @path             : path of RAM state that shall be written to.
- * @type             : type of memory
- *
- * Save a RAM state from memory to disk.
- *
- * In case the file could not be written to, a fallback function
- * 'dump_to_file_desperate' will be called.
- */
-void save_ram_file(const char *path, int type)
-{
-   size_t size = core.retro_get_memory_size(type);
-   void *data  = core.retro_get_memory_data(type);
-
-   if (!data || size == 0)
-      return;
-
-   if (!retro_write_file(path, data, size))
-   {
-      RARCH_ERR("%s.\n",
-            msg_hash_to_str(MSG_FAILED_TO_SAVE_SRAM));
-      RARCH_WARN("Attempting to recover ...\n");
-      dump_to_file_desperate(data, size, type);
-      return;
-   }
-
-   RARCH_LOG("%s \"%s\".\n",
-         msg_hash_to_str(MSG_SAVED_SUCCESSFULLY_TO),
-         path);
-}
-
-static bool load_content_dont_need_fullpath(
-      struct retro_game_info *info, unsigned i, const char *path)
-{
-   ssize_t len;
-   /* Load the content into memory. */
-
-   /* First content file is significant, attempt to do patching,
-    * CRC checking, etc. */
-   bool ret = false;
-
-   if (i == 0)
-      ret = read_content_file(i, path, (void**)&info->data, &len);
-   else
-      ret = read_file(path, (void**)&info->data, &len);
-
-   if (!ret || len < 0)
-   {
-      RARCH_ERR("%s \"%s\".\n",
-            msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE),
-            path);
-      return false;
-   }
-
-   info->size = len;
-
-   return true;
-}
-
-static bool load_content_need_fullpath(
-      struct retro_game_info *info, unsigned i,
-      struct string_list* additional_path_allocs,
-      bool need_fullpath, const char *path)
-{
-#ifdef HAVE_COMPRESSION
-   ssize_t len;
-   union string_list_elem_attr attributes;
-   char new_path[PATH_MAX_LENGTH]    = {0};
-   char new_basedir[PATH_MAX_LENGTH] = {0};
-   bool ret                          = false;
-   settings_t *settings              = config_get_ptr();
-   rarch_system_info_t      *sys_info= NULL;
-   
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &sys_info);
-
-   if (sys_info && sys_info->info.block_extract)
-      return true;
-   if (!need_fullpath || !path_contains_compressed_file(path))
-      return true;
-
-   RARCH_LOG("Compressed file in case of need_fullpath."
-         "Now extracting to temporary directory.\n");
-
-   strlcpy(new_basedir, settings->cache_directory,
-         sizeof(new_basedir));
-
-   if ((!strcmp(new_basedir, "")) ||
-         !path_is_directory(new_basedir))
-   {
-      RARCH_WARN("Tried extracting to cache directory, but "
-            "cache directory was not set or found. "
-            "Setting cache directory to directory "
-            "derived by basename...\n");
-      fill_pathname_basedir(new_basedir, path,
-            sizeof(new_basedir));
-   }
-
-   attributes.i = 0;
-   fill_pathname_join(new_path, new_basedir,
-         path_basename(path), sizeof(new_path));
-
-   ret = read_compressed_file(path,NULL,new_path, &len);
-
-   if (!ret || len < 0)
-   {
-      RARCH_ERR("%s \"%s\".\n",
-            msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE),
-            path);
-      return false;
-   }
-
-   string_list_append(additional_path_allocs,new_path, attributes);
-   info[i].path =
-      additional_path_allocs->elems
-      [additional_path_allocs->size -1 ].data;
-
-   /* temporary_content is initialized in init_content_file
-    * The following part takes care of cleanup of the unzipped files
-    * after exit.
-    */
-   retro_assert(temporary_content != NULL);
-   string_list_append(temporary_content,
-         new_path, attributes);
-
-#endif
-   return true;
-}
-
-/**
- * load_content:
- * @special          : subsystem of content to be loaded. Can be NULL.
- * content           :
- *
- * Load content file (for libretro core).
- *
- * Returns : true if successful, otherwise false.
- **/
-static bool load_content(const struct retro_subsystem_info *special,
-      const struct string_list *content)
-{
-   unsigned i;
-   bool ret = true;
-   struct string_list* additional_path_allocs = string_list_new();
-   struct retro_game_info *info = (struct retro_game_info*)
-      calloc(content->size, sizeof(*info));
-
-   if (!info)
-   {
-      string_list_free(additional_path_allocs);
-      return false;
-   }
-
-   for (i = 0; i < content->size; i++)
-   {
-      const char *path     = content->elems[i].data;
-      int         attr     = content->elems[i].attr.i;
-      bool need_fullpath   = attr & 2;
-      bool require_content = attr & 4;
-
-      if (require_content && !*path)
-      {
-         RARCH_LOG("libretro core requires content, but nothing was provided.\n");
-         ret = false;
-         goto end;
-      }
-
-      info[i].path = NULL;
-
-      if (*path)
-         info[i].path = path;
-
-      if (!need_fullpath && *path)
-      {
-         if (!load_content_dont_need_fullpath(&info[i], i, path))
-            goto end;
-      }
-      else
-      {
-         RARCH_LOG("Content loading skipped. Implementation will"
-               " load it on its own.\n");
-
-         if (!load_content_need_fullpath(&info[i], i,
-                  additional_path_allocs, need_fullpath, path))
-            goto end;
-      }
-   }
-
-   if (special)
-      ret = core.retro_load_game_special(special->id, info, content->size);
-   else
-   {
-      ret = core.retro_load_game(*content->elems[0].data ? info : NULL);
-      
-#ifdef HAVE_CHEEVOS
-      /* Load the achievements into memory if the game has content. */
-      cheevos_set_cheats();
-      cheevos_load(*content->elems[0].data ? info : NULL);
-#endif
-   }
-
-   if (!ret)
-      RARCH_ERR("%s.\n", msg_hash_to_str(MSG_FAILED_TO_LOAD_CONTENT));
-
-end:
-   for (i = 0; i < content->size; i++)
-      free((void*)info[i].data);
-
-   string_list_free(additional_path_allocs);
-   if (info)
-      free(info);
-   return ret;
-}
-
-/**
- * init_content_file:
- *
- * Initializes and loads a content file for the currently
- * selected libretro core.
- *
- * global->content_is_init will be set to the return value
- * on exit.
- *
- * Returns : true if successful, otherwise false.
- **/
-bool init_content_file(void)
-{
-   unsigned i;
-   union string_list_elem_attr attr;
-   bool ret                                   = false;
-   struct string_list *content                = NULL;
-   const struct retro_subsystem_info *special = NULL;
-   rarch_system_info_t *system                = NULL;
-   settings_t *settings                       = config_get_ptr();
-   global_t *global                           = global_get_ptr();
-   temporary_content                          = string_list_new();
-
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   if (!temporary_content)
-      goto error;
-
-   if (*global->subsystem)
-   {
-      special = libretro_find_subsystem_info(system->special,
-            system->num_special, global->subsystem);
-
-      if (!special)
-      {
-         RARCH_ERR(
-               "Failed to find subsystem \"%s\" in libretro implementation.\n",
-               global->subsystem);
-         goto error;
-      }
-
-      if (special->num_roms && !global->subsystem_fullpaths)
-      {
-         RARCH_ERR("libretro core requires special content, but none were provided.\n");
-         goto error;
-      }
-      else if (special->num_roms && special->num_roms
-            != global->subsystem_fullpaths->size)
-      {
-         RARCH_ERR("libretro core requires %u content files for subsystem \"%s\", but %u content files were provided.\n",
-               special->num_roms, special->desc,
-               (unsigned)global->subsystem_fullpaths->size);
-         goto error;
-      }
-      else if (!special->num_roms && global->subsystem_fullpaths
-            && global->subsystem_fullpaths->size)
-      {
-         RARCH_ERR("libretro core takes no content for subsystem \"%s\", but %u content files were provided.\n",
-               special->desc,
-               (unsigned)global->subsystem_fullpaths->size);
-         goto error;
-      }
-   }
-
-   content = string_list_new();
-
-   attr.i = 0;
-
-   if (!content)
-      goto error;
-
-   if (*global->subsystem)
-   {
-      for (i = 0; i < global->subsystem_fullpaths->size; i++)
-      {
-         attr.i  = special->roms[i].block_extract;
-         attr.i |= special->roms[i].need_fullpath << 1;
-         attr.i |= special->roms[i].required << 2;
-         string_list_append(content,
-               global->subsystem_fullpaths->elems[i].data, attr);
-      }
-   }
-   else
-   {
-      char *fullpath = NULL;
-
-      runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
-
-      attr.i  = system->info.block_extract;
-      attr.i |= system->info.need_fullpath << 1;
-      attr.i |= (!system->no_content) << 2;
-      string_list_append(content,
-            (global->inited.core.no_content && settings->core.set_supports_no_game_enable) ? "" : fullpath, attr);
-   }
-
-#ifdef HAVE_ZLIB
-   /* Try to extract all content we're going to load if appropriate. */
-   for (i = 0; i < content->size; i++)
-   {
-      const char *ext       = NULL;
-      const char *valid_ext = NULL;
-
-      /* Block extract check. */
-      if (content->elems[i].attr.i & 1)
-         continue;
-
-      ext       = path_get_extension(content->elems[i].data);
-      valid_ext = special ? special->roms[i].valid_extensions :
-         system->info.valid_extensions;
-
-      if (ext && !strcasecmp(ext, "zip"))
-      {
-         char temp_content[PATH_MAX_LENGTH] = {0};
-
-         strlcpy(temp_content, content->elems[i].data,
-               sizeof(temp_content));
-
-         if (!zlib_extract_first_content_file(temp_content,
-                  sizeof(temp_content), valid_ext,
-                  *settings->cache_directory ?
-                  settings->cache_directory : NULL))
-         {
-            RARCH_ERR("Failed to extract content from zipped file: %s.\n",
-                  temp_content);
-            goto error;
-         }
-         string_list_set(content, i, temp_content);
-         string_list_append(temporary_content,
-               temp_content, attr);
-      }
-   }
-#endif
-
-   /* Set attr to need_fullpath as appropriate. */
-   ret = load_content(special, content);
-
-error:
-   global->inited.content = (ret) ? true : false;
-
-   if (content)
-      string_list_free(content);
-   return ret;
-}
-
-/**
- * content_free_temporary:
- *
- * Frees temporary content handle.
- **/
-void content_temporary_free(void)
-{
-   unsigned i;
-
-   if (!temporary_content)
-      return;
-
-   for (i = 0; i < temporary_content->size; i++)
-   {
-      const char *path = temporary_content->elems[i].data;
-
-      RARCH_LOG("%s: %s.\n",
-            msg_hash_to_str(MSG_REMOVING_TEMPORARY_CONTENT_FILE), path);
-      if (remove(path) < 0)
-         RARCH_ERR("%s: %s.\n",
-               msg_hash_to_str(MSG_FAILED_TO_REMOVE_TEMPORARY_FILE),
-               path);
-   }
-   string_list_free(temporary_content);
-
-   temporary_content = NULL;
-}
@@ -17,76 +17,72 @@
 #ifndef __RARCH_FILE_H
 #define __RARCH_FILE_H

-#include <boolean.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>

-/* Handles files related to libretro. */
+#include "frontend/frontend_driver.h"

-/**
- * load_state:
- * @path      : path that state will be loaded from.
- *
- * Load a state from disk to memory.
- *
- * Returns: true if successful, false otherwise.
- **/
-bool load_state(const char *path);
+RETRO_BEGIN_DECLS

-/**
- * save_state:
- * @path      : path of saved state that shall be written to.
- *
- * Save a state from memory to disk.
- *
- * Returns: true if successful, false otherwise.
- **/
-bool save_state(const char *path);
+typedef struct ram_type ram_type_t;

-/**
- * load_ram_file:
- * @path             : path of RAM state that will be loaded from.
- * @type             : type of memory
- *
- * Load a RAM state from disk to memory.
- */
-void load_ram_file(const char *path, int type);
+typedef struct content_ctx_info
+{
+   int argc;                       /* Argument count. */
+   char **argv;                    /* Argument variable list. */
+   void *args;                     /* Arguments passed from callee */
+   environment_get_t environ_get;  /* Function passed for environment_get function */
+} content_ctx_info_t;

-/**
- * save_ram_file:
- * @path             : path of RAM state that shall be written to.
- * @type             : type of memory
- *
- * Save a RAM state from memory to disk.
- *
- * In case the file could not be written to, a fallback function
- * 'dump_to_file_desperate' will be called.
- */
-void save_ram_file(const char *path, int type);
+/* Load a RAM state from disk to memory. */
+bool content_load_ram_file(unsigned slot);

-/**
- * init_content_file:
- *
- * Initializes and loads a content file for the currently
- * selected libretro core.
- *
- * global->content_is_init will be set to the return value
- * on exit.
- *
- * Returns : true if successful, otherwise false.
- **/
-bool init_content_file(void);
+/* Save a RAM state from memory to disk. */
+bool content_save_ram_file(unsigned slot);

-void content_temporary_free(void);
+/* Load a state from disk to memory. */
+bool content_load_state(const char* path, bool load_to_backup_buffer);

-#ifdef __cplusplus
-}
-#endif
+/* Save a state from memory to disk. */
+bool content_save_state(const char *path, bool save_to_disk);
+
+/* Copy a save state. */
+bool content_rename_state(const char *origin, const char *dest);
+
+/* Undoes the last load state operation that was done */
+bool content_undo_load_state(void);
+
+/* Restores the last savestate file which was overwritten */
+bool content_undo_save_state(void);
+
+bool content_does_not_need_content(void);
+
+void content_set_does_not_need_content(void);
+
+void content_unset_does_not_need_content(void);
+
+bool content_get_crc(uint32_t **content_crc_ptr);
+
+bool content_is_inited(void);
+
+void content_deinit(void);
+
+/* Initializes and loads a content file for the currently
+ * selected libretro core. */
+bool content_init(void);
+
+/* Resets the state and savefile backup buffers */
+bool content_reset_savestate_backups(void);
+
+/* Checks if the buffers are empty */
+bool content_undo_load_buf_is_empty(void);
+bool content_undo_save_buf_is_empty(void);
+
+RETRO_END_DECLS

 #endif
@@ -0,0 +1,187 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2012-2015 - Michael Lelli
+ *
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _LIBRETRO_CORE_IMPL_H
+#define _LIBRETRO_CORE_IMPL_H
+
+#include <boolean.h>
+#include <libretro.h>
+#include <retro_common_api.h>
+
+#include "core_type.h"
+
+RETRO_BEGIN_DECLS
+
+enum
+{
+   /* Polling is performed before 
+    * call to retro_run. */
+   POLL_TYPE_EARLY = 0,
+
+   /* Polling is performed when requested. */
+   POLL_TYPE_NORMAL,
+
+   /* Polling is performed on first call to 
+    * retro_input_state per frame. */
+   POLL_TYPE_LATE
+};
+
+typedef struct retro_ctx_input_state_info
+{
+   retro_input_state_t cb;
+} retro_ctx_input_state_info_t;
+
+typedef struct retro_ctx_cheat_info
+{
+   unsigned index;
+   bool enabled;
+   const char *code;
+} retro_ctx_cheat_info_t;
+
+typedef struct retro_ctx_api_info
+{
+   unsigned version;
+} retro_ctx_api_info_t;
+
+typedef struct retro_ctx_controller_info
+{
+   unsigned port;
+   unsigned device;
+} retro_ctx_controller_info_t;
+
+typedef struct retro_ctx_memory_info
+{
+   void *data;
+   size_t size;
+   unsigned id;
+} retro_ctx_memory_info_t;
+
+typedef struct retro_ctx_load_content_info
+{
+   struct retro_game_info *info;
+   const struct string_list *content;
+   const struct retro_subsystem_info *special;
+} retro_ctx_load_content_info_t;
+
+typedef struct retro_ctx_serialize_info
+{
+   const void *data_const;
+   void *data;
+   size_t size;
+} retro_ctx_serialize_info_t;
+
+typedef struct retro_ctx_size_info
+{
+   size_t size;
+} retro_ctx_size_info_t;
+
+typedef struct retro_ctx_environ_info
+{
+   retro_environment_t env;
+} retro_ctx_environ_info_t;
+
+typedef struct retro_ctx_frame_info
+{
+   const void *data;
+   unsigned width;
+   unsigned height;
+   size_t pitch;
+} retro_ctx_frame_info_t;
+
+typedef struct retro_callbacks
+{
+   retro_video_refresh_t frame_cb;
+   retro_audio_sample_t sample_cb;
+   retro_audio_sample_batch_t sample_batch_cb;
+   retro_input_state_t state_cb;
+   retro_input_poll_t poll_cb;
+} retro_callbacks_t;
+
+bool core_load(void);
+
+bool core_unload(void);
+
+bool core_set_default_callbacks(void *data);
+
+bool core_set_rewind_callbacks(void);
+
+bool core_set_poll_type(unsigned *type);
+
+/* Runs the core for one frame. */
+bool core_run(void);
+
+bool core_init(void);
+
+bool core_deinit(void *data);
+
+bool core_unload_game(void);
+
+bool core_reset(void);
+
+bool core_frame(retro_ctx_frame_info_t *info);
+
+bool core_poll(void);
+
+bool core_set_environment(retro_ctx_environ_info_t *info);
+
+bool core_serialize_size(retro_ctx_size_info_t *info);
+
+bool core_serialize(retro_ctx_serialize_info_t *info);
+
+bool core_unserialize(retro_ctx_serialize_info_t *info);
+
+bool core_init_symbols(enum rarch_core_type *type);
+
+bool core_set_cheat(retro_ctx_cheat_info_t *info);
+
+bool core_reset_cheat(void);
+
+bool core_api_version(retro_ctx_api_info_t *api);
+
+/* Compare libretro core API version against API version
+ * used by RetroArch.
+ *
+ * TODO - when libretro v2 gets added, allow for switching
+ * between libretro version backend dynamically.
+ */
+bool core_verify_api_version(void);
+
+bool core_get_memory(retro_ctx_memory_info_t *info);
+
+/* Initialize system A/V information. */
+bool core_get_system_av_info(struct retro_system_av_info *av_info);
+
+/* Get system A/V information. */
+bool core_get_system_info(struct retro_system_info *system);
+
+bool core_load_game(retro_ctx_load_content_info_t *load_info);
+
+bool core_set_controller_port_device(retro_ctx_controller_info_t *pad);
+
+bool core_has_set_input_descriptor(void);
+
+void core_set_input_descriptors(void);
+
+void core_unset_input_descriptors(void);
+
+bool core_uninit_libretro_callbacks(void);
+
+void core_set_input_state(retro_ctx_input_state_info_t *info);
+
+RETRO_END_DECLS
+
+#endif
@@ -0,0 +1,409 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2012-2015 - Michael Lelli
+ *
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <retro_inline.h>
+#include <boolean.h>
+#include <lists/string_list.h>
+#include <libretro.h>
+
+#include "dynamic.h"
+#include "core.h"
+#include "general.h"
+#include "msg_hash.h"
+#include "managers/state_manager.h"
+#include "system.h"
+#include "gfx/video_driver.h"
+#include "audio/audio_driver.h"
+
+#ifdef HAVE_NETPLAY
+#include "network/netplay/netplay.h"
+#endif
+
+static struct retro_core_t core;
+static unsigned            core_poll_type;
+static bool                core_input_polled;
+static bool   core_has_set_input_descriptors = false;
+static struct retro_callbacks retro_ctx;
+
+static void core_input_state_poll_maybe(void)
+{
+   if (core_poll_type == POLL_TYPE_NORMAL)
+      input_poll();
+}
+
+static int16_t core_input_state_poll(unsigned port,
+      unsigned device, unsigned idx, unsigned id)
+{
+   if (core_poll_type == POLL_TYPE_LATE)
+   {
+      if (!core_input_polled)
+         input_poll();
+
+      core_input_polled = true;
+   }
+   return input_state(port, device, idx, id);
+}
+
+void core_set_input_state(retro_ctx_input_state_info_t *info)
+{
+   core.retro_set_input_state(info->cb);
+}
+
+/**
+ * core_init_libretro_cbs:
+ * @data           : pointer to retro_callbacks object
+ *
+ * Initializes libretro callbacks, and binds the libretro callbacks 
+ * to default callback functions.
+ **/
+static bool core_init_libretro_cbs(void *data)
+{
+   struct retro_callbacks *cbs = (struct retro_callbacks*)data;
+#ifdef HAVE_NETPLAY
+   global_t            *global = global_get_ptr();
+#endif
+
+   if (!cbs)
+      return false;
+
+   core.retro_set_video_refresh(video_driver_frame);
+   core.retro_set_audio_sample(audio_driver_sample);
+   core.retro_set_audio_sample_batch(audio_driver_sample_batch);
+   core.retro_set_input_state(core_input_state_poll);
+   core.retro_set_input_poll(core_input_state_poll_maybe);
+
+   core_set_default_callbacks(cbs);
+
+#ifdef HAVE_NETPLAY
+   if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
+      return true;
+
+   /* Force normal poll type for netplay. */
+   core_poll_type = POLL_TYPE_NORMAL;
+
+   if (global->netplay.is_spectate)
+   {
+      core.retro_set_input_state(
+            (global->netplay.is_client ?
+             input_state_spectate_client : input_state_spectate)
+            );
+   }
+   else
+   {
+      core.retro_set_video_refresh(video_frame_net);
+      core.retro_set_audio_sample(audio_sample_net);
+      core.retro_set_audio_sample_batch(audio_sample_batch_net);
+      core.retro_set_input_state(input_state_net);
+   }
+#endif
+
+   return true;
+}
+
+/**
+ * core_set_default_callbacks:
+ * @data           : pointer to retro_callbacks object
+ *
+ * Binds the libretro callbacks to default callback functions.
+ **/
+bool core_set_default_callbacks(void *data)
+{
+   struct retro_callbacks *cbs = (struct retro_callbacks*)data;
+
+   if (!cbs)
+      return false;
+
+   cbs->frame_cb        = video_driver_frame;
+   cbs->sample_cb       = audio_driver_sample;
+   cbs->sample_batch_cb = audio_driver_sample_batch;
+   cbs->state_cb        = core_input_state_poll;
+   cbs->poll_cb         = input_poll;
+
+   return true;
+}
+
+
+bool core_deinit(void *data)
+{
+   struct retro_callbacks *cbs = (struct retro_callbacks*)data;
+
+   if (!cbs)
+      return false;
+
+   cbs->frame_cb        = NULL;
+   cbs->sample_cb       = NULL;
+   cbs->sample_batch_cb = NULL;
+   cbs->state_cb        = NULL;
+   cbs->poll_cb         = NULL;
+
+   return true;
+}
+
+bool core_uninit_libretro_callbacks(void)
+{
+   return core_deinit(&retro_ctx);
+}
+
+/**
+ * core_set_rewind_callbacks:
+ *
+ * Sets the audio sampling callbacks based on whether or not
+ * rewinding is currently activated.
+ **/
+bool core_set_rewind_callbacks(void)
+{
+   if (state_manager_frame_is_reversed())
+   {
+      core.retro_set_audio_sample(audio_driver_sample_rewind);
+      core.retro_set_audio_sample_batch(audio_driver_sample_batch_rewind);
+   }
+   else
+   {
+      core.retro_set_audio_sample(audio_driver_sample);
+      core.retro_set_audio_sample_batch(audio_driver_sample_batch);
+   }
+   return true;
+}
+
+bool core_set_cheat(retro_ctx_cheat_info_t *info)
+{
+   core.retro_cheat_set(info->index, info->enabled, info->code);
+   return true;
+}
+
+bool core_reset_cheat(void)
+{
+   core.retro_cheat_reset();
+   return true;
+}
+
+bool core_api_version(retro_ctx_api_info_t *api)
+{
+   if (!api)
+      return false;
+   api->version = core.retro_api_version();
+   return true;
+}
+
+bool core_set_poll_type(unsigned *type)
+{
+   core_poll_type = *type;
+   return true;
+}
+
+bool core_init_symbols(enum rarch_core_type *type)
+{
+   if (!type)
+      return false;
+   init_libretro_sym(*type, &core);
+   return true;
+}
+
+bool core_set_controller_port_device(retro_ctx_controller_info_t *pad)
+{
+   if (!pad)
+      return false;
+   core.retro_set_controller_port_device(pad->port, pad->device);
+   return true;
+}
+
+bool core_get_memory(retro_ctx_memory_info_t *info)
+{
+   if (!info)
+      return false;
+   info->size  = core.retro_get_memory_size(info->id);
+   info->data  = core.retro_get_memory_data(info->id);
+   return true;
+}
+
+bool core_load_game(retro_ctx_load_content_info_t *load_info)
+{
+   if (!load_info)
+      return false;
+
+   if (load_info->special)
+      return core.retro_load_game_special(load_info->special->id, load_info->info, load_info->content->size);
+   return core.retro_load_game(*load_info->content->elems[0].data ? load_info->info : NULL);
+}
+
+bool core_get_system_info(struct retro_system_info *system)
+{
+   if (!system)
+      return false;
+   core.retro_get_system_info(system);
+   return true;
+}
+
+bool core_unserialize(retro_ctx_serialize_info_t *info)
+{
+   if (!info)
+      return false;
+   if (!core.retro_unserialize(info->data_const, info->size))
+      return false;
+   return true;
+}
+
+bool core_serialize(retro_ctx_serialize_info_t *info)
+{
+   if (!info)
+      return false;
+   if (!core.retro_serialize(info->data, info->size))
+      return false;
+   return true;
+}
+
+bool core_serialize_size(retro_ctx_size_info_t *info)
+{
+   if (!info)
+      return false;
+   info->size = core.retro_serialize_size();
+   return true;
+}
+
+bool core_frame(retro_ctx_frame_info_t *info)
+{
+   if (!info || !retro_ctx.frame_cb)
+      return false;
+
+   retro_ctx.frame_cb(
+         info->data, info->width, info->height, info->pitch);
+   return true;
+}
+
+bool core_poll(void)
+{
+   if (!retro_ctx.poll_cb)
+      return false;
+   retro_ctx.poll_cb();
+   return true;
+}
+
+bool core_set_environment(retro_ctx_environ_info_t *info)
+{
+   if (!info)
+      return false;
+   core.retro_set_environment(info->env);
+   return true;
+}
+
+bool core_get_system_av_info(struct retro_system_av_info *av_info)
+{
+   if (!av_info)
+      return false;
+   core.retro_get_system_av_info(av_info);
+   return true;
+}
+
+bool core_reset(void)
+{
+   core.retro_reset();
+   return true;
+}
+
+bool core_init(void)
+{
+   core.retro_init();
+   return true;
+}
+
+bool core_unload(void)
+{
+   core.retro_deinit();
+   uninit_libretro_sym(&core);
+   return true;
+}
+
+bool core_unload_game(void)
+{
+   video_driver_deinit_hw_context();
+   audio_driver_stop();
+   core.retro_unload_game();
+   return true;
+}
+
+bool core_run(void)
+{
+   switch (core_poll_type)
+   {
+      case POLL_TYPE_EARLY:
+         input_poll();
+         break;
+      case POLL_TYPE_LATE:
+         core_input_polled = false;
+         break;
+   }
+   if (core.retro_run)
+      core.retro_run();
+   if (core_poll_type == POLL_TYPE_LATE && !core_input_polled)
+      input_poll();
+   return true;
+}
+
+bool core_load(void)
+{
+   settings_t *settings = config_get_ptr();
+   core_poll_type = settings->input.poll_type_behavior;
+
+   if (!core_verify_api_version())
+      return false;
+   if (!core_init_libretro_cbs(&retro_ctx))
+      return false;
+
+   core_get_system_av_info(video_viewport_get_system_av_info());
+   runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
+
+   return true;
+}
+
+bool core_verify_api_version(void)
+{
+   unsigned api_version = core.retro_api_version();
+   RARCH_LOG("%s: %u\n", 
+         msg_hash_to_str(MSG_VERSION_OF_LIBRETRO_API),
+         api_version);
+   RARCH_LOG("%s: %u\n",    
+         msg_hash_to_str(MSG_COMPILED_AGAINST_API),
+         RETRO_API_VERSION);
+
+   if (api_version != RETRO_API_VERSION)
+   {
+      RARCH_WARN("%s\n", msg_hash_to_str(MSG_LIBRETRO_ABI_BREAK));
+      return false;
+   }
+   return true;
+}
+
+bool core_has_set_input_descriptor(void)
+{
+   return core_has_set_input_descriptors;
+}
+
+void core_set_input_descriptors(void)
+{
+   core_has_set_input_descriptors = true;
+}
+
+void core_unset_input_descriptors(void)
+{
+   core_has_set_input_descriptors = false;
+}
@@ -16,17 +16,27 @@
 */

 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <lists/dir_list.h>
+#include <file/archive_file.h>
+#include <compat/strl.h>
+
+#include <string/stdstring.h>

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

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

+static const char *core_info_tmp_path               = NULL;
+static const struct string_list *core_info_tmp_list = NULL;
+static core_info_t *core_info_current               = NULL;
+static core_info_list_t *core_info_curr_list        = NULL;
+
 static void core_info_list_resolve_all_extensions(
      core_info_list_t *core_info_list)
 {
@@ -74,7 +84,7 @@ static void core_info_list_resolve_all_firmware(
      core_info_t *info     = (core_info_t*)&core_info_list->list[i];
      config_file_t *config = (config_file_t*)info->config_data;

-      if (!info || !config)
+      if (!config)
         continue;

      if (!config_get_uint(config, "firmware_count", &count))
@@ -94,7 +104,7 @@ static void core_info_list_resolve_all_firmware(

         snprintf(path_key, sizeof(path_key), "firmware%u_path", c);
         snprintf(desc_key, sizeof(desc_key), "firmware%u_desc", c);
-         snprintf(opt_key, sizeof(opt_key), "firmware%u_opt", c);
+         snprintf(opt_key,  sizeof(opt_key),  "firmware%u_opt",  c);

         config_get_string(config, path_key, &info->firmware[c].path);
         config_get_string(config, desc_key, &info->firmware[c].desc);
@@ -103,84 +113,90 @@ static void core_info_list_resolve_all_firmware(
   }
 }

-void core_info_get_name(const char *path, char *s, size_t len)
+static void core_info_list_free(core_info_list_t *core_info_list)
 {
-   size_t i;
-   core_info_t *core_info = NULL;
-   core_info_list_t *core_info_list = NULL;
-   settings_t *settings = config_get_ptr();
-   struct string_list *contents = dir_list_new_special(NULL, DIR_LIST_CORES, NULL);
+   size_t i, j;

-   if (!contents)
+   if (!core_info_list)
      return;

-   core_info_list = (core_info_list_t*)calloc(1, sizeof(*core_info_list));
-   if (!core_info_list)
-      goto error;
-
-   core_info = (core_info_t*)calloc(contents->size, sizeof(*core_info));
-   if (!core_info)
-      goto error;
-
-   core_info_list->list = core_info;
-   core_info_list->count = contents->size;
-
-   for (i = 0; i < contents->size; i++)
+   for (i = 0; i < core_info_list->count; i++)
   {
-      config_file_t *conf                  = NULL;
-      char info_path_base[PATH_MAX_LENGTH] = {0};
-      char info_path[PATH_MAX_LENGTH]      = {0};
+      core_info_t *info = (core_info_t*)&core_info_list->list[i];

-      core_info[i].path = strdup(contents->elems[i].data);
+      free(info->path);
+      free(info->core_name);
+      free(info->systemname);
+      free(info->system_manufacturer);
+      free(info->display_name);
+      free(info->supported_extensions);
+      free(info->authors);
+      free(info->permissions);
+      free(info->licenses);
+      free(info->categories);
+      free(info->databases);
+      free(info->notes);
+      if (info->supported_extensions_list)
+         string_list_free(info->supported_extensions_list);
+      string_list_free(info->authors_list);
+      string_list_free(info->note_list);
+      string_list_free(info->permissions_list);
+      string_list_free(info->licenses_list);
+      string_list_free(info->categories_list);
+      string_list_free(info->databases_list);
+      config_file_free((config_file_t*)info->config_data);

-      if (!core_info[i].path)
-         break;
-
-      if (strcmp(core_info[i].path, path) != 0)
-            continue;
-
-      fill_pathname_base(info_path_base, contents->elems[i].data,
-            sizeof(info_path_base));
-      path_remove_extension(info_path_base);
-
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
-      char *substr = strrchr(info_path_base, '_');
-      if (substr)
-         *substr = '\0';
-#endif
-
-      strlcat(info_path_base, ".info", sizeof(info_path_base));
-
-      fill_pathname_join(info_path, (*settings->libretro_info_path) ?
-            settings->libretro_info_path : settings->libretro_directory,
-            info_path_base, sizeof(info_path));
-
-      conf = config_file_new(info_path);
-
-      if (conf)
+      for (j = 0; j < info->firmware_count; j++)
      {
-         config_get_string(conf, "corename",
-               &core_info[i].core_name);
-         core_info[i].config_data = (void*)conf;
+         free(info->firmware[j].path);
+         free(info->firmware[j].desc);
      }
-
-      strlcpy(s, core_info[i].core_name, len);
+      free(info->firmware);
   }

-error:
-   if (contents)
-      dir_list_free(contents);
-   contents = NULL;
-   core_info_list_free(core_info_list);
+   free(core_info_list->all_ext);
+   free(core_info_list->list);
+   free(core_info_list);
 }

-core_info_list_t *core_info_list_new(void)
+static config_file_t *core_info_list_iterate(
+      struct string_list *contents, size_t i)
+{
+   char info_path_base[PATH_MAX_LENGTH] = {0};
+   char info_path[PATH_MAX_LENGTH]      = {0};
+   settings_t                 *settings = config_get_ptr();
+
+   if (!contents->elems[i].data)
+      return NULL;
+
+   fill_pathname_base_noext(info_path_base, contents->elems[i].data,
+         sizeof(info_path_base));
+
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
+   char *substr = strrchr(info_path_base, '_');
+   if (substr)
+      *substr = '\0';
+#endif
+
+   strlcat(info_path_base,
+         file_path_str(FILE_PATH_CORE_INFO_EXTENSION),
+         sizeof(info_path_base));
+
+   fill_pathname_join(info_path,
+         (!string_is_empty(settings->path.libretro_info)) ?
+         settings->path.libretro_info : settings->directory.libretro,
+         info_path_base, sizeof(info_path));
+
+   return config_file_new(info_path);
+}
+
+static core_info_list_t *core_info_list_new(void)
 {
   size_t i;
-   core_info_t *core_info = NULL;
+   core_info_t *core_info           = NULL;
   core_info_list_t *core_info_list = NULL;
-   settings_t *settings = config_get_ptr();
-   struct string_list *contents = dir_list_new_special(NULL, DIR_LIST_CORES, NULL);
+   struct string_list *contents     = 
+      dir_list_new_special(NULL, DIR_LIST_CORES, NULL);

   if (!contents)
      return NULL;
@@ -198,35 +214,13 @@ core_info_list_t *core_info_list_new(void)

   for (i = 0; i < contents->size; i++)
   {
-      config_file_t *conf                  = NULL;
-      char info_path_base[PATH_MAX_LENGTH] = {0};
-      char info_path[PATH_MAX_LENGTH]      = {0};
-      core_info[i].path = strdup(contents->elems[i].data);
-
-      if (!core_info[i].path)
-         break;
-
-      fill_pathname_base(info_path_base, contents->elems[i].data,
-            sizeof(info_path_base));
-      path_remove_extension(info_path_base);
-
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
-      char *substr = strrchr(info_path_base, '_');
-      if (substr)
-         *substr = '\0';
-#endif
-
-      strlcat(info_path_base, ".info", sizeof(info_path_base));
-
-      fill_pathname_join(info_path, (*settings->libretro_info_path) ?
-            settings->libretro_info_path : settings->libretro_directory,
-            info_path_base, sizeof(info_path));
-
-      conf = config_file_new(info_path);
+      config_file_t *conf = core_info_list_iterate(contents, i);

      if (conf)
      {
+         bool tmp_bool  = false;
         unsigned count = 0;
+
         config_get_string(conf, "display_name",
               &core_info[i].display_name);
         config_get_string(conf, "corename",
@@ -278,14 +272,18 @@ core_info_list_t *core_info_list_new(void)
               core_info[i].notes)
            core_info[i].note_list = string_split(core_info[i].notes, "|");

-         config_get_bool(conf, "supports_no_game",
-               &core_info[i].supports_no_game);
+         if (config_get_bool(conf, "supports_no_game",
+               &tmp_bool))
+            core_info[i].supports_no_game = tmp_bool;

         core_info[i].config_data = conf;
      }

+      core_info[i].path = strdup(contents->elems[i].data);
+
      if (!core_info[i].display_name)
-         core_info[i].display_name = strdup(path_basename(core_info[i].path));
+         core_info[i].display_name = 
+            strdup(path_basename(core_info[i].path));
   }

   core_info_list_resolve_all_extensions(core_info_list);
@@ -301,134 +299,11 @@ error:
   return NULL;
 }

-void core_info_list_free(core_info_list_t *core_info_list)
-{
-   size_t i, j;
-
-   if (!core_info_list)
-      return;
-
-   for (i = 0; i < core_info_list->count; i++)
-   {
-      core_info_t *info = (core_info_t*)&core_info_list->list[i];
-
-      if (!info)
-         continue;
-
-      free(info->path);
-      free(info->core_name);
-      free(info->systemname);
-      free(info->system_manufacturer);
-      free(info->display_name);
-      free(info->supported_extensions);
-      free(info->authors);
-      free(info->permissions);
-      free(info->licenses);
-      free(info->categories);
-      free(info->databases);
-      free(info->notes);
-      if (info->supported_extensions_list)
-         string_list_free(info->supported_extensions_list);
-      string_list_free(info->authors_list);
-      string_list_free(info->note_list);
-      string_list_free(info->permissions_list);
-      string_list_free(info->licenses_list);
-      string_list_free(info->categories_list);
-      string_list_free(info->databases_list);
-      config_file_free((config_file_t*)info->config_data);
-
-      for (j = 0; j < info->firmware_count; j++)
-      {
-         free(info->firmware[j].path);
-         free(info->firmware[j].desc);
-      }
-      free(info->firmware);
-   }
-
-   free(core_info_list->all_ext);
-   free(core_info_list->list);
-   free(core_info_list);
-}
-
-size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
-{
-   size_t i, num = 0;
-
-   if (!core_info_list)
-      return 0;
-
-   for (i = 0; i < core_info_list->count; i++)
-   {
-      config_file_t *conf = (config_file_t*)core_info_list->list[i].config_data;
-      num += !!conf;
-   }
-
-   return num;
-}
-
-bool core_info_list_get_display_name(core_info_list_t *core_info_list,
-      const char *path, char *buf, size_t size)
-{
-   size_t i;
-
-   if (!core_info_list)
-      return false;
-
-   for (i = 0; i < core_info_list->count; i++)
-   {
-      const core_info_t *info = &core_info_list->list[i];
-      if (!strcmp(path_basename(info->path), path_basename(path))
-            && info->display_name)
-      {
-         strlcpy(buf, info->display_name, size);
-         return true;
-      }
-   }
-
-   return false;
-}
-
-bool core_info_get_display_name(const char *path, char *s, size_t len)
-{
-   char       *core_name = NULL;
-   char       *display_name = NULL;
-   config_file_t *conf   = NULL;
-
-   if (!path_file_exists(path))
-      return false;
-
-   conf = config_file_new(path);
-
-   if (!conf)
-      goto error;
-
-   config_get_string(conf, "corename",
-         &core_name);
-
-   config_get_string(conf, "display_name",
-         &display_name);
-
-   config_file_free(conf);
-
-   if (!core_name)
-      goto error;
-   if (!conf)
-      goto error;
-
-   snprintf(s, len,"%s",display_name);
-
-   free(core_name);
-   free(display_name);
-
-   return true;
-
-error:
-   if (core_name)
-      free(core_name);
-   return false;
-}
-
-bool core_info_list_get_info(core_info_list_t *core_info_list,
+/* Shallow-copies internal state. 
+ *
+ * Data in *info is invalidated when the
+ * core_info_list is freed. */
+static bool core_info_list_get_info(core_info_list_t *core_info_list,
      core_info_t *out_info, const char *path)
 {
   size_t i;
@@ -440,7 +315,9 @@ bool core_info_list_get_info(core_info_list_t *core_info_list,
   for (i = 0; i < core_info_list->count; i++)
   {
      const core_info_t *info = &core_info_list->list[i];
-      if (!strcmp(path_basename(info->path), path_basename(path)))
+
+      if (string_is_equal(path_basename(info->path), 
+               path_basename(path)))
      {
         *out_info = *info;
         return true;
@@ -450,7 +327,7 @@ bool core_info_list_get_info(core_info_list_t *core_info_list,
   return false;
 }

-bool core_info_does_support_any_file(const core_info_t *core,
+static bool core_info_does_support_any_file(const core_info_t *core,
      const struct string_list *list)
 {
   size_t i;
@@ -464,7 +341,8 @@ bool core_info_does_support_any_file(const core_info_t *core,
   return false;
 }

-bool core_info_does_support_file(const core_info_t *core, const char *path)
+static bool core_info_does_support_file(
+      const core_info_t *core, const char *path)
 {
   if (!path || !core || !core->supported_extensions_list)
      return false;
@@ -472,49 +350,235 @@ bool core_info_does_support_file(const core_info_t *core, const char *path)
         core->supported_extensions_list, ".", path_get_extension(path));
 }

-const char *core_info_list_get_all_extensions(void)
-{
-   core_info_list_t *list = NULL;
-   runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_GET, &list);
-   if (!list)
-      return NULL;
-   return list->all_ext;
-}
-
 /* qsort_r() is not in standard C, sadly. */
-static const char *core_info_tmp_path;
-static const struct string_list *core_info_tmp_list;

 static int core_info_qsort_cmp(const void *a_, const void *b_)
 {
   const core_info_t *a = (const core_info_t*)a_;
   const core_info_t *b = (const core_info_t*)b_;
-   int support_a        = core_info_does_support_any_file(a, core_info_tmp_list) ||
-      core_info_does_support_file(a, core_info_tmp_path);
-   int support_b        = core_info_does_support_any_file(b, core_info_tmp_list) ||
-      core_info_does_support_file(b, core_info_tmp_path);
+   int support_a        = 
+         core_info_does_support_any_file(a, core_info_tmp_list)
+      || core_info_does_support_file(a, core_info_tmp_path);
+   int support_b        = 
+         core_info_does_support_any_file(b, core_info_tmp_list)
+      || core_info_does_support_file(b, core_info_tmp_path);

   if (support_a != support_b)
      return support_b - support_a;
   return strcasecmp(a->display_name, b->display_name);
 }

+static core_info_t *core_info_find_internal(
+      core_info_list_t *list,
+      const char *core)
+{
+   size_t i;
+
+   for (i = 0; i < list->count; i++)
+   {
+      core_info_t *info = core_info_get(list, i);
+
+      if (!info)
+         continue;
+      if (string_is_equal(info->path, core))
+         return info;
+   }
+
+   return NULL;
+}
+
+static bool core_info_list_update_missing_firmware_internal(
+      core_info_list_t *core_info_list,
+      const char *core,
+      const char *systemdir)
+{
+   size_t i;
+   char path[PATH_MAX_LENGTH] = {0};
+   core_info_t          *info = NULL;
+
+   if (!core_info_list || !core)
+      return false;
+
+   info = core_info_find_internal(core_info_list, core);
+
+   if (!info)
+      return false;
+
+   for (i = 0; i < info->firmware_count; i++)
+   {
+      if (!info->firmware[i].path)
+         continue;
+
+      fill_pathname_join(path, systemdir,
+            info->firmware[i].path, sizeof(path));
+      info->firmware[i].missing = !path_file_exists(path);
+   }
+
+   return true;
+}
+
+#if 0
+static int core_info_firmware_cmp(const void *a_, const void *b_)
+{
+   const core_info_firmware_t *a = (const core_info_firmware_t*)a_;
+   const core_info_firmware_t *b = (const core_info_firmware_t*)b_;
+   int                     order = b->missing - a->missing;
+
+   if (order)
+      return order;
+   return strcasecmp(a->path, b->path);
+}
+
+/* Non-reentrant, does not allocate. Returns pointer to internal state. */
+
+static void core_info_list_get_missing_firmware(
+      core_info_list_t *core_info_list,
+      const char *core, const char *systemdir,
+      const core_info_firmware_t **firmware, size_t *num_firmware)
+{
+   size_t i;
+   char path[PATH_MAX_LENGTH] = {0};
+   core_info_t          *info = NULL;
+
+   if (!core_info_list || !core)
+      return;
+
+   *firmware     = NULL;
+   *num_firmware = 0;
+
+   if (!(info = core_info_find_internal(core_info_list, core)))
+      return;
+
+   *firmware = info->firmware;
+
+   for (i = 1; i < info->firmware_count; i++)
+   {
+      fill_pathname_join(path, systemdir,
+            info->firmware[i].path, sizeof(path));
+      info->firmware[i].missing = !path_file_exists(path);
+      *num_firmware += info->firmware[i].missing;
+   }
+
+   qsort(info->firmware, info->firmware_count, sizeof(*info->firmware),
+         core_info_firmware_cmp);
+}
+#endif
+
+void core_info_free_current_core(void)
+{
+   if (core_info_current)
+      free(core_info_current);
+   core_info_current = NULL;
+}
+
+bool core_info_init_current_core(void)
+{
+   core_info_current = (core_info_t*)calloc(1, sizeof(core_info_t));
+   if (!core_info_current)
+      return false;
+   return true;
+}
+
+bool core_info_get_current_core(core_info_t **core)
+{
+   if (!core)
+      return false;
+   *core = core_info_current;
+   return true;
+}
+
+void core_info_deinit_list(void)
+{
+   if (core_info_curr_list)
+      core_info_list_free(core_info_curr_list);
+   core_info_curr_list = NULL;
+}
+
+bool core_info_init_list(void)
+{
+   core_info_curr_list = core_info_list_new();
+
+   if (!core_info_curr_list)
+      return false;
+   return true;
+}
+
+bool core_info_get_list(core_info_list_t **core)
+{
+   if (!core)
+      return false;
+   *core = core_info_curr_list;
+   return true;
+}
+
+bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info)
+{
+   if (!info)
+      return false;
+
+   return core_info_list_update_missing_firmware_internal(
+         core_info_curr_list,
+         info->path, info->directory.system);
+}
+
+bool core_info_load(core_info_ctx_find_t *info)
+{
+   core_info_t *core_info     = NULL;
+
+   if (!info)
+      return false;
+
+   core_info_get_current_core(&core_info);
+
+   if (!core_info_curr_list)
+      return false;
+
+   if (!core_info_list_get_info(core_info_curr_list,
+            core_info, info->path))
+      return false;
+
+   return true;
+}
+
+bool core_info_find(core_info_ctx_find_t *info, const char *core_path)
+{
+   if (!info || !core_info_curr_list)
+      return false;
+   info->inf = core_info_find_internal(core_info_curr_list, core_path);
+   if (!info->inf)
+      return false;
+   return true;
+}
+
+core_info_t *core_info_get(core_info_list_t *list, size_t i)
+{
+   core_info_t *info = NULL;
+
+   if (!list)
+      return NULL;
+   info = (core_info_t*)&list->list[i];
+   if (!info || !info->path)
+      return NULL;
+
+   return info;
+}
+
 void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
      const char *path, const core_info_t **infos, size_t *num_infos)
 {
+#ifdef HAVE_ZLIB
   struct string_list *list = NULL;
+#endif
   size_t supported = 0, i;

   if (!core_info_list)
      return;

-   (void)list;
-
   core_info_tmp_path = path;

 #ifdef HAVE_ZLIB
-   if (!strcasecmp(path_get_extension(path), "zip"))
-      list = zlib_get_file_list(path, NULL);
+   if (string_is_equal_noncase(path_get_extension(path), "zip"))
+      list = file_archive_get_file_list(path, NULL);
   core_info_tmp_list = list;
 #endif

@@ -527,9 +591,6 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
   {
      const core_info_t *core = &core_info_list->list[i];

-      if (!core)
-         continue;
-
      if (core_info_does_support_file(core, path))
         continue;

@@ -546,104 +607,135 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
      string_list_free(list);
 #endif

-   *infos = core_info_list->list;
+   *infos     = core_info_list->list;
   *num_infos = supported;
 }

-core_info_t *core_info_find(core_info_list_t *list,
-      const char *core)
+void core_info_get_name(const char *path, char *s, size_t len)
+{
+   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(
+         NULL, DIR_LIST_CORES, NULL);
+
+   if (!contents)
+      return;
+
+   core_info_list = (core_info_list_t*)calloc(1, sizeof(*core_info_list));
+   if (!core_info_list)
+      goto error;
+
+   core_info = (core_info_t*)calloc(contents->size, sizeof(*core_info));
+   if (!core_info)
+      goto error;
+
+   core_info_list->list = core_info;
+   core_info_list->count = contents->size;
+
+   for (i = 0; i < contents->size; i++)
+   {
+      config_file_t *conf = NULL;
+
+      if (!string_is_equal(contents->elems[i].data, path))
+         continue;
+      
+      conf = core_info_list_iterate(contents, i);
+
+      if (conf)
+      {
+         config_get_string(conf, "corename",
+               &core_info[i].core_name);
+         core_info[i].config_data = (void*)conf;
+      }
+
+      core_info[i].path = strdup(contents->elems[i].data);
+
+      strlcpy(s, core_info[i].core_name, len);
+   }
+
+error:
+   if (contents)
+      dir_list_free(contents);
+   contents = NULL;
+   core_info_list_free(core_info_list);
+}
+
+size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
+{
+   size_t i, num = 0;
+
+   if (!core_info_list)
+      return 0;
+
+   for (i = 0; i < core_info_list->count; i++)
+   {
+      config_file_t *conf = (config_file_t*)
+         core_info_list->list[i].config_data;
+      num += !!conf;
+   }
+
+   return num;
+}
+
+bool core_info_list_get_display_name(core_info_list_t *core_info_list,
+      const char *path, char *s, size_t len)
 {
   size_t i;

-   for (i = 0; i < list->count; i++)
-   {
-      core_info_t *info = (core_info_t*)&list->list[i];
+   if (!core_info_list)
+      return false;

-      if (!info)
-         continue;
-      if (!info->path)
-         continue;
-      if (!strcmp(info->path, core))
-         return info;
+   for (i = 0; i < core_info_list->count; i++)
+   {
+      const core_info_t *info = &core_info_list->list[i];
+      if (string_is_equal(path_basename(info->path), path_basename(path))
+            && info->display_name)
+      {
+         strlcpy(s, info->display_name, len);
+         return true;
+      }
   }

-   return NULL;
+   return false;
 }

-core_info_t *core_info_get(core_info_list_t *list, size_t i)
+bool core_info_get_display_name(const char *path, char *s, size_t len)
 {
-   core_info_t *info = NULL;
+   char       *core_name    = NULL;
+   char       *display_name = NULL;
+   config_file_t *conf      = NULL;

-   if (!list)
-      return NULL;
-   info = (core_info_t*)&list->list[i];
-   if (!info || !info->path)
-      return NULL;
+   if (!path_file_exists(path))
+      return false;

-   return info;
-}
+   conf = config_file_new(path);

-static int core_info_firmware_cmp(const void *a_, const void *b_)
-{
-   const core_info_firmware_t *a = (const core_info_firmware_t*)a_;
-   const core_info_firmware_t *b = (const core_info_firmware_t*)b_;
-   int                     order = b->missing - a->missing;
+   if (!conf)
+      return false;

-   if (order)
-      return order;
-   return strcasecmp(a->path, b->path);
-}
+   config_get_string(conf, "corename",
+         &core_name);
+   config_get_string(conf, "display_name",
+         &display_name);

-void core_info_list_update_missing_firmware(core_info_list_t *core_info_list,
-      const char *core, const char *systemdir)
-{
-   size_t i;
-   char path[PATH_MAX_LENGTH] = {0};
-   core_info_t          *info = NULL;
+   if (!core_name || !display_name)
+      goto error;

-   if (!core_info_list || !core)
-      return;
+   config_file_free(conf);

-   if (!(info = core_info_find(core_info_list, core)))
-      return;
+   snprintf(s, len,"%s",display_name);

-   for (i = 0; i < info->firmware_count; i++)
-   {
-      if (!info->firmware[i].path)
-         continue;
+   free(core_name);
+   free(display_name);

-      fill_pathname_join(path, systemdir,
-            info->firmware[i].path, sizeof(path));
-      info->firmware[i].missing = !path_file_exists(path);
-   }
-}
+   return true;

-void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,
-      const char *core, const char *systemdir,
-      const core_info_firmware_t **firmware, size_t *num_firmware)
-{
-   size_t i;
-   char path[PATH_MAX_LENGTH] = {0};
-   core_info_t          *info = NULL;
-
-   if (!core_info_list || !core)
-      return;
-
-   *firmware     = NULL;
-   *num_firmware = 0;
-
-   if (!(info = core_info_find(core_info_list, core)))
-      return;
-
-   *firmware = info->firmware;
-
-   for (i = 1; i < info->firmware_count; i++)
-   {
-      fill_pathname_join(path, systemdir, info->firmware[i].path, sizeof(path));
-      info->firmware[i].missing = !path_file_exists(path);
-      *num_firmware += info->firmware[i].missing;
-   }
-
-   qsort(info->firmware, info->firmware_count, sizeof(*info->firmware),
-         core_info_firmware_cmp);
+error:
+   config_file_free(conf);
+   if (core_name)
+      free(core_name);
+   if (display_name)
+      free(display_name);
+   return false;
 }
@@ -20,9 +20,10 @@

 #include <stddef.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <lists/string_list.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS

 typedef struct
 {
@@ -70,41 +71,29 @@ typedef struct
   char *all_ext;
 } core_info_list_t;

-core_info_list_t *core_info_list_new(void);
-void core_info_list_free(core_info_list_t *list);
+typedef struct core_info_ctx_firmware
+{
+   const char *path;
+   struct
+   {
+      const char *system;
+   } directory;
+} core_info_ctx_firmware_t;
+
+typedef struct core_info_ctx_find
+{
+   core_info_t *inf;
+   const char *path;
+} core_info_ctx_find_t;

 size_t core_info_list_num_info_files(core_info_list_t *list);

-bool core_info_does_support_file(const core_info_t *info,
-      const char *path);
-
-bool core_info_does_support_any_file(const core_info_t *info,
-      const struct string_list *list);
-
 /* Non-reentrant, does not allocate. Returns pointer to internal state. */
 void core_info_list_get_supported_cores(core_info_list_t *list,
      const char *path, const core_info_t **infos, size_t *num_infos);

-/* Non-reentrant, does not allocate. Returns pointer to internal state. */
-void core_info_list_get_missing_firmware(core_info_list_t *list,
-      const char *core, const char *systemdir,
-      const core_info_firmware_t **firmware, size_t *num_firmware);
-
-void core_info_list_update_missing_firmware(core_info_list_t *list,
-      const char *core, const char *systemdir);	  
-	  
-/* Shallow-copies internal state. Data in *info is invalidated when the
- * core_info_list is freed. */
-bool core_info_list_get_info(core_info_list_t *list,
-      core_info_t *info, const char *path);
-
-const char *core_info_list_get_all_extensions(void);
-
-core_info_t *core_info_find(core_info_list_t *list,
-      const char *core);
-
 bool core_info_list_get_display_name(core_info_list_t *list,
-      const char *path, char *buf, size_t size);
+      const char *path, char *s, size_t len);

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

@@ -112,8 +101,24 @@ void core_info_get_name(const char *path, char *s, size_t len);

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

-#ifdef __cplusplus
-}
-#endif
+void core_info_free_current_core(void);
+
+bool core_info_init_current_core(void);
+
+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_get_list(core_info_list_t **core);
+
+bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info);
+
+bool core_info_find(core_info_ctx_find_t *info, const char *name);
+
+bool core_info_load(core_info_ctx_find_t *info);
+
+RETRO_END_DECLS

 #endif /* CORE_INFO_H_ */
@@ -1,5 +1,4 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
 * 
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -14,21 +13,16 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __RARCH_SCREENSHOT_H
-#define __RARCH_SCREENSHOT_H
+#ifndef __CORE_TYPE_H
+#define __CORE_TYPE_H

-#include <stdint.h>
-#include <stddef.h>
-#include <boolean.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool take_screenshot(void);
-
-#ifdef __cplusplus
-}
-#endif
+enum rarch_core_type 
+{
+   CORE_TYPE_PLAIN = 0,
+   CORE_TYPE_DUMMY,
+   CORE_TYPE_FFMPEG,
+   CORE_TYPE_IMAGEVIEWER,
+   CORE_TYPE_NETRETROPAD
+};

 #endif
@@ -19,8 +19,9 @@
 #include <stdlib.h>
 #include <string.h>

+#include <libretro.h>
+
 #include "internal_cores.h"
-#include "../libretro.h"

 static uint16_t *frame_buf;

@@ -1,244 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <boolean.h>
-
-#define STB_IMAGE_IMPLEMENTATION
-
-#ifdef RARCH_INTERNAL
-#define STBI_NO_PSD
-#define STBI_NO_GIF
-#define STBI_NO_HDR
-#define STBI_NO_PIC
-#define STBI_NO_PNM
-#define STBI_SUPPORT_ZLIB
-#endif
-
-#include "../deps/stb/stb_image.h"
-
-#ifdef RARCH_INTERNAL
-#include "internal_cores.h"
-#include "../libretro.h"
-#define IMAGE_CORE_PREFIX(s) libretro_imageviewer_##s
-#else
-#include "libretro.h"
-#define IMAGE_CORE_PREFIX(s) s
-#endif
-
-static retro_log_printf_t IMAGE_CORE_PREFIX(log_cb);
-static retro_video_refresh_t IMAGE_CORE_PREFIX(video_cb);
-static retro_input_poll_t IMAGE_CORE_PREFIX(input_poll_cb);
-static retro_input_state_t IMAGE_CORE_PREFIX(input_state_cb);
-static retro_audio_sample_batch_t IMAGE_CORE_PREFIX(audio_batch_cb);
-static retro_environment_t IMAGE_CORE_PREFIX(environ_cb);
-
-static uint32_t* image_buffer;
-static int       image_width;
-static int       image_height;
-static bool      image_uploaded;
-
-#if 0
-#define DUPE_TEST
-#endif
-
-void IMAGE_CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info)
-{
-   info->library_name     = "image display";
-   info->library_version  = "v0.1";
-   info->need_fullpath    = true;
-   info->block_extract    = false;
-#ifdef RARCH_INTERNAL
-   info->valid_extensions = "jpg|jpeg|png|bmp|tga";
-#else
-   info->valid_extensions = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
-#endif
-}
-
-void IMAGE_CORE_PREFIX(retro_get_system_av_info)(struct retro_system_av_info *info)
-{
-   info->geometry.base_width   = image_width;
-   info->geometry.base_height  = image_height;
-   info->geometry.max_width    = image_width;
-   info->geometry.max_height   = image_height;
-   info->geometry.aspect_ratio = 0;
-   info->timing.fps            = 60.0;
-   info->timing.sample_rate    = 44100.0;
-}
-
-void IMAGE_CORE_PREFIX(retro_init)(void)
-{
-   struct retro_log_callback log;
-
-   if (IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
-      IMAGE_CORE_PREFIX(log_cb) = log.log;
-   else
-      IMAGE_CORE_PREFIX(log_cb) = NULL;
-
-   image_buffer = NULL;
-   image_width  = 0;
-   image_height = 0;
-
-}
-
-void IMAGE_CORE_PREFIX(retro_deinit)(void)
-{
-   if (image_buffer)
-      free(image_buffer);
-   image_buffer = NULL;
-   image_width  = 0;
-   image_height = 0;
-}
-
-void IMAGE_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
-{
-   static const struct retro_variable vars[] = {
-      { NULL, NULL },
-   };
-
-   IMAGE_CORE_PREFIX(environ_cb) = cb;
-
-   cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
-}
-
-void IMAGE_CORE_PREFIX(retro_set_video_refresh)(retro_video_refresh_t cb)
-{
-   IMAGE_CORE_PREFIX(video_cb) = cb;
-}
-
-void IMAGE_CORE_PREFIX(retro_set_audio_sample)(retro_audio_sample_t unused)
-{
-}
-
-void IMAGE_CORE_PREFIX(retro_set_audio_sample_batch)(retro_audio_sample_batch_t cb)
-{
-   IMAGE_CORE_PREFIX(audio_batch_cb) = cb;
-}
-
-void IMAGE_CORE_PREFIX(retro_set_input_poll)(retro_input_poll_t cb)
-{
-   IMAGE_CORE_PREFIX(input_poll_cb) = cb;
-}
-
-void IMAGE_CORE_PREFIX(retro_set_input_state)(retro_input_state_t cb)
-{
-   IMAGE_CORE_PREFIX(input_state_cb) = cb;
-}
-
-void IMAGE_CORE_PREFIX(retro_set_controller_port_device)(unsigned a, unsigned b)
-{
-}
-
-void IMAGE_CORE_PREFIX(retro_reset)(void)
-{
-   image_uploaded = false;
-}
-
-size_t IMAGE_CORE_PREFIX(retro_serialize_size)(void)
-{
-   return 0;
-}
-
-bool IMAGE_CORE_PREFIX(retro_serialize)(void *data, size_t size)
-{
-   (void)data;
-   (void)size;
-   return false;
-}
-
-bool IMAGE_CORE_PREFIX(retro_unserialize)(const void *data, size_t size)
-{
-   (void)data;
-   (void)size;
-   return false;
-}
-
-void IMAGE_CORE_PREFIX(retro_cheat_reset)(void)
-{
-}
-
-void IMAGE_CORE_PREFIX(retro_cheat_set)(unsigned a, bool b, const char * c)
-{
-}
-
-bool IMAGE_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
-{
-   int comp;
-   uint32_t *buf, *end;
-   enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
-  
-   image_buffer = (uint32_t*)stbi_load (info->path,&image_width, &image_height, &comp, 4);
-   /* RGBA > XRGB8888 */
-   buf = &image_buffer[0];
-   end = buf + (image_width*image_height*sizeof(uint32_t))/4;
-
-   while(buf < end)
-   {
-    uint32_t pixel = *buf;
-    *buf = (pixel & 0xff00ff00) | ((pixel << 16) & 0x00ff0000) | ((pixel >> 16) & 0xff);
-    buf++;
-   }
-  
-   if (!IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
-   {
-      if (IMAGE_CORE_PREFIX(log_cb))
-         IMAGE_CORE_PREFIX(log_cb)(RETRO_LOG_INFO, "XRGB8888 is not supported.\n");
-      return false;
-   }
-
-
-   return true;
-}
-
-bool IMAGE_CORE_PREFIX(retro_load_game_special)(unsigned a, const struct retro_game_info *b, size_t c)
-{
-   return false;
-}
-
-void IMAGE_CORE_PREFIX(retro_unload_game)(void)
-{
-   if (image_buffer)
-      free(image_buffer);
-   image_buffer = NULL;
-   image_width  = 0;
-   image_height = 0;
-}
-
-unsigned IMAGE_CORE_PREFIX(retro_get_region)(void)
-{
-   return RETRO_REGION_NTSC;
-}
-
-void *IMAGE_CORE_PREFIX(retro_get_memory_data)(unsigned id)
-{
-   return NULL;
-}
-
-size_t IMAGE_CORE_PREFIX(retro_get_memory_size)(unsigned id)
-{
-   return 0;
-}
-
-void IMAGE_CORE_PREFIX(retro_run)(void)
-{
-   IMAGE_CORE_PREFIX(input_poll_cb)();
-
-#ifdef DUPE_TEST
-   if (!image_uploaded)
-   {
-      IMAGE_CORE_PREFIX(video_cb)(image_buffer, image_width, image_height, image_width * sizeof(uint32_t));
-      image_uploaded = true;
-   }
-   else
-      IMAGE_CORE_PREFIX(video_cb)(NULL, image_width, image_height, image_width * sizeof(uint32_t));
-#else
-   IMAGE_CORE_PREFIX(video_cb)(image_buffer, image_width, image_height, image_width * sizeof(uint32_t));
-#endif
-}
-
-unsigned IMAGE_CORE_PREFIX(retro_api_version)(void)
-{
-   return RETRO_API_VERSION;
-}
@@ -19,7 +19,7 @@
 #define INTERNAL_CORES_H__

 #include <boolean.h>
-#include "../libretro.h"
+#include <libretro.h>

 void libretro_dummy_retro_init(void);

@@ -184,4 +184,60 @@ size_t libretro_imageviewer_retro_get_memory_size(unsigned id);

 #endif

+#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY)
+/* Internal networked retropad core. */
+
+void libretro_netretropad_retro_init(void);
+
+void libretro_netretropad_retro_deinit(void);
+
+unsigned libretro_netretropad_retro_api_version(void);
+
+void libretro_netretropad_retro_get_system_info(struct retro_system_info *info);
+
+void libretro_netretropad_retro_get_system_av_info(struct retro_system_av_info *info);
+
+void libretro_netretropad_retro_set_environment(retro_environment_t cb);
+
+void libretro_netretropad_retro_set_video_refresh(retro_video_refresh_t cb);
+
+void libretro_netretropad_retro_set_audio_sample(retro_audio_sample_t cb);
+
+void libretro_netretropad_retro_set_audio_sample_batch(retro_audio_sample_batch_t cb);
+
+void libretro_netretropad_retro_set_input_poll(retro_input_poll_t cb);
+
+void libretro_netretropad_retro_set_input_state(retro_input_state_t cb);
+
+void libretro_netretropad_retro_set_controller_port_device(unsigned port, unsigned device);
+
+void libretro_netretropad_retro_reset(void);
+
+void libretro_netretropad_retro_run(void);
+
+size_t libretro_netretropad_retro_serialize_size(void);
+
+bool libretro_netretropad_retro_serialize(void *data, size_t size);
+
+bool libretro_netretropad_retro_unserialize(const void *data, size_t size);
+
+void libretro_netretropad_retro_cheat_reset(void);
+
+void libretro_netretropad_retro_cheat_set(unsigned index, bool enabled, const char *code);
+
+bool libretro_netretropad_retro_load_game(const struct retro_game_info *game);
+
+bool libretro_netretropad_retro_load_game_special(unsigned game_type,
+      const struct retro_game_info *info, size_t num_info);
+
+void libretro_netretropad_retro_unload_game(void);
+
+unsigned libretro_netretropad_retro_get_region(void);
+
+void *libretro_netretropad_retro_get_memory_data(unsigned id);
+
+size_t libretro_netretropad_retro_get_memory_size(unsigned id);
+
+#endif
+
 #endif
@@ -232,12 +232,13 @@ ifeq ($(HAVE_SSA), 1)
 endif

 LIBRETROCOMM_DIR := ../../libretro-common
+DEPS_DIR         := ../../deps

 LIBAVCODEC_SOURCE :=
 LIBAVFORMAT_SOURCE :=
 LIBAVUTIL_SOURCE :=
 LIBRETRO_SOURCE := ffmpeg_core.c \
-						 $(LIBRETROCOMM_DIR)/queues/fifo_buffer.c \
+						 $(LIBRETROCOMM_DIR)/queues/fifo_queue.c \
 						 $(LIBRETROCOMM_DIR)/rthreads/rthreads.c
 DEPS_SOURCE :=

@@ -2165,7 +2166,7 @@ else
 	CFLAGS += -DHAVE_INTRINSICS_NEON=0
 endif

-CFLAGS += -Ilibretro-common/include 
+CFLAGS += -I$(LIBRETROCOMM_DIR)/include -I$(DEPS_DIR)

 OBJECTS := $(DEPS_SOURCE:.c=.o) $(LIBRETRO_SOURCE:.c=.o) $(FFT_SOURCE:.cpp=.o) $(LIBAVUTIL_SOURCE:.c=.o) $(LIBAVFORMAT_SOURCE:.c=.o) $(LIBSWSCALE_SOURCE:.c=.o) $(LIBAVCODEC_SOURCE:.c=.o) $(LIBSWRESAMPLE_SOURCE:.c=.o)

@@ -5,6 +5,12 @@
 #include <assert.h>
 #include <stdarg.h>

+#ifdef RARCH_INTERNAL
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,6 +18,7 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 #include <libswscale/swscale.h>
+#include <libavutil/imgutils.h>
 #include <libavutil/time.h>
 #include <libavutil/opt.h>
 #include <libavdevice/avdevice.h>
@@ -33,9 +40,9 @@ extern "C" {
 #endif

 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

-#include "libretro.h"
+#include <libretro.h>
 #ifdef RARCH_INTERNAL
 #include "internal_cores.h"
 #define CORE_PREFIX(s) libretro_ffmpeg_##s
@@ -174,9 +181,14 @@ static struct
 #ifdef HAVE_SSA
 static void ass_msg_cb(int level, const char *fmt, va_list args, void *data)
 {
+   char buffer[4096];
   (void)data;
+
   if (level < 6)
-      log_cb(RETRO_LOG_INFO, fmt);
+   {
+      vsnprintf(buffer, sizeof(buffer), fmt, args);
+      log_cb(RETRO_LOG_INFO, "%s\n", buffer);
+   }
 }
 #endif

@@ -792,8 +804,10 @@ static bool codec_id_is_ass(enum AVCodecID id)
 #endif
         return true;
      default:
-         return false;
+         break;
   }
+
+   return false;
 }
 #endif

@@ -801,14 +815,15 @@ static bool open_codecs(void)
 {
   unsigned i;

-   video_stream = -1;
-   memset(audio_streams,    0, sizeof(audio_streams));
-   memset(subtitle_streams, 0, sizeof(subtitle_streams));
+   video_stream         = -1;
   audio_streams_num    = 0;
   audio_streams_ptr    = 0;
   subtitle_streams_num = 0;
   subtitle_streams_ptr = 0;

+   memset(audio_streams,    0, sizeof(audio_streams));
+   memset(subtitle_streams, 0, sizeof(subtitle_streams));
+
   for (i = 0; i < fctx->nb_streams; i++)
   {
      switch (fctx->streams[i]->codec->codec_type)
@@ -848,7 +863,7 @@ static bool open_codecs(void)

               if (size)
               {
-                  ass_extra_data[subtitle_streams_num] = av_malloc(size);
+                  ass_extra_data[subtitle_streams_num] = (uint8_t*)av_malloc(size);
                  memcpy(ass_extra_data[subtitle_streams_num], (*s)->extradata, size);
               }

@@ -858,12 +873,12 @@ static bool open_codecs(void)
            break;

         case AVMEDIA_TYPE_ATTACHMENT:
-         {
-            AVCodecContext *ctx = fctx->streams[i]->codec;
-            if (codec_id_is_ttf(ctx->codec_id))
-               append_attachment(ctx->extradata, ctx->extradata_size);
+            {
+               AVCodecContext *ctx = fctx->streams[i]->codec;
+               if (codec_id_is_ttf(ctx->codec_id))
+                  append_attachment(ctx->extradata, ctx->extradata_size);
+            }
            break;
-         }

         default:
            break;
@@ -883,19 +898,21 @@ static bool init_media_info(void)
   {
      media.width  = vctx->width;
      media.height = vctx->height;
-      media.aspect = (float)vctx->width * av_q2d(vctx->sample_aspect_ratio) / vctx->height;
+      media.aspect = (float)vctx->width * 
+         av_q2d(vctx->sample_aspect_ratio) / vctx->height;
   }

 #ifdef HAVE_SSA
   if (sctx[0])
   {
-      size_t i;
+      unsigned i;

      ass = ass_library_init();
      ass_set_message_cb(ass, ass_msg_cb, NULL);

      for (i = 0; i < attachments_size; i++)
-         ass_add_font(ass, (char*)"", (char*)attachments[i].data, attachments[i].size);
+         ass_add_font(ass, (char*)"",
+               (char*)attachments[i].data, attachments[i].size);

      ass_render = ass_renderer_init(ass);
      ass_set_frame_size(ass_render, media.width, media.height);
@@ -903,7 +920,7 @@ static bool init_media_info(void)
      ass_set_fonts(ass_render, NULL, NULL, 1, NULL, 1);
      ass_set_hinting(ass_render, ASS_HINTING_LIGHT);

-      for (i = 0; i < subtitle_streams_num; i++)
+      for (i = 0; i < (unsigned)subtitle_streams_num; i++)
      {
         ass_track[i] = ass_new_track(ass);
         ass_process_codec_private(ass_track[i], (char*)ass_extra_data[i],
@@ -916,7 +933,8 @@ static bool init_media_info(void)
 }

 static void set_colorspace(struct SwsContext *sws,
-      unsigned width, unsigned height, enum AVColorSpace default_color, int in_range)
+      unsigned width, unsigned height,
+      enum AVColorSpace default_color, int in_range)
 {
   const int *coeffs = NULL;

@@ -951,7 +969,8 @@ static void set_colorspace(struct SwsContext *sws,
   }
 }

-static bool decode_video(AVPacket *pkt, AVFrame *frame, AVFrame *conv, struct SwsContext *sws)
+static bool decode_video(AVPacket *pkt, AVFrame *frame,
+      AVFrame *conv, struct SwsContext *sws)
 {
   int got_ptr = 0;
   int ret     = avcodec_decode_video2(vctx, frame, &got_ptr, pkt);
@@ -971,7 +990,8 @@ static bool decode_video(AVPacket *pkt, AVFrame *frame, AVFrame *conv, struct Sw
   return false;
 }

-static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt, AVFrame *frame, int16_t *buffer, size_t *buffer_cap,
+static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt,
+      AVFrame *frame, int16_t *buffer, size_t *buffer_cap,
      SwrContext *swr)
 {
   AVPacket pkt_tmp = *pkt;
@@ -1020,7 +1040,9 @@ static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt, AVFrame *frame,
         }
      }

-      decode_last_audio_time = pts * av_q2d(fctx->streams[audio_streams[audio_streams_ptr]]->time_base);
+      decode_last_audio_time = pts * av_q2d(
+            fctx->streams[audio_streams[audio_streams_ptr]]->time_base);
+
      if (!decode_thread_dead)
         fifo_write(audio_decode_fifo, buffer, required_buffer);

@@ -1101,7 +1123,8 @@ static void render_ass_img(AVFrame *conv_frame, ASS_Image *img)
            dst_g = (g * src_alpha + dst_g * dst_alpha) >> 8;
            dst_b = (b * src_alpha + dst_b * dst_alpha) >> 8;

-            dst[x] = (0xffu << 24) | (dst_r << 16) | (dst_g << 8) | (dst_b << 0);
+            dst[x] = (0xffu << 24) | (dst_r << 16) | 
+               (dst_g << 8) | (dst_b << 0);
         }
      }
   }
@@ -1229,7 +1252,7 @@ static void decode_thread(void *data)
            decoded_size = frame_size + sizeof(pts);
            slock_lock(fifo_lock);

-            while (!decode_thread_dead 
+            while (!decode_thread_dead  && (video_decode_fifo != NULL)
                  && fifo_write_avail(video_decode_fifo) < decoded_size)
            {
               if (!main_sleeping)
@@ -1285,7 +1308,8 @@ static void decode_thread(void *data)
         for (i = 0; i < sub.num_rects; i++)
         {
            if (sub.rects[i]->ass)
-               ass_process_data(ass_track_active, sub.rects[i]->ass, strlen(sub.rects[i]->ass));
+               ass_process_data(ass_track_active,
+                     sub.rects[i]->ass, strlen(sub.rects[i]->ass));
         }
 #endif

@@ -1406,14 +1430,16 @@ static void context_reset(void)
 #if !defined(HAVE_OPENGLES)
      glGenBuffers(1, &frames[i].pbo);
      glBindBuffer(GL_PIXEL_UNPACK_BUFFER, frames[i].pbo);
-      glBufferData(GL_PIXEL_UNPACK_BUFFER, media.width * media.height * sizeof(uint32_t), NULL, GL_STREAM_DRAW);
+      glBufferData(GL_PIXEL_UNPACK_BUFFER, media.width 
+            * media.height * sizeof(uint32_t), NULL, GL_STREAM_DRAW);
      glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 #endif
   }

   glGenBuffers(1, &vbo);
   glBindBuffer(GL_ARRAY_BUFFER, vbo);
-   glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
+   glBufferData(GL_ARRAY_BUFFER,
+         sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);

   glBindBuffer(GL_ARRAY_BUFFER, 0);
   glBindTexture(GL_TEXTURE_2D, 0);
@@ -1569,7 +1595,8 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)

   if (video_stream >= 0 || is_glfft)
   {
-      video_decode_fifo = fifo_new(media.width * media.height * sizeof(uint32_t) * 32);
+      video_decode_fifo = fifo_new(media.width 
+            * media.height * sizeof(uint32_t) * 32);

 #ifdef HAVE_OPENGL
      use_gl = true;
@@ -0,0 +1,735 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include <glsym/glsym.h>
+#include <libretro.h>
+
+#include <retro_miscellaneous.h>
+#include <filters.h>
+#include <math/complex.h>
+
+#define GLM_SWIZZLE
+#define GLM_FORCE_RADIANS
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+using namespace glm;
+
+#define GL_DEBUG 0
+#if GL_DEBUG
+#define GL_CHECK_ERROR() do { \
+   if (glGetError() != GL_NO_ERROR) \
+   { \
+      log_cb(RETRO_LOG_ERROR, "GL error at line: %d\n", __LINE__); \
+      abort(); \
+   } \
+} while(0)
+#else
+#define GL_CHECK_ERROR()
+#endif
+
+#ifndef M_HALF_PI
+#define M_HALF_PI 1.57079632679489661923132169163975144
+#endif
+
+extern retro_log_printf_t log_cb;
+
+struct target
+{
+   GLuint tex;
+   GLuint fbo;
+};
+
+struct Pass
+{
+   struct target target;
+   GLuint parameter_tex;
+};
+
+typedef struct GLFFT 
+{
+   GLuint ms_rb_color;
+   GLuint ms_rb_ds;
+   GLuint ms_fbo;
+
+   Pass *passes;
+   unsigned passes_size;
+
+   GLuint input_tex;
+   GLuint window_tex;
+   GLuint prog_real;
+   GLuint prog_complex;
+   GLuint prog_resolve;
+   GLuint prog_blur;
+
+   GLuint quad;
+   GLuint vao;
+
+   unsigned output_ptr;
+
+   struct target output, resolve, blur;
+
+   struct Block
+   {
+      GLuint prog;
+      GLuint vao;
+      GLuint vbo;
+      GLuint ibo;
+      unsigned elems;
+   } block;
+
+   GLuint pbo;
+   GLshort *sliding;
+   unsigned sliding_size;
+
+   unsigned steps;
+   unsigned size;
+   unsigned block_size;
+   unsigned depth;
+} glfft_t;
+
+#include "gl_shaders/fft_heightmap.glsl.vert.h"
+#include "gl_shaders/fft_heightmap.glsl.frag.h"
+#include "gl_shaders/fft_vertex_program.glsl.vert.h"
+#include "gl_shaders/fft_fragment_program_resolve.glsl.frag.h"
+#include "gl_shaders/fft_fragment_program_real.glsl.frag.h"
+#include "gl_shaders/fft_fragment_program_complex.glsl.frag.h"
+#include "gl_shaders/fft_fragment_program_blur.glsl.frag.h"
+
+static GLuint fft_compile_shader(glfft_t *fft, GLenum type, const char *source)
+{
+   GLint status  = 0;
+   GLuint shader = glCreateShader(type);
+
+   glShaderSource(shader, 1, (const GLchar**)&source, NULL);
+   glCompileShader(shader);
+   
+   glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
+
+   if (!status)
+   {
+      char log_info[8 * 1024];
+      GLsizei log_len;
+
+      log_cb(RETRO_LOG_ERROR, "Failed to compile.\n");
+      glGetShaderInfoLog(shader, sizeof(log_info), &log_len, log_info);
+      log_cb(RETRO_LOG_ERROR, "ERROR: %s\n", log_info);
+      return 0;
+   }
+
+   return shader;
+}
+
+static GLuint fft_compile_program(glfft_t *fft,
+      const char *vertex_source, const char *fragment_source)
+{
+   GLint status = 0;
+   GLuint prog  = glCreateProgram();
+   GLuint vert  = fft_compile_shader(fft, GL_VERTEX_SHADER, vertex_source);
+   GLuint frag  = fft_compile_shader(fft, GL_FRAGMENT_SHADER, fragment_source);
+
+   glAttachShader(prog, vert);
+   glAttachShader(prog, frag);
+   glLinkProgram(prog);
+
+   glGetProgramiv(prog, GL_LINK_STATUS, &status);
+
+   if (!status)
+   {
+      char log_info[8 * 1024];
+      GLsizei log_len;
+
+      log_cb(RETRO_LOG_ERROR, "Failed to link.\n");
+      glGetProgramInfoLog(prog, sizeof(log_info), &log_len, log_info);
+      log_cb(RETRO_LOG_ERROR, "ERROR: %s\n", log_info);
+   }
+
+   glDeleteShader(vert);
+   glDeleteShader(frag);
+   return prog;
+}
+
+static void fft_render(glfft_t *fft, GLuint backbuffer, unsigned width, unsigned height)
+{
+   mat4 mvp;
+
+   /* Render scene. */
+   glBindFramebuffer(GL_FRAMEBUFFER, fft->ms_fbo ? fft->ms_fbo : backbuffer);
+   glViewport(0, 0, width, height);
+   glClearColor(0.1f, 0.15f, 0.1f, 1.0f);
+   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+   vec3 eye(0, 80, -60);
+   mvp = perspective((float)M_HALF_PI, (float)width / height, 1.0f, 500.0f) *
+      lookAt(eye, eye + vec3(0.0f, 0.0f, 1.0f), vec3(0.0f, 1.0f, 0.0f));
+
+   glUseProgram(fft->block.prog);
+   glUniformMatrix4fv(glGetUniformLocation(fft->block.prog, "uMVP"),
+         1, GL_FALSE, value_ptr(mvp));
+   glUniform2i(glGetUniformLocation(fft->block.prog, "uOffset"),
+         (-int(fft->block_size) + 1) / 2, fft->output_ptr);
+   glUniform4f(glGetUniformLocation(fft->block.prog, "uHeightmapParams"),
+         -(fft->block_size - 1.0f) / 2.0f, 0.0f, 3.0f, 2.0f);
+   glUniform1f(glGetUniformLocation(fft->block.prog, "uAngleScale"),
+         M_PI / ((fft->block_size - 1) / 2));
+
+   glBindVertexArray(fft->block.vao);
+   glBindTexture(GL_TEXTURE_2D, fft->blur.tex);
+   glDrawElements(GL_TRIANGLE_STRIP, fft->block.elems, GL_UNSIGNED_INT, NULL);
+   glBindVertexArray(0);
+   glUseProgram(0);
+
+   if (fft->ms_fbo)
+   {
+      glBindFramebuffer(GL_READ_FRAMEBUFFER, fft->ms_fbo);
+      glBindFramebuffer(GL_DRAW_FRAMEBUFFER, backbuffer);
+      glBlitFramebuffer(0, 0, width, height, 0, 0, width, height,
+            GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+      static const GLenum attachments[] = { GL_COLOR_ATTACHMENT0, GL_DEPTH_STENCIL_ATTACHMENT };
+      glBindFramebuffer(GL_FRAMEBUFFER, fft->ms_fbo);
+      glInvalidateFramebuffer(GL_FRAMEBUFFER, 2, attachments);
+      GL_CHECK_ERROR();
+   }
+
+   glBindFramebuffer(GL_FRAMEBUFFER, 0);
+   GL_CHECK_ERROR();
+}
+
+static void fft_step(glfft_t *fft,
+      const GLshort *audio_buffer, unsigned frames)
+{
+   unsigned i;
+   GLshort *buffer = NULL;
+   GLshort *slide  = (GLshort*)&fft->sliding[0];
+
+   glEnable(GL_DEPTH_TEST);
+   glEnable(GL_CULL_FACE);
+   glBindVertexArray(fft->vao);
+
+   glActiveTexture(GL_TEXTURE2);
+   glBindTexture(GL_TEXTURE_2D, fft->window_tex);
+   
+   glActiveTexture(GL_TEXTURE0);
+   glBindTexture(GL_TEXTURE_2D, fft->input_tex);
+   glUseProgram(fft->prog_real);
+
+   memmove(slide, slide + frames * 2,
+         (fft->sliding_size - 2 * frames) * sizeof(GLshort));
+   memcpy(slide + fft->sliding_size - frames * 2, audio_buffer,
+         2 * frames * sizeof(GLshort));
+
+   /* Upload audio data to GPU. */
+   glBindBuffer(GL_PIXEL_UNPACK_BUFFER, fft->pbo);
+
+   buffer = (GLshort*)(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0,
+            2 * fft->size * sizeof(GLshort),
+            GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT));
+
+   if (buffer)
+   {
+      memcpy(buffer, slide, fft->sliding_size * sizeof(GLshort));
+      glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+   }
+   glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, fft->size, 1,
+         GL_RG_INTEGER, GL_SHORT, NULL);
+   glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+
+   /* Perform FFT of new block. */
+   glViewport(0, 0, fft->size, 1);
+
+   for (i = 0; i < fft->steps; i++)
+   {
+      if (i == fft->steps - 1)
+      {
+         glBindFramebuffer(GL_FRAMEBUFFER, fft->output.fbo);
+         glUniform1i(glGetUniformLocation(i == 0 
+                  ? fft->prog_real : fft->prog_complex, "uViewportOffset"),
+               fft->output_ptr);
+         glViewport(0, fft->output_ptr, fft->size, 1);
+      }
+      else
+      {
+         glUniform1i(glGetUniformLocation(i == 0 
+                  ? fft->prog_real : fft->prog_complex, "uViewportOffset"), 0);
+         glBindFramebuffer(GL_FRAMEBUFFER, fft->passes[i].target.fbo);
+         glClear(GL_COLOR_BUFFER_BIT);
+      }
+
+      glActiveTexture(GL_TEXTURE1);
+      glBindTexture(GL_TEXTURE_2D, fft->passes[i].parameter_tex);
+
+      glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+      glActiveTexture(GL_TEXTURE0);
+      glBindTexture(GL_TEXTURE_2D, fft->passes[i].target.tex);
+
+      if (i == 0)
+         glUseProgram(fft->prog_complex);
+   }
+   glActiveTexture(GL_TEXTURE0);
+
+   /* Resolve new chunk to heightmap. */
+   glViewport(0, fft->output_ptr, fft->size, 1);
+   glUseProgram(fft->prog_resolve);
+   glBindFramebuffer(GL_FRAMEBUFFER, fft->resolve.fbo);
+   const GLfloat resolve_offset[] = { 0.0f, float(fft->output_ptr) / fft->depth,
+      1.0f, 1.0f / fft->depth };
+   glUniform4fv(glGetUniformLocation(fft->prog_resolve, "uOffsetScale"),
+         1, resolve_offset);
+   glBindTexture(GL_TEXTURE_2D, fft->output.tex);
+   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+   /* Re-blur damaged regions of heightmap. */
+   glUseProgram(fft->prog_blur);
+   glBindTexture(GL_TEXTURE_2D, fft->resolve.tex);
+   glBindFramebuffer(GL_FRAMEBUFFER, fft->blur.fbo);
+   glUniform4fv(glGetUniformLocation(fft->prog_blur, "uOffsetScale"),
+         1, resolve_offset);
+   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+   /* Mipmap the heightmap. */
+   glBindTexture(GL_TEXTURE_2D, fft->blur.tex);
+   glGenerateMipmap(GL_TEXTURE_2D);
+   glBindTexture(GL_TEXTURE_2D, 0);
+
+   fft->output_ptr++;
+   fft->output_ptr &= fft->depth - 1;
+
+   glBindVertexArray(0);
+   glUseProgram(0);
+   GL_CHECK_ERROR();
+}
+
+static inline unsigned log2i(unsigned x)
+{
+   if (x==0) return 0; // shouldn't happen
+   
+   unsigned res;
+   for (res = 0; x; x >>= 1)
+      res++;
+   return res - 1;
+}
+
+static inline unsigned bitinverse(unsigned x, unsigned size)
+{
+   unsigned i;
+   unsigned size_log2 = log2i(size);
+   unsigned ret = 0;
+
+   for (i = 0; i < size_log2; i++)
+      ret |= ((x >> i) & 0x1) << (size_log2 - 1 - i);
+   return ret;
+}
+
+static fft_complex_t exp_imag(float phase)
+{
+   fft_complex_t out = { cosf(phase), sinf(phase) };
+   return out;
+}
+
+void fft_build_params(glfft_t *fft, GLuint *buffer,
+      unsigned step, unsigned size)
+{
+   unsigned i, j;
+   unsigned step_size = 1 << step;
+
+   for (i = 0; i < size; i += step_size << 1)
+   {
+      for (j = i; j < i + step_size; j++)
+      {
+         int s                 = j - i;
+         float phase           = -1.0f * (float)s / step_size;
+         unsigned a            = j;
+         unsigned b            = j + step_size;
+         fft_complex_t twiddle = exp_imag(M_PI * phase);
+
+         unsigned read_a       = (step == 0) ? bitinverse(a, size) : a;
+         unsigned read_b       = (step == 0) ? bitinverse(b, size) : b;
+         vec2 tmp              = vec2(twiddle.real, twiddle.imag);
+
+         buffer[2 * a + 0]     = (read_a << 16) | read_b;
+         buffer[2 * a + 1]     = packHalf2x16(tmp);
+         buffer[2 * b + 0]     = (read_a << 16) | read_b;
+         buffer[2 * b + 1]     = packHalf2x16(-tmp);
+      }
+   }
+}
+
+static void fft_init_quad_vao(glfft_t *fft)
+{
+   static const GLbyte quad_buffer[] = {
+      -1, -1, 1, -1, -1, 1, 1, 1,
+       0,  0, 1,  0,  0, 1, 1, 1,
+   };
+   glGenBuffers(1, &fft->quad);
+   glBindBuffer(GL_ARRAY_BUFFER, fft->quad);
+   glBufferData(GL_ARRAY_BUFFER,
+         sizeof(quad_buffer), quad_buffer, GL_STATIC_DRAW);
+   glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+   glGenVertexArrays(1, &fft->vao);
+   glBindVertexArray(fft->vao);
+   glBindBuffer(GL_ARRAY_BUFFER, fft->quad);
+   glEnableVertexAttribArray(0);
+   glEnableVertexAttribArray(1);
+   glVertexAttribPointer(0, 2, GL_BYTE, GL_FALSE, 0, 0);
+   glVertexAttribPointer(1, 2, GL_BYTE, GL_FALSE, 0,
+         reinterpret_cast<const GLvoid*>(uintptr_t(8)));
+   glBindVertexArray(0);
+   glBindBuffer(GL_ARRAY_BUFFER, 0);
+}
+
+static void fft_init_texture(glfft_t *fft, GLuint *tex, GLenum format,
+      unsigned width, unsigned height, unsigned levels, GLenum mag, GLenum min)
+{
+   glGenTextures(1, tex);
+   glBindTexture(GL_TEXTURE_2D, *tex);
+   glTexStorage2D(GL_TEXTURE_2D, levels, format, width, height);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min);
+   glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+static void fft_init_target(glfft_t *fft, struct target *target, GLenum format,
+      unsigned width, unsigned height, unsigned levels, GLenum mag, GLenum min)
+{
+   fft_init_texture(fft, &target->tex, format, width, height, levels, mag, min);
+   glGenFramebuffers(1, &target->fbo);
+   glBindFramebuffer(GL_FRAMEBUFFER, target->fbo);
+
+   glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+      target->tex, 0);
+
+   if (format == GL_RGBA8)
+   {
+      glClearColor(0, 0, 0, 0);
+      glClear(GL_COLOR_BUFFER_BIT);
+   }
+   else if (format == GL_RG16I)
+   {
+      static const GLint v[] = { 0, 0, 0, 0 };
+      glClearBufferiv(GL_COLOR, 0, v);
+   }
+   else
+   {
+      static const GLuint v[] = { 0, 0, 0, 0 };
+      glClearBufferuiv(GL_COLOR, 0, v);
+   }
+   glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+
+#define KAISER_BETA 12.0
+
+static void fft_init(glfft_t *fft)
+{
+   unsigned i;
+   double window_mod;
+   GLushort *window;
+   static const GLfloat unity[] = { 0.0f, 0.0f, 1.0f, 1.0f };
+
+   fft->prog_real    = fft_compile_program(fft, fft_vertex_program, fft_fragment_program_real);
+   fft->prog_complex = fft_compile_program(fft, fft_vertex_program, fft_fragment_program_complex);
+   fft->prog_resolve = fft_compile_program(fft, fft_vertex_program, fft_fragment_program_resolve);
+   fft->prog_blur    = fft_compile_program(fft, fft_vertex_program, fft_fragment_program_blur);
+   GL_CHECK_ERROR();
+
+   glUseProgram(fft->prog_real);
+   glUniform1i(glGetUniformLocation(fft->prog_real, "sTexture"), 0);
+   glUniform1i(glGetUniformLocation(fft->prog_real, "sParameterTexture"), 1);
+   glUniform1i(glGetUniformLocation(fft->prog_real, "sWindow"), 2);
+   glUniform4fv(glGetUniformLocation(fft->prog_real, "uOffsetScale"), 1, unity);
+
+   glUseProgram(fft->prog_complex);
+   glUniform1i(glGetUniformLocation(fft->prog_complex, "sTexture"), 0);
+   glUniform1i(glGetUniformLocation(fft->prog_complex, "sParameterTexture"), 1);
+   glUniform4fv(glGetUniformLocation(fft->prog_complex, "uOffsetScale"), 1, unity);
+   
+   glUseProgram(fft->prog_resolve);
+   glUniform1i(glGetUniformLocation(fft->prog_resolve, "sFFT"), 0);
+   glUniform4fv(glGetUniformLocation(fft->prog_resolve, "uOffsetScale"), 1, unity);
+
+   glUseProgram(fft->prog_blur);
+   glUniform1i(glGetUniformLocation(fft->prog_blur, "sHeight"), 0);
+   glUniform4fv(glGetUniformLocation(fft->prog_blur, "uOffsetScale"), 1, unity);
+
+   GL_CHECK_ERROR();
+
+   fft_init_texture(fft, &fft->window_tex, GL_R16UI,
+         fft->size, 1, 1, GL_NEAREST, GL_NEAREST);
+   GL_CHECK_ERROR();
+
+   window = (GLushort*)calloc(fft->size, sizeof(GLushort));
+
+   window_mod = 1.0 / kaiser_window_function(0.0, KAISER_BETA);
+
+   for (i = 0; i < fft->size; i++)
+   {
+      double phase = (double)(i - int(fft->size) / 2) / (int(fft->size) / 2);
+      double     w = kaiser_window_function(phase, KAISER_BETA);
+      window[i]    = round(0xffff * w * window_mod);
+   }
+   glBindTexture(GL_TEXTURE_2D, fft->window_tex);
+   glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
+         fft->size, 1, GL_RED_INTEGER, GL_UNSIGNED_SHORT, &window[0]);
+   glBindTexture(GL_TEXTURE_2D, 0);
+
+   GL_CHECK_ERROR();
+   fft_init_texture(fft, &fft->input_tex, GL_RG16I,
+         fft->size, 1, 1, GL_NEAREST, GL_NEAREST);
+   fft_init_target(fft, &fft->output, GL_RG32UI,
+         fft->size, fft->depth, 1, GL_NEAREST, GL_NEAREST);
+   fft_init_target(fft, &fft->resolve, GL_RGBA8,
+         fft->size, fft->depth, 1, GL_NEAREST, GL_NEAREST);
+   fft_init_target(fft, &fft->blur, GL_RGBA8,
+         fft->size, fft->depth,
+         log2i(MAX(fft->size, fft->depth)) + 1,
+         GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR);
+
+   GL_CHECK_ERROR();
+
+   for (i = 0; i < fft->steps; i++)
+   {
+      GLuint *param_buffer = NULL;
+      fft_init_target(fft, &fft->passes[i].target,
+            GL_RG32UI, fft->size, 1, 1, GL_NEAREST, GL_NEAREST);
+      fft_init_texture(fft, &fft->passes[i].parameter_tex,
+            GL_RG32UI, fft->size, 1, 1, GL_NEAREST, GL_NEAREST);
+
+      param_buffer = (GLuint*)calloc(2 * fft->size, sizeof(GLuint));
+
+      fft_build_params(fft, &param_buffer[0], i, fft->size);
+
+      glBindTexture(GL_TEXTURE_2D, fft->passes[i].parameter_tex);
+      glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
+            fft->size, 1, GL_RG_INTEGER, GL_UNSIGNED_INT, &param_buffer[0]);
+      glBindTexture(GL_TEXTURE_2D, 0);
+
+      free(param_buffer);
+   }
+
+   GL_CHECK_ERROR();
+   glGenBuffers(1, &fft->pbo);
+   glBindBuffer(GL_PIXEL_UNPACK_BUFFER, fft->pbo);
+   glBufferData(GL_PIXEL_UNPACK_BUFFER,
+         fft->size * 2 * sizeof(GLshort), 0, GL_DYNAMIC_DRAW);
+   glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+
+   free(window);
+}
+
+static void fft_init_block(glfft_t *fft)
+{
+   unsigned x, y;
+   GLuint *bp;
+   GLushort *block_vertices;
+   GLuint   *block_indices;
+   unsigned block_vertices_size;
+   unsigned block_indices_size;
+   int pos    = 0;
+
+   fft->block.prog = fft_compile_program(fft,
+         fft_vertex_program_heightmap, fft_fragment_program_heightmap);
+   glUseProgram(fft->block.prog);
+   glUniform1i(glGetUniformLocation(fft->block.prog, "sHeight"), 0);
+
+   block_vertices_size = 2 * fft->block_size * fft->depth;
+   block_vertices      = (GLushort*)calloc(block_vertices_size, sizeof(GLushort));
+
+   for (y = 0; y < fft->depth; y++)
+   {
+      for (x = 0; x < fft->block_size; x++)
+      {
+         block_vertices[2 * (y * fft->block_size + x) + 0] = x;
+         block_vertices[2 * (y * fft->block_size + x) + 1] = y;
+      }
+   }
+   glGenBuffers(1, &fft->block.vbo);
+   glBindBuffer(GL_ARRAY_BUFFER, fft->block.vbo);
+   glBufferData(GL_ARRAY_BUFFER,
+         block_vertices_size * sizeof(GLushort),
+         &block_vertices[0], GL_STATIC_DRAW);
+
+   fft->block.elems = (2 * fft->block_size - 1) * (fft->depth - 1) + 1;
+
+   block_indices_size = fft->block.elems;
+   block_indices = (GLuint*)calloc(block_indices_size, sizeof(GLuint));
+
+   bp = &block_indices[0];
+
+   for (y = 0; y < fft->depth - 1; y++)
+   {
+      int x;
+      int step_odd = -int(fft->block_size) + ((y & 1) ? -1 : 1);
+      int step_even = fft->block_size;
+
+      for (x = 0; x < 2 * int(fft->block_size) - 1; x++)
+      {
+         *bp++ = pos;
+         pos += (x & 1) ? step_odd : step_even;
+      }
+   }
+   *bp++ = pos;
+
+   glGenVertexArrays(1, &fft->block.vao);
+   glBindVertexArray(fft->block.vao);
+
+   glGenBuffers(1, &fft->block.ibo);
+   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, fft->block.ibo);
+   glBufferData(GL_ELEMENT_ARRAY_BUFFER,
+         block_indices_size * sizeof(GLuint),
+         &block_indices[0], GL_STATIC_DRAW);
+
+   glEnableVertexAttribArray(0);
+   glVertexAttribPointer(0, 2, GL_UNSIGNED_SHORT, GL_FALSE, 0, 0);
+   glBindVertexArray(0);
+
+   glBindBuffer(GL_ARRAY_BUFFER, 0);
+   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+   free(block_vertices);
+   free(block_indices);
+}
+
+static bool fft_context_reset(glfft_t *fft, unsigned fft_steps,
+      rglgen_proc_address_t proc, unsigned fft_depth)
+{
+   rglgen_resolve_symbols(proc);
+
+   fft->steps       = fft_steps;
+   fft->depth       = fft_depth;
+   fft->size        = 1 << fft_steps;
+   fft->block_size  = fft->size / 4 + 1;
+
+   fft->passes_size = fft_steps;
+   fft->passes = (Pass*)calloc(fft->passes_size, sizeof(Pass));
+
+   if (!fft->passes)
+      return false;
+
+   fft->sliding_size = 2 * fft->size;
+   fft->sliding = (GLshort*)calloc(fft->sliding_size, sizeof(GLshort));
+
+   if (!fft->sliding)
+      return false;
+
+   GL_CHECK_ERROR();
+   fft_init_quad_vao(fft);
+   GL_CHECK_ERROR();
+   fft_init(fft);
+   GL_CHECK_ERROR();
+   fft_init_block(fft);
+   GL_CHECK_ERROR();
+
+   return true;
+}
+
+/* GLFFT requires either GLES3 or 
+ * desktop GL with ES3_compat (supported by MESA on Linux) extension. */
+extern "C" glfft_t *glfft_new(unsigned fft_steps, rglgen_proc_address_t proc)
+{
+#ifdef HAVE_OPENGLES3
+   const char *ver = (const char*)(glGetString(GL_VERSION));
+   if (ver)
+   {
+      unsigned major, minor;
+      if (sscanf(ver, "OpenGL ES %u.%u", &major, &minor) != 2 || major < 3)
+         return NULL;
+   }
+   else
+      return NULL;
+#else
+   const char *exts = (const char*)(glGetString(GL_EXTENSIONS));
+   if (!exts || !strstr(exts, "ARB_ES3_compatibility"))
+      return NULL;
+#endif
+
+   glfft_t *fft = (glfft_t*)calloc(1, sizeof(*fft));
+   if (!fft)
+      return NULL;
+
+   if (!fft_context_reset(fft, fft_steps, proc, 256))
+      goto error;
+
+   return fft;
+
+error:
+   if (fft)
+      free(fft);
+   return NULL;
+}
+
+extern "C" void glfft_init_multisample(glfft_t *fft,
+      unsigned width, unsigned height, unsigned samples)
+{
+   if (fft->ms_rb_color)
+      glDeleteRenderbuffers(1, &fft->ms_rb_color);
+   fft->ms_rb_color = 0;
+   if (fft->ms_rb_ds)
+      glDeleteRenderbuffers(1, &fft->ms_rb_ds);
+   fft->ms_rb_ds    = 0;
+   if (fft->ms_fbo)
+      glDeleteFramebuffers(1, &fft->ms_fbo);
+   fft->ms_fbo      = 0;
+
+   if (samples > 1)
+   {
+      glGenRenderbuffers(1, &fft->ms_rb_color);
+      glGenRenderbuffers(1, &fft->ms_rb_ds);
+      glGenFramebuffers (1, &fft->ms_fbo);
+
+      glBindRenderbuffer(GL_RENDERBUFFER, fft->ms_rb_color);
+      glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+            GL_RGBA8, width, height);
+      glBindRenderbuffer(GL_RENDERBUFFER, fft->ms_rb_ds);
+      glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+            GL_DEPTH24_STENCIL8, width, height);
+      glBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+      glBindFramebuffer(GL_FRAMEBUFFER, fft->ms_fbo);
+      glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+            GL_RENDERBUFFER, fft->ms_rb_color);
+      glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
+            GL_RENDERBUFFER, fft->ms_rb_ds);
+      if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+         glfft_init_multisample(fft, 0, 0, 0);
+   }
+
+   glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+
+static void fft_context_destroy(glfft_t *fft)
+{
+   glfft_init_multisample(fft, 0, 0, 0);
+   if (fft->passes)
+      free(fft->passes);
+   fft->passes = NULL;
+   if (fft->sliding)
+      free(fft->sliding);
+   fft->sliding = NULL;
+}
+
+extern "C" void glfft_free(glfft_t *fft)
+{
+   if (!fft)
+      return;
+
+   fft_context_destroy(fft);
+   if (fft)
+      free(fft);
+   fft = NULL;
+}
+
+extern "C" void glfft_step_fft(glfft_t *fft,
+      const GLshort *buffer, unsigned frames)
+{
+   fft_step(fft, buffer, frames);
+}
+
+extern "C" void glfft_render(glfft_t *fft, GLuint backbuffer,
+      unsigned width, unsigned height)
+{
+   fft_render(fft, backbuffer, width, height);
+}
@@ -0,0 +1,26 @@
+#ifndef FFT_H__
+#define FFT_H__
+
+#include <glsym/glsym.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct glfft glfft_t;
+
+glfft_t *glfft_new(unsigned fft_steps, rglgen_proc_address_t proc);
+
+void glfft_free(glfft_t *fft);
+
+void glfft_init_multisample(glfft_t *fft, unsigned width, unsigned height, unsigned samples);
+
+void glfft_step_fft(glfft_t *fft, const GLshort *buffer, unsigned frames);
+void glfft_render(glfft_t *fft, GLuint backbuffer, unsigned width, unsigned height);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
@@ -0,0 +1,28 @@
+#include "shaders_common.h"
+
+static const char *fft_fragment_program_blur = GLSL_300(
+   precision mediump float;
+   precision highp int;
+   precision highp usampler2D;
+   precision highp isampler2D;
+   in vec2 vTex;
+   out vec4 FragColor;
+   uniform sampler2D sHeight;
+
+   void main() {
+      float k = 0.0;
+      float t;
+      vec4 res = vec4(0.0);
+      \n#define kernel(x, y) t = exp(-0.35 * float((x) * (x) + (y) * (y))); k += t; res += t * textureLodOffset(sHeight, vTex, 0.0, ivec2(x, y))\n
+       kernel(-1, -2);
+       kernel(-1, -1);
+       kernel(-1,  0);
+       kernel( 0, -2);
+       kernel( 0, -1);
+       kernel( 0,  0);
+       kernel( 1, -2);
+       kernel( 1, -1);
+       kernel( 1,  0);
+       FragColor = res / k;
+   }
+);
@@ -0,0 +1,33 @@
+#include "shaders_common.h"
+
+static const char *fft_fragment_program_complex = GLSL_300(
+   precision mediump float;
+   precision highp int;
+   precision highp usampler2D;
+   precision highp isampler2D;
+
+   in vec2 vTex;
+   uniform usampler2D sTexture;
+   uniform usampler2D sParameterTexture;
+   uniform int uViewportOffset;
+   out uvec2 FragColor;
+
+   vec2 compMul(vec2 a, vec2 b) { return vec2(a.x * b.x - a.y * b.y, a.x * b.y + a.y * b.x); }
+
+   void main() {
+      uvec2 params = texture(sParameterTexture, vec2(vTex.x, 0.5)).rg;
+      uvec2 coord  = uvec2((params.x >> 16u) & 0xffffu, params.x & 0xffffu);
+      int ycoord   = int(gl_FragCoord.y) - uViewportOffset;
+      vec2 twiddle = unpackHalf2x16(params.y);
+
+      uvec2 x = texelFetch(sTexture, ivec2(int(coord.x), ycoord), 0).rg;
+      uvec2 y = texelFetch(sTexture, ivec2(int(coord.y), ycoord), 0).rg;
+      vec4 a = vec4(unpackHalf2x16(x.x), unpackHalf2x16(x.y));
+      vec4 b = vec4(unpackHalf2x16(y.x), unpackHalf2x16(y.y));
+      b.xy = compMul(b.xy, twiddle);
+      b.zw = compMul(b.zw, twiddle);
+
+      vec4 res = a + b;
+      FragColor = uvec2(packHalf2x16(res.xy), packHalf2x16(res.zw));
+   }
+);
@@ -0,0 +1,40 @@
+#include "shaders_common.h"
+
+static const char *fft_fragment_program_real = GLSL_300(
+   precision mediump float;
+   precision highp int;
+   precision highp usampler2D;
+   precision highp isampler2D;
+
+   in vec2 vTex;
+   uniform isampler2D sTexture;
+   uniform usampler2D sParameterTexture;
+   uniform usampler2D sWindow;
+   uniform int uViewportOffset;
+   out uvec2 FragColor;
+
+   vec2 compMul(vec2 a, vec2 b) { return vec2(a.x * b.x - a.y * b.y, a.x * b.y + a.y * b.x); }
+
+   void main() {
+      uvec2 params = texture(sParameterTexture, vec2(vTex.x, 0.5)).rg;
+      uvec2 coord  = uvec2((params.x >> 16u) & 0xffffu, params.x & 0xffffu);
+      int ycoord   = int(gl_FragCoord.y) - uViewportOffset;
+      vec2 twiddle = unpackHalf2x16(params.y);
+
+      float window_a = float(texelFetch(sWindow, ivec2(coord.x, 0), 0).r) / float(0x10000);
+      float window_b = float(texelFetch(sWindow, ivec2(coord.y, 0), 0).r) / float(0x10000);
+
+      vec2 a = window_a * vec2(texelFetch(sTexture, ivec2(int(coord.x), ycoord), 0).rg) / vec2(0x8000);
+      vec2 a_l = vec2(a.x, 0.0);
+      vec2 a_r = vec2(a.y, 0.0);
+      vec2 b = window_b * vec2(texelFetch(sTexture, ivec2(int(coord.y), ycoord), 0).rg) / vec2(0x8000);
+      vec2 b_l = vec2(b.x, 0.0);
+      vec2 b_r = vec2(b.y, 0.0);
+      b_l = compMul(b_l, twiddle);
+      b_r = compMul(b_r, twiddle);
+
+      vec2 res_l = a_l + b_l;
+      vec2 res_r = a_r + b_r;
+      FragColor = uvec2(packHalf2x16(res_l), packHalf2x16(res_r));
+   }
+);
@@ -0,0 +1,30 @@
+#include "shaders_common.h"
+
+static const char *fft_fragment_program_resolve = GLSL_300(
+   precision mediump float;
+   precision highp int;
+   precision highp usampler2D;
+   precision highp isampler2D;
+   in vec2 vTex;
+   out vec4 FragColor;
+   uniform usampler2D sFFT;
+
+   vec4 get_heights(highp uvec2 h) {
+     vec2 l = unpackHalf2x16(h.x);
+     vec2 r = unpackHalf2x16(h.y);
+     vec2 channels[4] = vec2[4](
+        l, 0.5 * (l + r), r, 0.5 * (l - r));
+     vec4 amps;
+     for (int i = 0; i < 4; i++)
+        amps[i] = dot(channels[i], channels[i]);
+
+     return 9.0 * log(amps + 0.0001) - 22.0;
+   }
+
+   void main() {
+      uvec2 h = textureLod(sFFT, vTex, 0.0).rg;
+      vec4 height = get_heights(h);
+      height = (height + 40.0) / 80.0;
+      FragColor = height;
+   }
+);
@@ -0,0 +1,18 @@
+#include "shaders_common.h"
+
+static const char *fft_fragment_program_heightmap = GLSL_300(
+   precision mediump float;
+   out vec4 FragColor;
+   in vec3 vWorldPos;
+   in vec3 vHeight;
+
+   vec3 colormap(vec3 height) {
+      return 1.0 / (1.0 + exp(-0.08 * height));
+   }
+
+   void main() {
+      vec3 color = mix(vec3(1.0, 0.7, 0.7) * colormap(vHeight), vec3(0.1, 0.15, 0.1), clamp(vWorldPos.z / 400.0, 0.0, 1.0));
+      color = mix(color, vec3(0.1, 0.15, 0.1), clamp(1.0 - vWorldPos.z / 2.0, 0.0, 1.0));
+      FragColor = vec4(color, 1.0);
+   }
+);
@@ -0,0 +1,43 @@
+#include "shaders_common.h"
+
+static const char *fft_vertex_program_heightmap = GLSL_300(
+   layout(location = 0) in vec2 aVertex;
+   uniform sampler2D sHeight;
+   uniform mat4 uMVP;
+   uniform ivec2 uOffset;
+   uniform vec4 uHeightmapParams;
+   uniform float uAngleScale;
+   out vec3 vWorldPos;
+   out vec3 vHeight;
+
+   void main() {
+     vec2 tex_coord = vec2(aVertex.x + float(uOffset.x) + 0.5, -aVertex.y + float(uOffset.y) + 0.5) / vec2(textureSize(sHeight, 0));
+
+     vec3 world_pos = vec3(aVertex.x, 0.0, aVertex.y);
+     world_pos.xz += uHeightmapParams.xy;
+
+     float angle = world_pos.x * uAngleScale;
+     world_pos.xz *= uHeightmapParams.zw;
+
+     float lod = log2(world_pos.z + 1.0) - 6.0;
+     vec4 heights = textureLod(sHeight, tex_coord, lod);
+   
+     float cangle = cos(angle);
+     float sangle = sin(angle);
+
+     int c = int(-sign(world_pos.x) + 1.0);
+     float height = mix(heights[c], heights[1], abs(angle) / 3.141592653);
+     height = height * 80.0 - 40.0;
+
+     vec3 up = vec3(-sangle, cangle, 0.0);
+
+     float base_y = 80.0 - 80.0 * cangle;
+     float base_x = 80.0 * sangle;
+     world_pos.xy = vec2(base_x, base_y);
+     world_pos += up * height;
+
+     vWorldPos = world_pos;
+     vHeight = vec3(height, heights.yw * 80.0 - 40.0);
+     gl_Position = uMVP * vec4(world_pos, 1.0);
+   }
+);
@@ -0,0 +1,13 @@
+#include "shaders_common.h"
+
+static const char *fft_vertex_program = GLSL_300(
+   precision mediump float;
+   layout(location = 0) in vec2 aVertex;
+   layout(location = 1) in vec2 aTexCoord;
+   uniform vec4 uOffsetScale;
+   out vec2 vTex;
+   void main() {
+      vTex = uOffsetScale.xy + aTexCoord * uOffsetScale.zw;
+      gl_Position = vec4(aVertex, 0.0, 1.0);
+   }
+);
@@ -0,0 +1,14 @@
+#ifndef _SHADERS_COMMON
+#define _SHADERS_COMMON
+
+#if defined(HAVE_OPENGLES)
+#define CG(src)   "" #src
+#define GLSL(src) "precision mediump float;\n" #src
+#define GLSL_300(src)   "#version 300 es\n"   #src
+#else
+#define CG(src)   "" #src
+#define GLSL(src) "" #src
+#define GLSL_300(src)   "#version 300 es\n"   #src
+#endif
+
+#endif
@@ -1 +0,0 @@
-#include "../../libretro.h"