diff --git a/audio/audio_driver.c b/audio/audio_driver.c index f9a3c94568..f6ec0f0716 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -1506,7 +1506,6 @@ static void audio_driver_sink_window(audio_driver_state_t *audio_st, if (kept) { - audio_st->sink_discarded = 0; if (audio_st->sink_settled < 2) audio_st->sink_settled++; /* The windows left out since the last kept one come in with @@ -1540,7 +1539,6 @@ static void audio_driver_sink_window(audio_driver_state_t *audio_st, } else { - audio_st->sink_discarded++; /* Before the sums stand, a left-out window restarts them: a slow * start is not to be in them. After, it is just left out. */ if (audio_st->sink_settled < 2) @@ -1729,7 +1727,6 @@ static void audio_driver_sink_update(audio_driver_state_t *audio_st, audio_st->sink_window_at = now_usec + AUDIO_SINK_WINDOW_USEC; audio_st->sink_apply_at = now_usec + AUDIO_SINK_BASELINE_USEC; audio_st->sink_settled = 0; - audio_st->sink_discarded = 0; memset(&audio_st->sink_kept, 0, sizeof(audio_st->sink_kept)); memset(&audio_st->sink_pending, 0, sizeof(audio_st->sink_pending)); audio_st->sink_pending_broken = false; diff --git a/audio/audio_driver.h b/audio/audio_driver.h index 185511b9d2..af8c05004d 100644 --- a/audio/audio_driver.h +++ b/audio/audio_driver.h @@ -786,7 +786,6 @@ typedef struct bool sink_pending_broken; /* a dry spell is in it: shown, never merged into the kept sums */ unsigned sink_settled; /* kept windows in a row, up to 2, after which the sums stand */ unsigned sink_applied; /* times the bias has been set */ - unsigned sink_discarded; /* windows left out in a row */ /* AUDIO_SINK_WARNED_* said once each, in two words because the two * sides run on different threads: on the threaded pipeline the * estimator runs on the core's thread, from submit, and the flush diff --git a/cheat_manager.c b/cheat_manager.c index 58eab769eb..e28b38ed78 100644 --- a/cheat_manager.c +++ b/cheat_manager.c @@ -411,7 +411,6 @@ static void cheat_manager_free(void) cheat_st->num_memory_buffers = 0; cheat_st->total_memory_size = 0; cheat_st->memory_initialized = false; - cheat_st->memory_search_initialized = false; } static void cheat_manager_new(unsigned size) @@ -1067,8 +1066,6 @@ int cheat_manager_initialize_memory(rarch_setting_t *setting, size_t idx, bool w runloop_msg_queue_push(msg, _len, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); } - - cheat_st->memory_search_initialized = true; } cheat_st->memory_initialized = true; diff --git a/cheat_manager.h b/cheat_manager.h index b5afd0a932..c6ce2e3b24 100644 --- a/cheat_manager.h +++ b/cheat_manager.h @@ -189,7 +189,6 @@ struct cheat_manager char *working_code; bool big_endian; bool memory_initialized; - bool memory_search_initialized; }; typedef struct cheat_manager cheat_manager_t; diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c index d88b698a57..21cb9e4a17 100644 --- a/gfx/common/d3d9_common.c +++ b/gfx/common/d3d9_common.c @@ -226,13 +226,10 @@ static void d3d9_get_video_size(d3d9_video_t *d3d, *width = video_mode.dwDisplayWidth; *height = video_mode.dwDisplayHeight; - d3d->resolution_hd_enable = false; - if (video_mode.fIsHiDef) { *width = 1280; *height = 720; - d3d->resolution_hd_enable = true; } else { diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h index b89cf30baf..cd1e97123e 100644 --- a/gfx/common/d3d9_common.h +++ b/gfx/common/d3d9_common.h @@ -89,9 +89,6 @@ typedef struct d3d9_video bool quitting; bool needs_restore; bool overlays_enabled; - /* TODO - refactor this away properly. */ - bool resolution_hd_enable; - /* Only used for Xbox */ bool widescreen_mode; diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index 6754853be7..45d407a321 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -150,9 +150,6 @@ typedef struct d3d8_video bool quitting; bool needs_restore; bool overlays_enabled; - /* TODO - refactor this away properly. */ - bool resolution_hd_enable; - /* Only used for Xbox */ bool widescreen_mode; @@ -1997,21 +1994,18 @@ static void d3d8_get_video_size(d3d8_video_t *d3d, *width = 640; *height = 480; d3d->widescreen_mode = false; - d3d->resolution_hd_enable = true; } else if (video_mode & XC_VIDEO_FLAGS_HDTV_720p) { *width = 1280; *height = 720; d3d->widescreen_mode = true; - d3d->resolution_hd_enable = true; } else if (video_mode & XC_VIDEO_FLAGS_HDTV_1080i) { *width = 1920; *height = 1080; d3d->widescreen_mode = true; - d3d->resolution_hd_enable = true; } } } diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h index 470163fb14..1af89cfc25 100644 --- a/gfx/gfx_display.h +++ b/gfx/gfx_display.h @@ -167,7 +167,6 @@ struct gfx_display_ctx_draw float y; float rotation; float scale_factor; - bool pipeline_active; }; typedef struct gfx_display_ctx_coord_draw diff --git a/gfx/gfx_thumbnail.c b/gfx/gfx_thumbnail.c index b9216e9e9a..f82786cc77 100644 --- a/gfx/gfx_thumbnail.c +++ b/gfx/gfx_thumbnail.c @@ -2907,7 +2907,6 @@ void gfx_thumbnail_path_reset(gfx_thumbnail_path_data_t *path_data) path_data->system_len = 0; path_data->system[0] = '\0'; path_data->content_path[0] = '\0'; - path_data->content_label_len = 0; path_data->content_label[0] = '\0'; path_data->content_core_name[0] = '\0'; path_data->content_db_name[0] = '\0'; @@ -3096,7 +3095,6 @@ bool gfx_thumbnail_set_content(gfx_thumbnail_path_data_t *path_data, const char /* 'Reset' path_data content strings */ path_data->content_path[0] = '\0'; - path_data->content_label_len = 0; path_data->content_label[0] = '\0'; path_data->content_core_name[0] = '\0'; path_data->content_db_name[0] = '\0'; @@ -3113,7 +3111,7 @@ bool gfx_thumbnail_set_content(gfx_thumbnail_path_data_t *path_data, const char return false; /* Cache content label */ - path_data->content_label_len = strlcpy(path_data->content_label, + strlcpy(path_data->content_label, label, sizeof(path_data->content_label)); /* Determine content image name */ @@ -3148,7 +3146,6 @@ bool gfx_thumbnail_set_content_image( /* 'Reset' path_data content strings */ path_data->content_path[0] = '\0'; - path_data->content_label_len = 0; path_data->content_label[0] = '\0'; path_data->content_core_name[0] = '\0'; path_data->content_db_name[0] = '\0'; @@ -3176,7 +3173,7 @@ bool gfx_thumbnail_set_content_image( strlcpy(path_data->content_img, img_name, sizeof(path_data->content_img)); - path_data->content_label_len = fill_pathname( + fill_pathname( path_data->content_label, path_data->content_img, "", sizeof(path_data->content_label)); @@ -3226,7 +3223,6 @@ bool gfx_thumbnail_set_content_playlist( /* 'Reset' path_data content strings */ path_data->content_path[0] = '\0'; - path_data->content_label_len = 0; path_data->content_label[0] = '\0'; path_data->content_core_name[0] = '\0'; path_data->content_db_name[0] = '\0'; @@ -3273,10 +3269,10 @@ bool gfx_thumbnail_set_content_playlist( /* Get content label */ if (content_label && *content_label) - path_data->content_label_len = strlcpy(path_data->content_label, + strlcpy(path_data->content_label, content_label, sizeof(path_data->content_label)); else - path_data->content_label_len = fill_pathname(path_data->content_label, + fill_pathname(path_data->content_label, path_basename(content_path), "", sizeof(path_data->content_label)); diff --git a/gfx/gfx_thumbnail.h b/gfx/gfx_thumbnail.h index aa8ba5dc6f..50ce7ec464 100644 --- a/gfx/gfx_thumbnail.h +++ b/gfx/gfx_thumbnail.h @@ -67,7 +67,6 @@ struct gfx_thumbnail_path_data enum playlist_thumbnail_mode playlist_icon_mode; size_t playlist_index; size_t system_len; - size_t content_label_len; char content_label[NAME_MAX_LENGTH]; char content_core_name[NAME_MAX_LENGTH]; char system[NAME_MAX_LENGTH]; diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index 6d20b10326..adbb9beddc 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -62,11 +62,6 @@ static void gfx_widgets_update_icon_layout(dispgfx_widget_t *p_dispwidget) { bool has_icons = !!(p_dispwidget->flags & DISPGFX_WIDGET_FLAG_MSG_QUEUE_HAS_ICONS); - if (has_icons) - p_dispwidget->msg_queue_regular_padding_x = p_dispwidget->simple_widget_padding / 2; - else - p_dispwidget->msg_queue_regular_padding_x = p_dispwidget->simple_widget_padding; - if (has_icons) { p_dispwidget->msg_queue_icon_size_y = p_dispwidget->msg_queue_height; @@ -428,7 +423,6 @@ static void gfx_widgets_msg_queue_push_state( msg_widget->expiration_timer = 0; msg_widget->task_ptr = task; - msg_widget->task_count = 0; msg_widget->task_progress = 0; msg_widget->task_ident = 0; @@ -471,7 +465,6 @@ static void gfx_widgets_msg_queue_push_state( msg_widget->flags |= DISPWIDG_FLAG_TASK_FINISHED; msg_widget->task_progress = task->progress; msg_widget->task_ident = task->ident; - msg_widget->task_count = 1; if (task->style == TASK_STYLE_POSITIVE) msg_widget->flags |= DISPWIDG_FLAG_POSITIVE; @@ -610,8 +603,6 @@ static void gfx_widgets_msg_queue_push_state( else msg_widget_msg_transition_animation_done(msg_widget); - msg_widget->task_count++; - msg_widget->width = new_width; } diff --git a/gfx/gfx_widgets.h b/gfx/gfx_widgets.h index 34e8667631..cbbeebf138 100644 --- a/gfx/gfx_widgets.h +++ b/gfx/gfx_widgets.h @@ -190,8 +190,6 @@ typedef struct disp_widget_msg uint16_t flags; int8_t task_progress; - /* How many tasks have used this notification? */ - uint8_t task_count; bool alternative_look; } disp_widget_msg_t; @@ -287,7 +285,6 @@ typedef struct dispgfx_widget unsigned msg_queue_icon_offset_y; unsigned msg_queue_scissor_start_x; unsigned msg_queue_default_rect_width; - unsigned msg_queue_regular_padding_x; unsigned msg_queue_regular_text_start; unsigned msg_queue_task_text_start_x; unsigned divider_width_1px; diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 3daaa12f6f..1857f548f6 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -6090,7 +6090,6 @@ void video_driver_frame(const void *data, unsigned width, sizeof(video_st->window_title) - __len); } - video_st->window_title_len = __len; retro_atomic_store_release_int(&video_st->window_title_update, 1); VIDEO_TITLE_UNLOCK(video_st); @@ -6102,7 +6101,7 @@ void video_driver_frame(const void *data, unsigned width, curr_time = fps_time = new_time; VIDEO_TITLE_LOCK(video_st); - video_st->window_title_len = strlcpy( + strlcpy( video_st->window_title, video_st->title_buf, sizeof(video_st->window_title)); @@ -7172,7 +7171,6 @@ static void video_frame_delay_auto(video_driver_state_t *video_st, video_frame_d count_pos_avg = 0; } - vfda->frame_time_avg = frame_time_avg; vfda->frame_time_target = frame_time_target; #if FRAME_DELAY_AUTO_DEBUG diff --git a/gfx/video_driver.h b/gfx/video_driver.h index c112c0043c..8b597ea00e 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -1174,8 +1174,6 @@ typedef struct uintptr_t display; uintptr_t window; - size_t window_title_len; - uint32_t flags; /* Display state only the main thread writes and reads - the * VIDEO_FLAG_WIDGETS_* bits and VIDEO_FLAG_ACTIVE, several of them @@ -1296,7 +1294,6 @@ typedef struct video_frame_delay_auto { float refresh_rate; uint16_t frame_time_target; - uint16_t frame_time_avg; uint8_t frame_time_interval; uint8_t delay_decrease; } video_frame_delay_auto_t; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 6af7c208ac..ba5e2c32c9 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -6798,7 +6798,6 @@ MUI_NOINLINE static void materialui_render_background( draw.tex_coord = NULL; draw.vertex_count = 4; draw.pipeline_id = 0; - draw.pipeline_active = false; draw.backend_data = NULL; draw.color = draw_color; draw.texture = 0; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 79ac4663bd..0506835570 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2226,7 +2226,6 @@ static bool gfx_thumbnail_set_icon_playlist( /* 'Reset' path_data content strings */ path_data->content_path[0] = '\0'; - path_data->content_label_len = 0; path_data->content_label[0] = '\0'; path_data->content_core_name[0] = '\0'; path_data->content_db_name[0] = '\0'; @@ -2272,10 +2271,10 @@ static bool gfx_thumbnail_set_icon_playlist( /* Get content label */ if (content_label && *content_label) - path_data->content_label_len = strlcpy(path_data->content_label, + strlcpy(path_data->content_label, content_label, sizeof(path_data->content_label)); else - path_data->content_label_len = fill_pathname( + fill_pathname( path_data->content_label, path_basename(content_path), "", sizeof(path_data->content_label)); @@ -8599,7 +8598,6 @@ XMB_NOINLINE static void xmb_draw_bg( draw.tex_coord = NULL; draw.vertex_count = 4; draw.pipeline_id = 0; - draw.pipeline_active = (menu_shader_pipeline == XMB_SHADER_PIPELINE_WALLPAPER) ? false : true; if (!video_width || !video_height) return; @@ -8705,7 +8703,6 @@ XMB_NOINLINE static void xmb_draw_dark_layer( draw.vertex_count = 4; draw.texture = 0; draw.pipeline_id = 0; - draw.pipeline_active = false; gfx_display_blend_begin(dispctx, userdata); gfx_display_draw_bg(p_disp, &draw, &coords, userdata, true, MIN(xmb->alpha, alpha)); diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 9b69c994e6..e35ed9c389 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -4625,7 +4625,6 @@ static void menu_input_key_event(bool down, unsigned keycode, void menu_input_dialog_end(void) { struct menu_state *menu_st = &menu_driver_state; - menu_st->input_dialog_kb_type = 0; menu_st->input_dialog_kb_idx = 0; menu_st->input_dialog_kb_text_type = MENU_INPUT_DIALOG_KB_TYPE_TEXT; menu_st->flags &= ~MENU_ST_FLAG_INP_DLG_KB_DISPLAY; @@ -8582,7 +8581,6 @@ bool menu_input_dialog_start(menu_input_ctx_line_t *line) line->label_setting, sizeof(menu_st->input_dialog_kb_label_setting)); - menu_st->input_dialog_kb_type = line->type; menu_st->input_dialog_kb_idx = line->idx; menu_st->input_dialog_kb_text_type = line->text_type; diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 8a79b4995b..169a39fa22 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -531,7 +531,6 @@ struct menu_state } scroll; /* unsigned alignment */ - unsigned input_dialog_kb_type; unsigned input_dialog_kb_idx; unsigned input_driver_flushing_input; menu_dialog_t dialog_st; diff --git a/runahead.c b/runahead.c index 2ac4ccb5c2..4890b1f25e 100644 --- a/runahead.c +++ b/runahead.c @@ -1408,7 +1408,6 @@ static bool runahead_savestate_info_init( { retro_ctx_serialize_info_t *info = &runloop_st->runahead_savestate_info; - runloop_st->runahead_save_state_size = save_state_size; runloop_st->flags |= RUNLOOP_FLAG_RUNAHEAD_SAVE_STATE_SIZE_KNOWN; /* Free any previous buffer so callers can safely re-init. The @@ -1514,7 +1513,6 @@ static void runahead_err(runloop_state_t *runloop_st) runloop_st->flags &= ~RUNLOOP_FLAG_RUNAHEAD_AVAILABLE; runahead_savestate_info_free(runloop_st); runahead_remove_hooks(runloop_st); - runloop_st->runahead_save_state_size = 0; runloop_st->flags |= RUNLOOP_FLAG_RUNAHEAD_SAVE_STATE_SIZE_KNOWN; } @@ -2242,7 +2240,6 @@ error: void runahead_clear_variables(void *data) { runloop_state_t *runloop_st = (runloop_state_t*)data; - runloop_st->runahead_save_state_size = 0; runloop_st->flags &= ~RUNLOOP_FLAG_RUNAHEAD_SAVE_STATE_SIZE_KNOWN; video_driver_modify_disp_flags(VIDEO_FLAG_RUNAHEAD_IS_ACTIVE, 0); runloop_st->flags |= RUNLOOP_FLAG_RUNAHEAD_AVAILABLE diff --git a/runloop.h b/runloop.h index 92fec63f3d..e049af50d9 100644 --- a/runloop.h +++ b/runloop.h @@ -289,7 +289,6 @@ struct runloop #if defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB) dylib_t secondary_lib_handle; /* ptr alignment */ #endif - size_t runahead_save_state_size; #endif size_t msg_queue_size;