ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings for non-HAVE_THREADS targets

This commit is contained in:
Twinaphex 2015-12-07 08:00:27 +01:00
parent 1e59387634
commit c1bb8f711d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/font_driver.c
View File

@ -259,13 +259,13 @@ bool font_driver_init_first(const void **font_driver, void **font_handle,
bool threading_hint, bool threading_hint,
enum font_driver_render_api api) enum font_driver_render_api api)
{ {
settings_t *settings = config_get_ptr();
const void **new_font_driver = font_driver ? font_driver const void **new_font_driver = font_driver ? font_driver
: (const void**)&font_osd_driver; : (const void**)&font_osd_driver;
void **new_font_handle = font_handle ? font_handle void **new_font_handle = font_handle ? font_handle
: (void**)&font_osd_data; : (void**)&font_osd_data;
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
settings_t *settings = config_get_ptr();
const struct retro_hw_render_callback *hw_render = const struct retro_hw_render_callback *hw_render =
(const struct retro_hw_render_callback*)video_driver_callback(); (const struct retro_hw_render_callback*)video_driver_callback();

8
gfx/video_texture_c.c
View File

@ -152,12 +152,15 @@ static unsigned video_texture_png_load(void *data,
return id; return id;
} }
#ifdef HAVE_THREADS
static int video_texture_png_load_wrap(void *data) static int video_texture_png_load_wrap(void *data)
{ {
return video_texture_png_load(data, TEXTURE_BACKEND_DEFAULT, return video_texture_png_load(data, TEXTURE_BACKEND_DEFAULT,
TEXTURE_FILTER_LINEAR); TEXTURE_FILTER_LINEAR);
} }
#endif
#ifdef HAVE_OPENGL
static int video_texture_png_load_wrap_gl_mipmap(void *data) static int video_texture_png_load_wrap_gl_mipmap(void *data)
{ {
return video_texture_png_load(data, TEXTURE_BACKEND_OPENGL, return video_texture_png_load(data, TEXTURE_BACKEND_OPENGL,
@ -169,7 +172,9 @@ static int video_texture_png_load_wrap_gl(void *data)
return video_texture_png_load(data, TEXTURE_BACKEND_OPENGL, return video_texture_png_load(data, TEXTURE_BACKEND_OPENGL,
TEXTURE_FILTER_LINEAR); TEXTURE_FILTER_LINEAR);
} }
#endif
#ifdef HAVE_D3D
static int video_texture_png_load_wrap_d3d_mipmap(void *data) static int video_texture_png_load_wrap_d3d_mipmap(void *data)
{ {
return video_texture_png_load(data, TEXTURE_BACKEND_DIRECT3D, return video_texture_png_load(data, TEXTURE_BACKEND_DIRECT3D,
@ -181,6 +186,7 @@ static int video_texture_png_load_wrap_d3d(void *data)
return video_texture_png_load(data, TEXTURE_BACKEND_DIRECT3D, return video_texture_png_load(data, TEXTURE_BACKEND_DIRECT3D,
TEXTURE_FILTER_LINEAR); TEXTURE_FILTER_LINEAR);
} }
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -190,8 +196,8 @@ unsigned video_texture_load(void *data,
enum texture_backend_type type, enum texture_backend_type type,
enum texture_filter_type filter_type) enum texture_filter_type filter_type)
{ {
settings_t *settings = config_get_ptr();
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
settings_t *settings = config_get_ptr();
const struct retro_hw_render_callback *hw_render = const struct retro_hw_render_callback *hw_render =
(const struct retro_hw_render_callback*)video_driver_callback(); (const struct retro_hw_render_callback*)video_driver_callback();