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

Revert "Change custom_command_method_t returntype to int64_t" 

This reverts commit e13efbd400.
This commit is contained in:
twinaphex 2018-11-26 18:09:57 +01:00
parent c16a3a6b88
commit bc0dbffc01
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/d3d9.c
View File

@ -1990,14 +1990,14 @@ static void d3d9_video_texture_load_d3d(
*id = (uintptr_t)tex; *id = (uintptr_t)tex;
} }
static int64_t d3d9_video_texture_load_wrap_d3d(void *data) static int d3d9_video_texture_load_wrap_d3d(void *data)
{ {
uintptr_t id = 0; uintptr_t id = 0;
struct d3d9_texture_info *info = (struct d3d9_texture_info*)data; struct d3d9_texture_info *info = (struct d3d9_texture_info*)data;
if (!info) if (!info)
return 0; return 0;
d3d9_video_texture_load_d3d(info, &id); d3d9_video_texture_load_d3d(info, &id);
return (int64_t)(uintptr_t)id; return id;
} }
static uintptr_t d3d9_load_texture(void *video_data, void *data, static uintptr_t d3d9_load_texture(void *video_data, void *data,

8
gfx/drivers/gl.c
View File

@ -2509,7 +2509,7 @@ static void video_texture_load_gl(
} }
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
static int64_t video_texture_load_wrap_gl_mipmap(void *data) static int video_texture_load_wrap_gl_mipmap(void *data)
{ {
uintptr_t id = 0; uintptr_t id = 0;
@ -2517,10 +2517,10 @@ static int64_t video_texture_load_wrap_gl_mipmap(void *data)
return 0; return 0;
video_texture_load_gl((struct texture_image*)data, video_texture_load_gl((struct texture_image*)data,
TEXTURE_FILTER_MIPMAP_LINEAR, &id); TEXTURE_FILTER_MIPMAP_LINEAR, &id);
return (int64_t)(uintptr_t)id; return (int)id;
} }
static int64_t video_texture_load_wrap_gl(void *data) static int video_texture_load_wrap_gl(void *data)
{ {
uintptr_t id = 0; uintptr_t id = 0;
@ -2528,7 +2528,7 @@ static int64_t video_texture_load_wrap_gl(void *data)
return 0; return 0;
video_texture_load_gl((struct texture_image*)data, video_texture_load_gl((struct texture_image*)data,
TEXTURE_FILTER_LINEAR, &id); TEXTURE_FILTER_LINEAR, &id);
return (int64_t)(uintptr_t)id; return (int)id;
} }
#endif #endif

2
gfx/video_thread_wrapper.h
View File

@ -27,7 +27,7 @@
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
typedef int64_t (*custom_command_method_t)(void*); typedef int (*custom_command_method_t)(void*);
typedef bool (*custom_font_command_method_t)(const void **font_driver, typedef bool (*custom_font_command_method_t)(const void **font_driver,
void **font_handle, void *video_data, const char *font_path, void **font_handle, void *video_data, const char *font_path,