diff --git a/Makefile b/Makefile
index 101ac4ff14..de8378e446 100644
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,12 @@ ifeq ($(HAVE_SDL), 1)
LIBS += $(SDL_LIBS)
endif
+ifeq ($(HAVE_SDL2), 1)
+ OBJ += gfx/sdl2_gfx.o
+ DEFINES += $(SDL2_CFLAGS) $(BSD_LOCAL_INC)
+ LIBS += $(SDL2_LIBS)
+endif
+
ifeq ($(HAVE_OMAP), 1)
OBJ += gfx/omap_gfx.o
endif
diff --git a/driver.c b/driver.c
index db92897428..d3d5ec2f4e 100644
--- a/driver.c
+++ b/driver.c
@@ -121,6 +121,9 @@ static const video_driver_t *video_drivers[] = {
#ifdef HAVE_SDL
&video_sdl,
#endif
+#ifdef HAVE_SDL2
+ &video_sdl2,
+#endif
#ifdef HAVE_XVIDEO
&video_xvideo,
#endif
diff --git a/driver.h b/driver.h
index fab6852719..7141d98365 100644
--- a/driver.h
+++ b/driver.h
@@ -620,6 +620,7 @@ extern const video_driver_t video_xenon360;
extern const video_driver_t video_xvideo;
extern const video_driver_t video_xdk_d3d;
extern const video_driver_t video_sdl;
+extern const video_driver_t video_sdl2;
extern const video_driver_t video_vg;
extern const video_driver_t video_null;
extern const video_driver_t video_omap;
diff --git a/gfx/sdl2_gfx.c b/gfx/sdl2_gfx.c
new file mode 100644
index 0000000000..b339bbbb1d
--- /dev/null
+++ b/gfx/sdl2_gfx.c
@@ -0,0 +1,726 @@
+/* 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 .
+ */
+
+#include "SDL.h"
+#include "SDL_syswm.h"
+#include "../driver.h"
+#include
+#include
+#include "../general.h"
+#include "scaler/scaler.h"
+#include "gfx_common.h"
+#include "gfx_context.h"
+#include "fonts/fonts.h"
+
+#ifdef HAVE_X11
+#include "context/x11_common.h"
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "SDL2/SDL_syswm.h"
+
+typedef struct sdl2_tex
+{
+ SDL_Texture *tex;
+
+ int w;
+ int h;
+ int pitch;
+ bool active;
+ bool rgb32;
+} sdl2_tex_t;
+
+typedef struct sdl_video
+{
+ SDL_Renderer *renderer;
+
+ sdl2_tex_t frame;
+ sdl2_tex_t menu;
+ sdl2_tex_t font;
+ SDL_Window *window;
+
+ bool gl;
+ bool quitting;
+
+ void *font_data;
+ const font_renderer_driver_t *font_driver;
+ uint8_t font_r;
+ uint8_t font_g;
+ uint8_t font_b;
+
+ struct rarch_viewport vp;
+
+ video_info_t video;
+
+ bool should_resize;
+ double rotation;
+
+} sdl2_video_t;
+
+static void sdl2_gfx_free(void *data);
+
+static inline void sdl_tex_zero(sdl2_tex_t *t)
+{
+ if (t->tex)
+ {
+ SDL_DestroyTexture(t->tex);
+ }
+
+ t->tex = NULL;
+ t->w = t->h = t->pitch = 0;
+}
+
+static void sdl2_init_font(sdl2_video_t *vid, const char *font_path,
+ unsigned font_size)
+{
+ if (!g_settings.video.font_enable)
+ return;
+
+ if (font_renderer_create_default(&vid->font_driver, &vid->font_data,
+ *font_path ? font_path : NULL, font_size))
+ {
+ int r = g_settings.video.msg_color_r * 255;
+ int g = g_settings.video.msg_color_g * 255;
+ int b = g_settings.video.msg_color_b * 255;
+
+ r = r < 0 ? 0 : (r > 255 ? 255 : r);
+ g = g < 0 ? 0 : (g > 255 ? 255 : g);
+ b = b < 0 ? 0 : (b > 255 ? 255 : b);
+
+ vid->font_r = r;
+ vid->font_g = g;
+ vid->font_b = b;
+ }
+ else
+ {
+ RARCH_WARN("[SDL]: Could not initialize fonts.\n");
+ return;
+ }
+
+ const struct font_atlas *atlas = vid->font_driver->get_atlas(vid->font_data);
+
+ SDL_Surface *tmp = SDL_CreateRGBSurfaceFrom(atlas->buffer, atlas->width,
+ atlas->height, 8, atlas->width,
+ 0, 0, 0, 0);
+ SDL_Color colors[256];
+ int i;
+
+ for (i = 0; i < 256; ++i)
+ {
+ colors[i].r = colors[i].g = colors[i].b = i;
+ colors[i].a = 255;
+ }
+
+ SDL_Palette *pal = SDL_AllocPalette(256);
+ SDL_SetPaletteColors(pal, colors, 0, 256);
+ SDL_SetSurfacePalette(tmp, pal);
+ SDL_SetColorKey(tmp, SDL_TRUE, 0);
+
+ vid->font.tex = SDL_CreateTextureFromSurface(vid->renderer, tmp);
+
+ if (vid->font.tex)
+ {
+ vid->font.w = atlas->width;
+ vid->font.h = atlas->height;
+ vid->font.active = true;
+
+ SDL_SetTextureBlendMode(vid->font.tex, SDL_BLENDMODE_ADD);
+ }
+ else
+ RARCH_WARN("[SDL]: Failed to initialize font texture: %s\n", SDL_GetError());
+
+ SDL_FreePalette(pal);
+ SDL_FreeSurface(tmp);
+}
+
+static void sdl2_render_msg(sdl2_video_t *vid, const char *msg)
+{
+ unsigned width = vid->vp.width;
+ unsigned height = vid->vp.height;
+
+ int x, y, delta_x, delta_y;
+
+ if (!vid->font_data)
+ return;
+
+ x = g_settings.video.msg_pos_x * width;
+ y = (1.0f - g_settings.video.msg_pos_y) * height;
+ delta_x = 0;
+ delta_y = 0;
+
+ SDL_SetTextureColorMod(vid->font.tex, vid->font_r, vid->font_g, vid->font_b);
+
+ for (; *msg; msg++)
+ {
+ const struct font_glyph *gly = vid->font_driver->get_glyph(vid->font_data, (uint8_t)*msg);
+
+ if (!gly)
+ gly = vid->font_driver->get_glyph(vid->font_data, '?');
+
+ if (!gly)
+ continue;
+
+ int off_x = gly->draw_offset_x;
+ int off_y = gly->draw_offset_y;
+ int tex_x = gly->atlas_offset_x;
+ int tex_y = gly->atlas_offset_y;
+
+ SDL_Rect srcrect = {
+ tex_x, tex_y,
+ gly->width, gly->height
+ };
+
+ SDL_Rect dstrect = {
+ x + delta_x + off_x, y + delta_y + off_y,
+ gly->width, gly->height
+ };
+
+ SDL_RenderCopyEx(vid->renderer, vid->font.tex, &srcrect, &dstrect, 0, NULL, SDL_FLIP_NONE);
+
+ delta_x += gly->advance_x;
+ delta_y -= gly->advance_y;
+ }
+}
+
+static void sdl2_gfx_set_handles(sdl2_video_t *vid)
+{
+ // SysWMinfo headers are broken on OSX. :(
+#if defined(_WIN32)
+ SDL_SysWMinfo info;
+ SDL_VERSION(&info.version);
+
+ if (SDL_GetWindowWMInfo(vid->window, &info) == 1)
+ {
+ driver.display_type = RARCH_DISPLAY_WIN32;
+ driver.video_display = 0;
+ driver.video_window = (uintptr_t)info.window;
+ }
+#elif defined(HAVE_X11)
+ SDL_SysWMinfo info;
+ SDL_VERSION(&info.version);
+
+ if (SDL_GetWindowWMInfo(vid->window, &info) == 1)
+ {
+ driver.display_type = RARCH_DISPLAY_X11;
+ driver.video_display = (uintptr_t)info.info.x11.display;
+ driver.video_window = (uintptr_t)info.info.x11.window;
+ }
+#endif
+}
+
+static void sdl2_init_renderer(sdl2_video_t *vid)
+{
+ unsigned flags = SDL_RENDERER_ACCELERATED;
+
+ if (vid->video.vsync)
+ flags |= SDL_RENDERER_PRESENTVSYNC;
+
+ SDL_ClearHints();
+ SDL_SetHintWithPriority(SDL_HINT_RENDER_VSYNC,
+ vid->video.vsync ? "1" : "0", SDL_HINT_OVERRIDE);
+ vid->renderer = SDL_CreateRenderer(vid->window, -1, flags);
+
+ if (!vid->renderer)
+ {
+ RARCH_ERR("[SDL]: Failed to initialize renderer: %s", SDL_GetError());
+ return;
+ }
+
+ SDL_SetRenderDrawColor(vid->renderer, 0, 0, 0, 255);
+}
+
+static void sdl_refresh_renderer(sdl2_video_t *vid)
+{
+ SDL_RenderClear(vid->renderer);
+ SDL_Rect r = { vid->vp.x, vid->vp.y, vid->vp.width, vid->vp.height };
+ SDL_RenderSetViewport(vid->renderer, &r);
+
+ // breaks int scaling
+ // SDL_RenderSetLogicalSize(vid->renderer, vid->vp.width, vid->vp.height);
+}
+
+static void sdl_refresh_viewport(sdl2_video_t *vid)
+{
+ int win_w, win_h;
+
+ SDL_GetWindowSize(vid->window, &win_w, &win_h);
+
+ vid->vp.x = 0;
+ vid->vp.y = 0;
+ vid->vp.width = win_w;
+ vid->vp.height = win_h;
+ vid->vp.full_width = win_w;
+ vid->vp.full_height = win_h;
+
+ if (g_settings.video.scale_integer)
+ gfx_scale_integer(&vid->vp, win_w, win_h, g_extern.system.aspect_ratio,
+ vid->video.force_aspect);
+ else if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
+ {
+ const struct rarch_viewport *custom = &g_extern.console.screen.viewports.custom_vp;
+
+ vid->vp.x = custom->x;
+ vid->vp.y = custom->y;
+ vid->vp.width = custom->width;
+ vid->vp.height = custom->height;
+ }
+ else if (vid->video.force_aspect)
+ {
+ float delta;
+ float device_aspect = (float)win_w / win_h;
+ float desired_aspect = g_extern.system.aspect_ratio;
+
+ if (fabsf(device_aspect - desired_aspect) < 0.0001f)
+ {
+ /* If the aspect ratios of screen and desired aspect ratio are
+ * sufficiently equal (floating point stuff), assume they are
+ * actually equal. */
+ }
+ else if (device_aspect > desired_aspect)
+ {
+ delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
+ vid->vp.x = (int)roundf(win_w * (0.5f - delta));
+ vid->vp.width = (unsigned)roundf(2.0f * win_w * delta);
+ }
+ else
+ {
+ delta = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
+ vid->vp.y = (int)roundf(win_h * (0.5f - delta));
+ vid->vp.height = (unsigned)roundf(2.0f * win_h * delta);
+ }
+ }
+
+ vid->should_resize = false;
+
+ sdl_refresh_renderer(vid);
+}
+
+static void sdl_refresh_input_size(sdl2_video_t *vid, bool menu, bool rgb32,
+ unsigned width, unsigned height, unsigned pitch)
+{
+ sdl2_tex_t *target = menu ? &vid->menu : &vid->frame;
+
+ if (!target->tex || target->w != width || target->h != height
+ || target->rgb32 != rgb32 || target->pitch != pitch)
+ {
+ unsigned format;
+
+ sdl_tex_zero(target);
+
+ RARCH_PERFORMANCE_INIT(sdl_create_texture);
+ RARCH_PERFORMANCE_START(sdl_create_texture);
+
+ if (menu)
+ format = rgb32 ? SDL_PIXELFORMAT_ARGB8888 : SDL_PIXELFORMAT_RGBA4444;
+ else
+ format = rgb32 ? SDL_PIXELFORMAT_ARGB8888 : SDL_PIXELFORMAT_RGB565;
+
+
+ SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY,
+ (vid->video.smooth || menu) ? "linear" : "nearest",
+ SDL_HINT_OVERRIDE);
+
+ target->tex = SDL_CreateTexture(vid->renderer, format,
+ SDL_TEXTUREACCESS_STREAMING, width, height);
+
+ RARCH_PERFORMANCE_STOP(sdl_create_texture);
+
+ if (!target->tex)
+ {
+ RARCH_ERR("Failed to create %s texture: %s\n", menu ? "menu" : "main",
+ SDL_GetError());
+ return;
+ }
+
+ if (menu)
+ SDL_SetTextureBlendMode(target->tex, SDL_BLENDMODE_BLEND);
+
+ target->w = width;
+ target->h = height;
+ target->pitch = pitch;
+ target->rgb32 = rgb32;
+ target->active = true;
+ }
+}
+
+static void *sdl2_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data)
+{
+#ifdef _WIN32
+ gfx_set_dwm();
+#endif
+
+#ifdef HAVE_X11
+ XInitThreads();
+#endif
+
+ int i;
+
+ SDL_InitSubSystem(SDL_INIT_VIDEO);
+
+ sdl2_video_t *vid = (sdl2_video_t*)calloc(1, sizeof(*vid));
+ if (!vid)
+ return NULL;
+
+// RARCH_LOG("[SDL]: supported video drivers (change with $SDL_VIDEODRIVER):\n");
+
+// for (i = 0; i < SDL_GetNumVideoDrivers(); ++i)
+// {
+// RARCH_LOG("\t%s\n", SDL_GetVideoDriver(i));
+// }
+
+ RARCH_LOG("[SDL]: Available displays:\n");
+ for(i = 0; i < SDL_GetNumVideoDisplays(); ++i)
+ {
+ SDL_DisplayMode mode;
+
+ if (SDL_GetCurrentDisplayMode(i, &mode) == 0)
+ RARCH_LOG("\tDisplay #%i mode: unknown.\n", i);
+ else
+ RARCH_LOG("\tDisplay #%i mode: %ix%i@%ihz.\n", i, mode.w, mode.h,
+ mode.refresh_rate);
+ }
+
+// void *sdl_input = NULL;
+
+ if (!video->fullscreen)
+ RARCH_LOG("[SDL]: Creating window @ %ux%u\n", video->width, video->height);
+
+ unsigned flags;
+
+ if (video->fullscreen)
+ {
+ flags = g_settings.video.windowed_fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN;
+ }
+ else
+ flags = SDL_WINDOW_RESIZABLE;
+
+ vid->window = SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+ video->width, video->height, flags);
+
+ if (!vid->window)
+ {
+ RARCH_ERR("[SDL]: Failed to init SDL window: %s\n", SDL_GetError());
+ goto error;
+ }
+
+ vid->video.smooth = g_settings.video.smooth;
+ vid->should_resize = true;
+
+ sdl_tex_zero(&vid->frame);
+ sdl_tex_zero(&vid->menu);
+
+ if (video->fullscreen)
+ SDL_ShowCursor(SDL_DISABLE);
+
+ sdl2_init_renderer(vid);
+ sdl2_init_font(vid, g_settings.video.font_path, g_settings.video.font_size);
+
+ sdl2_gfx_set_handles(vid);
+
+ if (input && input_data)
+ {
+// sdl_input = input_sdl.init();
+// if (sdl_input)
+// {
+// *input = &input_sdl;
+// *input_data = sdl_input;
+// }
+// else
+// {
+ *input = NULL;
+ *input_data = NULL;
+// }
+ }
+
+ return vid;
+
+error:
+ sdl2_gfx_free(vid);
+ return NULL;
+}
+
+static void check_window(sdl2_video_t *vid)
+{
+ SDL_Event event;
+ while (SDL_PollEvent(&event))
+ {
+ switch (event.type)
+ {
+ case SDL_QUIT:
+ vid->quitting = true;
+ break;
+
+ case SDL_WINDOWEVENT:
+ switch (event.window.event)
+ {
+ case SDL_WINDOWEVENT_RESIZED:
+ vid->should_resize = true;
+ break;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+}
+
+static bool sdl2_gfx_frame(void *data, const void *frame, unsigned width,
+ unsigned height, unsigned pitch, const char *msg)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+
+ if (vid->should_resize)
+ sdl_refresh_viewport(vid);
+
+ if (frame)
+ {
+ sdl_refresh_input_size(vid, false, vid->video.rgb32, width, height, pitch);
+
+ RARCH_PERFORMANCE_INIT(sdl_copy_frame);
+ RARCH_PERFORMANCE_START(sdl_copy_frame);
+
+ SDL_UpdateTexture(vid->frame.tex, NULL, frame, pitch);
+
+ RARCH_PERFORMANCE_STOP(sdl_copy_frame);
+ }
+
+ SDL_RenderCopyEx(vid->renderer, vid->frame.tex, NULL, NULL, vid->rotation, NULL, SDL_FLIP_NONE);
+
+#ifdef HAVE_MENU
+ if (g_extern.lifecycle_state & (1ULL << MODE_MENU) && driver.menu_ctx && driver.menu_ctx->frame)
+ driver.menu_ctx->frame();
+#endif
+
+ if (vid->menu.active)
+ SDL_RenderCopy(vid->renderer, vid->menu.tex, NULL, NULL);
+
+ if (msg)
+ sdl2_render_msg(vid, msg);
+
+ SDL_RenderPresent(vid->renderer);
+
+ char buf[128];
+ if (gfx_get_fps(buf, sizeof(buf), NULL, 0))
+ SDL_SetWindowTitle(vid->window, buf);
+
+ g_extern.frame_count++;
+
+ return true;
+}
+
+static void sdl2_gfx_set_nonblock_state(void *data, bool toggle)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+
+ vid->video.vsync = !toggle;
+ sdl_refresh_renderer(vid);
+}
+
+static bool sdl2_gfx_alive(void *data)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ check_window(vid);
+ return !vid->quitting;
+}
+
+static bool sdl2_gfx_focus(void *data)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ unsigned flags = (SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS);
+ return (SDL_GetWindowFlags(vid->window) & flags) == flags;
+}
+
+static void sdl2_gfx_free(void *data)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ if (!vid)
+ return;
+
+ SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+ if (vid->font_data)
+ vid->font_driver->free(vid->font_data);
+
+ free(vid);
+}
+
+static void sdl2_gfx_set_rotation(void *data, unsigned rotation)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ vid->rotation = 270 * rotation;
+}
+
+static void sdl2_gfx_viewport_info(void *data, struct rarch_viewport *vp)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ *vp = vid->vp;
+}
+
+static bool sdl2_gfx_read_viewport(void *data, uint8_t *buffer)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+
+ RARCH_PERFORMANCE_INIT(sdl2_gfx_read_viewport);
+ RARCH_PERFORMANCE_START(sdl2_gfx_read_viewport);
+
+ rarch_render_cached_frame();
+
+ SDL_Surface *surf = SDL_GetWindowSurface(vid->window);
+ SDL_Surface *bgr24 = SDL_ConvertSurfaceFormat(surf, SDL_PIXELFORMAT_BGR24, 0);
+
+ if (!bgr24)
+ {
+ RARCH_WARN("Failed to convert viewport data to BGR24: %s", SDL_GetError());
+ return false;
+ }
+
+ memcpy(buffer, bgr24->pixels, bgr24->h * bgr24->pitch);
+
+ RARCH_PERFORMANCE_STOP(sdl2_gfx_read_viewport);
+
+ return true;
+}
+
+void sdl2_poke_set_filtering(void *data, unsigned index, bool smooth)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ vid->video.smooth = smooth;
+
+// sdl_refresh_renderer(vid);
+
+ sdl_tex_zero(&vid->frame);
+}
+
+static void sdl2_poke_set_aspect_ratio(void *data, unsigned aspectratio_index)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+
+ switch (aspectratio_index)
+ {
+ case ASPECT_RATIO_SQUARE:
+ gfx_set_square_pixel_viewport(g_extern.system.av_info.geometry.base_width,
+ g_extern.system.av_info.geometry.base_height);
+ break;
+
+ case ASPECT_RATIO_CORE:
+ gfx_set_core_viewport();
+ break;
+
+ case ASPECT_RATIO_CONFIG:
+ gfx_set_config_viewport();
+ break;
+
+ default:
+ break;
+ }
+
+ g_extern.system.aspect_ratio = aspectratio_lut[aspectratio_index].value;
+
+ vid->video.force_aspect = true;
+ vid->should_resize = true;
+}
+
+void sdl2_poke_apply_state_changes(void *data)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ vid->should_resize = true;
+}
+
+void sdl2_poke_set_texture_frame(void *data, const void *frame, bool rgb32,
+ unsigned width, unsigned height, float alpha)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+
+ if (frame)
+ {
+ sdl_refresh_input_size(vid, true, rgb32, width, height,
+ width * (rgb32 ? 4 : 2));
+
+ RARCH_PERFORMANCE_INIT(copy_texture_frame);
+ RARCH_PERFORMANCE_START(copy_texture_frame);
+
+ SDL_UpdateTexture(vid->menu.tex, NULL, frame, vid->menu.pitch);
+
+ RARCH_PERFORMANCE_STOP(copy_texture_frame);
+ }
+}
+
+void sdl2_poke_texture_enable(void *data, bool enable, bool full_screen)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+
+ vid->menu.active = enable;
+}
+
+void sdl2_poke_set_osd_msg(void *data, const char *msg, const struct font_params *params)
+{
+ sdl2_video_t *vid = (sdl2_video_t*)data;
+ sdl2_render_msg(vid, msg);
+ fprintf(stderr, "[SDL]: OSD MSG: %s\n", msg);
+}
+
+void sdl2_show_mouse(void *data, bool state)
+{
+ (void)data;
+ SDL_ShowCursor(state);
+}
+
+static video_poke_interface_t sdl2_video_poke_interface = {
+ sdl2_poke_set_filtering,
+#ifdef HAVE_FBO
+ NULL,
+ NULL,
+#endif
+ sdl2_poke_set_aspect_ratio,
+ sdl2_poke_apply_state_changes,
+#ifdef HAVE_MENU
+ sdl2_poke_set_texture_frame,
+ sdl2_poke_texture_enable,
+#endif
+ sdl2_poke_set_osd_msg,
+ sdl2_show_mouse,
+ NULL,
+ NULL,
+};
+
+void sdl2_gfx_poke_interface(void *data, const video_poke_interface_t **iface)
+{
+ (void)data;
+ *iface = &sdl2_video_poke_interface;
+}
+
+const video_driver_t video_sdl2 = {
+ sdl2_gfx_init,
+ sdl2_gfx_frame,
+ sdl2_gfx_set_nonblock_state,
+ sdl2_gfx_alive,
+ sdl2_gfx_focus,
+ NULL,
+ sdl2_gfx_free,
+ "sdl2",
+
+ sdl2_gfx_set_rotation,
+ sdl2_gfx_viewport_info,
+ sdl2_gfx_read_viewport,
+#ifdef HAVE_OVERLAY
+ NULL, //void (*overlay_interface)(void *data, const video_overlay_interface_t **iface);
+#endif
+ sdl2_gfx_poke_interface
+};
+
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 4de145f5d3..1680d94d90 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -160,6 +160,18 @@ check_lib COREAUDIO "-framework AudioUnit" AudioUnitInitialize
check_pkgconf SDL sdl 1.2.10
+if [ "$HAVE_SDL2" == 'yes' ]; then
+ check_pkgconf SDL2 sdl2 2.0.0
+
+ if [ "$HAVE_SDL2" == 'yes' ] && [ "$HAVE_SDL" == 'yes' ]; then
+ echo "SDL drivers will be replaced by SDL2 ones."
+ HAVE_SDL=no
+ elif [ "$HAVE_SDL2" == 'no' ]; then
+ echo "SDL2 not found, skipping."
+ HAVE_SDL2=no
+ fi
+fi
+
if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_GLES" != 'yes' ]; then
if [ "$OS" = 'Darwin' ]; then
check_lib CG "-framework Cg" cgCreateContext
@@ -278,6 +290,6 @@ add_define_make OS "$OS"
# Creates config.mk and config.h.
add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
-VARS="RGUI LAKKA ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL LIMA OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT"
+VARS="RGUI LAKKA ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 OPENGL LIMA OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT"
create_config_make config.mk $VARS
create_config_header config.h $VARS
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 06000ee69b..57915b8cd8 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -2,6 +2,7 @@ HAVE_RGUI=yes # Disable RGUI
HAVE_LAKKA=no # Enable Lakka menu
HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library
HAVE_SDL=auto # SDL support
+HAVE_SDL2=no # SDL2 support (disables SDL 1.x)
HAVE_UDEV=auto # Udev/Evdev gamepad support
HAVE_LIBRETRO= # libretro library used
HAVE_MAN_DIR= # Manpage install directory