mirror of
https://github.com/libretro/RetroArch
synced 2025-03-23 19:21:03 +00:00
(PS3) Build fix and fix warnings
This commit is contained in:
parent
945d2851ba
commit
73d5e8a41b
@ -1010,7 +1010,7 @@ static void gl_frame_fbo(gl_t *gl, uint64_t frame_count,
|
|||||||
gl_set_viewport(gl, rect->img_width, rect->img_height, true, false);
|
gl_set_viewport(gl, rect->img_width, rect->img_height, true, false);
|
||||||
gl->shader->set_params(gl, prev_rect->img_width, prev_rect->img_height,
|
gl->shader->set_params(gl, prev_rect->img_width, prev_rect->img_height,
|
||||||
prev_rect->width, prev_rect->height,
|
prev_rect->width, prev_rect->height,
|
||||||
gl->vp.width, gl->vp.height, frame_count,
|
gl->vp.width, gl->vp.height, (unsigned int)frame_count,
|
||||||
tex_info, gl->prev_info, fbo_tex_info, fbo_tex_info_cnt);
|
tex_info, gl->prev_info, fbo_tex_info, fbo_tex_info_cnt);
|
||||||
|
|
||||||
gl->coords.vertices = 4;
|
gl->coords.vertices = 4;
|
||||||
@ -1057,7 +1057,7 @@ static void gl_frame_fbo(gl_t *gl, uint64_t frame_count,
|
|||||||
gl->shader->set_params(gl,
|
gl->shader->set_params(gl,
|
||||||
prev_rect->img_width, prev_rect->img_height,
|
prev_rect->img_width, prev_rect->img_height,
|
||||||
prev_rect->width, prev_rect->height,
|
prev_rect->width, prev_rect->height,
|
||||||
gl->vp.width, gl->vp.height, frame_count,
|
gl->vp.width, gl->vp.height, (unsigned int)frame_count,
|
||||||
tex_info, gl->prev_info, fbo_tex_info, fbo_tex_info_cnt);
|
tex_info, gl->prev_info, fbo_tex_info, fbo_tex_info_cnt);
|
||||||
|
|
||||||
gl->coords.vertex = gl->vertex_ptr;
|
gl->coords.vertex = gl->vertex_ptr;
|
||||||
@ -1597,7 +1597,7 @@ static bool gl_frame(void *data, const void *frame,
|
|||||||
gl->shader->set_params(gl, width, height,
|
gl->shader->set_params(gl, width, height,
|
||||||
gl->tex_w, gl->tex_h,
|
gl->tex_w, gl->tex_h,
|
||||||
gl->vp.width, gl->vp.height,
|
gl->vp.width, gl->vp.height,
|
||||||
frame_count,
|
(unsigned int)frame_count,
|
||||||
&gl->tex_info, gl->prev_info, NULL, 0);
|
&gl->tex_info, gl->prev_info, NULL, 0);
|
||||||
|
|
||||||
gl->coords.vertices = 4;
|
gl->coords.vertices = 4;
|
||||||
|
@ -242,7 +242,7 @@ bool gfx_ctx_check_window(void *data, bool *quit, bool *resize,
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
ctx->check_window(data, quit, resize, width, height,
|
ctx->check_window(data, quit, resize, width, height,
|
||||||
frame_count);
|
(unsigned int)frame_count);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -152,6 +152,7 @@ static void rmenu_render(void)
|
|||||||
menu_handle_t *menu = menu_driver_get_ptr();
|
menu_handle_t *menu = menu_driver_get_ptr();
|
||||||
global_t *global = global_get_ptr();
|
global_t *global = global_get_ptr();
|
||||||
runloop_t *runloop = rarch_main_get_ptr();
|
runloop_t *runloop = rarch_main_get_ptr();
|
||||||
|
uint64_t frame_count = video_driver_get_frame_count();
|
||||||
|
|
||||||
if (!menu)
|
if (!menu)
|
||||||
return;
|
return;
|
||||||
@ -193,7 +194,7 @@ static void rmenu_render(void)
|
|||||||
get_title(label, dir, menu_type, title, sizeof(title));
|
get_title(label, dir, menu_type, title, sizeof(title));
|
||||||
|
|
||||||
menu_animation_ticker_line(title_buf, RMENU_TERM_WIDTH,
|
menu_animation_ticker_line(title_buf, RMENU_TERM_WIDTH,
|
||||||
runloop->frames.video.count / 15, title, true);
|
frame_count / 15, title, true);
|
||||||
|
|
||||||
font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET;
|
font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET;
|
||||||
font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET
|
font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET
|
||||||
@ -238,10 +239,9 @@ static void rmenu_render(void)
|
|||||||
selected = menu_list_entry_is_currently_selected(&entry);
|
selected = menu_list_entry_is_currently_selected(&entry);
|
||||||
|
|
||||||
menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry.spacing + 1 + 2),
|
menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry.spacing + 1 + 2),
|
||||||
runloop->frames.video.count / 15, entry.path, selected);
|
frame_count / 15, entry.path, selected);
|
||||||
menu_animation_ticker_line(type_str_buf, entry.spacing,
|
menu_animation_ticker_line(type_str_buf, entry.spacing,
|
||||||
runloop->frames.video.count / 15,
|
frame_count / 15, entry.value, selected);
|
||||||
entry.value, selected);
|
|
||||||
|
|
||||||
snprintf(message, sizeof(message), "%c %s",
|
snprintf(message, sizeof(message), "%c %s",
|
||||||
selected ? '>' : ' ', entry_title_buf);
|
selected ? '>' : ' ', entry_title_buf);
|
||||||
|
@ -466,7 +466,7 @@ bool menu_animation_update(animation_t *animation, float dt)
|
|||||||
* Take the contents of @str and apply a ticker effect to it,
|
* Take the contents of @str and apply a ticker effect to it,
|
||||||
* and write the results in @buf.
|
* and write the results in @buf.
|
||||||
**/
|
**/
|
||||||
void menu_animation_ticker_line(char *buf, size_t len, unsigned idx,
|
void menu_animation_ticker_line(char *buf, size_t len, uint64_t idx,
|
||||||
const char *str, bool selected)
|
const char *str, bool selected)
|
||||||
{
|
{
|
||||||
unsigned ticker_period, phase, phase_left_stop;
|
unsigned ticker_period, phase, phase_left_stop;
|
||||||
|
@ -113,7 +113,7 @@ bool menu_animation_update(animation_t *animation, float dt);
|
|||||||
* Take the contents of @str and apply a ticker effect to it,
|
* Take the contents of @str and apply a ticker effect to it,
|
||||||
* and write the results in @buf.
|
* and write the results in @buf.
|
||||||
**/
|
**/
|
||||||
void menu_animation_ticker_line(char *buf, size_t len, unsigned tick,
|
void menu_animation_ticker_line(char *buf, size_t len, uint64_t tick,
|
||||||
const char *str, bool selected);
|
const char *str, bool selected);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -283,8 +283,8 @@ static int deferred_push_system_information(void *data, void *userdata,
|
|||||||
|
|
||||||
{
|
{
|
||||||
char tmp[PATH_MAX_LENGTH];
|
char tmp[PATH_MAX_LENGTH];
|
||||||
const char *tmp_string;
|
|
||||||
char tmp2[PATH_MAX_LENGTH];
|
char tmp2[PATH_MAX_LENGTH];
|
||||||
|
const char *tmp_string = NULL;
|
||||||
const frontend_ctx_driver_t *frontend = frontend_get_ptr();
|
const frontend_ctx_driver_t *frontend = frontend_get_ptr();
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "Build date: %s", __DATE__);
|
snprintf(tmp, sizeof(tmp), "Build date: %s", __DATE__);
|
||||||
|
@ -196,7 +196,7 @@ void menu_navigation_ascend_alphabet(menu_navigation_t *nav, size_t *ptr_out)
|
|||||||
menu_driver_navigation_ascend_alphabet(ptr_out);
|
menu_driver_navigation_ascend_alphabet(ptr_out);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t menu_navigation_get_current_selection(void)
|
ssize_t menu_navigation_get_current_selection(void)
|
||||||
{
|
{
|
||||||
menu_navigation_t *nav = menu_navigation_get_ptr();
|
menu_navigation_t *nav = menu_navigation_get_ptr();
|
||||||
if (!nav)
|
if (!nav)
|
||||||
|
@ -87,7 +87,7 @@ void menu_navigation_descend_alphabet(menu_navigation_t *nav, size_t *ptr_out);
|
|||||||
**/
|
**/
|
||||||
void menu_navigation_ascend_alphabet(menu_navigation_t *nav, size_t *ptr_out);
|
void menu_navigation_ascend_alphabet(menu_navigation_t *nav, size_t *ptr_out);
|
||||||
|
|
||||||
size_t menu_navigation_get_current_selection(void);
|
ssize_t menu_navigation_get_current_selection(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user