mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #906 from heuripedes/sdl-improvements

Browse Source 
SDL/SDL2 gfx clean ups
This commit is contained in:
Twinaphex 2014-08-28 19:13:59 +02:00
commit 450769fc75
2 changed files with 55 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/sdl2_gfx.c
View File

@ -198,25 +198,21 @@ static void sdl2_render_msg(sdl2_video_t *vid, const char *msg)
static void sdl2_gfx_set_handles(sdl2_video_t *vid) static void sdl2_gfx_set_handles(sdl2_video_t *vid)
{ {
// SysWMinfo headers are broken on OSX. :( // SysWMinfo headers are broken on OSX. :(
#if defined(_WIN32) #if defined(_WIN32) || defined(HAVE_X11)
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);
if (SDL_GetWindowWMInfo(vid->window, &info) == 1) if (SDL_GetWindowWMInfo(vid->window, &info) == 1)
{ {
#if defined(_WIN32)
driver.display_type = RARCH_DISPLAY_WIN32; driver.display_type = RARCH_DISPLAY_WIN32;
driver.video_display = 0; driver.video_display = 0;
driver.video_window = (uintptr_t)info.info.win.window; driver.video_window = (uintptr_t)info.info.win.window;
}
#elif defined(HAVE_X11) #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.display_type = RARCH_DISPLAY_X11;
driver.video_display = (uintptr_t)info.info.x11.display; driver.video_display = (uintptr_t)info.info.x11.display;
driver.video_window = (uintptr_t)info.info.x11.window; driver.video_window = (uintptr_t)info.info.x11.window;
#endif
} }
#endif #endif
} }
@ -379,11 +375,12 @@ static void *sdl2_gfx_init(const video_info_t *video, const input_driver_t **inp
if (!vid) if (!vid)
return NULL; return NULL;
RARCH_LOG("[SDL]: supported video drivers (change with $SDL_VIDEODRIVER):\n"); RARCH_LOG("[SDL]: Available renderers (change with $SDL_RENDER_DRIVER):\n");
for (i = 0; i < SDL_GetNumRenderDrivers(); ++i)
for (i = 0; i < SDL_GetNumVideoDrivers(); ++i)
{ {
RARCH_LOG("\t%s\n", SDL_GetVideoDriver(i)); SDL_RendererInfo renderer;
if (SDL_GetRenderDriverInfo(i, &renderer) == 0)
RARCH_LOG("\t%s\n", renderer.name);
} }
RARCH_LOG("[SDL]: Available displays:\n"); RARCH_LOG("[SDL]: Available displays:\n");

102
gfx/sdl_gfx.c
View File

@ -31,7 +31,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "SDL/SDL_syswm.h" #include "SDL_syswm.h"
typedef struct sdl_menu_frame typedef struct sdl_menu_frame
{ {
@ -53,8 +53,6 @@ typedef struct sdl_video
uint8_t font_b; uint8_t font_b;
struct scaler_ctx scaler; struct scaler_ctx scaler;
unsigned last_width;
unsigned last_height;
sdl_menu_frame_t menu; sdl_menu_frame_t menu;
} sdl_video_t; } sdl_video_t;
@ -74,10 +72,35 @@ static void sdl_gfx_free(void *data)
vid->font_driver->free(vid->font); vid->font_driver->free(vid->font);
scaler_ctx_gen_reset(&vid->scaler); scaler_ctx_gen_reset(&vid->scaler);
scaler_ctx_gen_reset(&vid->menu.scaler);
free(vid); free(vid);
} }
static void sdl_update_scaler(SDL_Surface *surf, struct scaler_ctx *scaler,
enum scaler_pix_fmt format, unsigned width,
unsigned height, unsigned pitch)
{
if (
width != scaler->in_width
|| height != scaler->in_height
|| format != scaler->in_fmt
|| pitch != scaler->in_stride
)
{
scaler->in_fmt = format;
scaler->in_width = width;
scaler->in_height = height;
scaler->in_stride = pitch;
scaler->out_width = surf->w;
scaler->out_height = surf->h;
scaler->out_stride = surf->pitch;
scaler_ctx_gen_filter(scaler);
}
}
static void sdl_init_font(sdl_video_t *vid, const char *font_path, unsigned font_size) static void sdl_init_font(sdl_video_t *vid, const char *font_path, unsigned font_size)
{ {
if (!g_settings.video.font_enable) if (!g_settings.video.font_enable)
@ -100,7 +123,7 @@ static void sdl_init_font(sdl_video_t *vid, const char *font_path, unsigned font
vid->font_b = b; vid->font_b = b;
} }
else else
RARCH_LOG("Could not initialize fonts.\n"); RARCH_LOG("[SDL]: Could not initialize fonts.\n");
} }
static void sdl_render_msg(sdl_video_t *vid, SDL_Surface *buffer, static void sdl_render_msg(sdl_video_t *vid, SDL_Surface *buffer,
@ -187,25 +210,21 @@ static void sdl_render_msg(sdl_video_t *vid, SDL_Surface *buffer,
static void sdl_gfx_set_handles(void) static void sdl_gfx_set_handles(void)
{ {
// SysWMinfo headers are broken on OSX. :( // SysWMinfo headers are broken on OSX. :(
#if defined(_WIN32) #if defined(_WIN32) || defined(HAVE_X11)
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);
if (SDL_GetWMInfo(&info) == 1) if (SDL_GetWMInfo(&info) == 1)
{ {
#if defined(_WIN32)
driver.display_type = RARCH_DISPLAY_WIN32; driver.display_type = RARCH_DISPLAY_WIN32;
driver.video_display = 0; driver.video_display = 0;
driver.video_window = (uintptr_t)info.window; driver.video_window = (uintptr_t)info.window;
}
#elif defined(HAVE_X11) #elif defined(HAVE_X11)
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
if (SDL_GetWMInfo(&info) == 1)
{
driver.display_type = RARCH_DISPLAY_X11; driver.display_type = RARCH_DISPLAY_X11;
driver.video_display = (uintptr_t)info.info.x11.display; driver.video_display = (uintptr_t)info.info.x11.display;
driver.video_window = (uintptr_t)info.info.x11.window; driver.video_window = (uintptr_t)info.info.x11.window;
#endif
} }
#endif #endif
} }
@ -220,8 +239,11 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
XInitThreads(); XInitThreads();
#endif #endif
if (SDL_WasInit(0) == 0 && SDL_Init(SDL_INIT_VIDEO) < 0) if (SDL_WasInit(0) == 0)
return NULL; {
if (SDL_Init(SDL_INIT_VIDEO) < 0)
return NULL;
}
else if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) else if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
return NULL; return NULL;
@ -233,12 +255,10 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
rarch_assert(video_info); rarch_assert(video_info);
unsigned full_x = video_info->current_w; unsigned full_x = video_info->current_w;
unsigned full_y = video_info->current_h; unsigned full_y = video_info->current_h;
RARCH_LOG("Detecting desktop resolution %ux%u.\n", full_x, full_y); RARCH_LOG("[SDL]: Detecting desktop resolution %ux%u.\n", full_x, full_y);
void *sdl_input = NULL;
if (!video->fullscreen) if (!video->fullscreen)
RARCH_LOG("Creating window @ %ux%u\n", video->width, video->height); RARCH_LOG("[SDL]: Creating window @ %ux%u\n", video->width, video->height);
vid->screen = SDL_SetVideoMode(video->width, video->height, 32, vid->screen = SDL_SetVideoMode(video->width, video->height, 32,
SDL_HWSURFACE | SDL_HWACCEL | SDL_DOUBLEBUF | (video->fullscreen ? SDL_FULLSCREEN : 0)); SDL_HWSURFACE | SDL_HWACCEL | SDL_DOUBLEBUF | (video->fullscreen ? SDL_FULLSCREEN : 0));
@ -248,7 +268,7 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
if (!vid->screen) if (!vid->screen)
{ {
RARCH_ERR("Failed to init SDL surface: %s\n", SDL_GetError()); RARCH_ERR("[SDL]: Failed to init SDL surface: %s\n", SDL_GetError());
goto error; goto error;
} }
@ -259,7 +279,7 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
if (input && input_data) if (input && input_data)
{ {
sdl_input = input_sdl.init(); void *sdl_input = input_sdl.init();
if (sdl_input) if (sdl_input)
{ {
*input = &input_sdl; *input = &input_sdl;
@ -285,7 +305,7 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
if (!vid->menu.frame) if (!vid->menu.frame)
{ {
RARCH_ERR("Failed to init menu surface: %s\n", SDL_GetError()); RARCH_ERR("[SDL]: Failed to init menu surface: %s\n", SDL_GetError());
goto error; goto error;
} }
@ -311,28 +331,15 @@ static void check_window(sdl_video_t *vid)
} }
} }
static bool sdl_gfx_frame(void *data, const void *frame, unsigned width, unsigned height, unsigned pitch, const char *msg) static bool sdl_gfx_frame(void *data, const void *frame, unsigned width,
unsigned height, unsigned pitch, const char *msg)
{ {
if (!frame) if (!frame)
return true; return true;
sdl_video_t *vid = (sdl_video_t*)data; sdl_video_t *vid = (sdl_video_t*)data;
vid->scaler.in_stride = pitch; sdl_update_scaler(vid->screen, &vid->scaler, vid->scaler.in_fmt, width, height, pitch);
if (width != vid->last_width || height != vid->last_height)
{
vid->scaler.in_width = width;
vid->scaler.in_height = height;
vid->scaler.out_width = vid->screen->w;
vid->scaler.out_height = vid->screen->h;
vid->scaler.out_stride = vid->screen->pitch;
scaler_ctx_gen_filter(&vid->scaler);
vid->last_width = width;
vid->last_height = height;
}
if (SDL_MUSTLOCK(vid->screen)) if (SDL_MUSTLOCK(vid->screen))
SDL_LockSurface(vid->screen); SDL_LockSurface(vid->screen);
@ -401,7 +408,8 @@ static void sdl_set_aspect_ratio(void *data, unsigned aspectratio_index)
switch (aspectratio_index) switch (aspectratio_index)
{ {
case ASPECT_RATIO_SQUARE: 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); gfx_set_square_pixel_viewport(g_extern.system.av_info.geometry.base_width,
g_extern.system.av_info.geometry.base_height);
break; break;
case ASPECT_RATIO_CORE: case ASPECT_RATIO_CORE:
@ -432,24 +440,8 @@ static void sdl_set_texture_frame(void *data, const void *frame, bool rgb32,
enum scaler_pix_fmt format = rgb32 ? SCALER_FMT_ARGB8888 : SCALER_FMT_RGBA4444; enum scaler_pix_fmt format = rgb32 ? SCALER_FMT_ARGB8888 : SCALER_FMT_RGBA4444;
vid->menu.scaler.in_stride = width * (rgb32 ? sizeof(uint32_t) : sizeof(uint16_t)); sdl_update_scaler(vid->menu.frame, &vid->menu.scaler, format, width, height,
width * (rgb32 ? sizeof(uint32_t) : sizeof(uint16_t)));
if (
width != vid->menu.scaler.in_width
|| height != vid->menu.scaler.in_height
|| format != vid->menu.scaler.in_fmt
)
{
vid->menu.scaler.in_fmt = format;
vid->menu.scaler.in_width = width;
vid->menu.scaler.in_height = height;
vid->menu.scaler.out_width = vid->screen->w;
vid->menu.scaler.out_height = vid->screen->h;
vid->menu.scaler.out_stride = vid->screen->pitch;
scaler_ctx_gen_filter(&vid->menu.scaler);
}
scaler_ctx_scale(&vid->menu.scaler, vid->menu.frame->pixels, frame); scaler_ctx_scale(&vid->menu.scaler, vid->menu.frame->pixels, frame);
SDL_SetAlpha(vid->menu.frame, SDL_SRCALPHA, 255.0 * alpha); SDL_SetAlpha(vid->menu.frame, SDL_SRCALPHA, 255.0 * alpha);