From bb051f185bab8e0a0ad2ebe897527165546e3c6d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 22 Oct 2017 05:12:42 +0200 Subject: [PATCH] MSVC/C89 buildfixes --- gfx/drivers/gl.c | 4 ++-- menu/drivers/xmb.c | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index c9c8128cf8..8ce706ed39 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -948,7 +948,6 @@ static void gl_render_osd_background( video_shader_ctx_mvp_t mvp; video_shader_ctx_coords_t coords_data; video_coords_t coords; - video_coord_array_t ca; video_shader_ctx_info_t shader_info; struct uniform_info uniform_param; const unsigned vertices_total = 6; @@ -1579,12 +1578,13 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident) if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE) { + gfx_ctx_flags_t flags; + gl_query_core_context_set(true); /** * Ensure that the rest of the frontend knows we have a core context */ - gfx_ctx_flags_t flags; flags.flags = 0; BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c9c7648f58..3cdfc89025 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1341,9 +1341,10 @@ static void xmb_list_open_new(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current) { unsigned i, height; - size_t skip = 0; - int threshold = xmb->icon_size * 10; - size_t end = file_list_get_size(list); + unsigned xmb_system_tab = 0; + size_t skip = 0; + int threshold = xmb->icon_size * 10; + size_t end = file_list_get_size(list); video_driver_get_size(NULL, &height); @@ -1408,7 +1409,7 @@ static void xmb_list_open_new(xmb_handle_t *xmb, xmb->old_depth = xmb->depth; menu_entries_ctl(MENU_ENTRIES_CTL_SET_START, &skip); - unsigned xmb_system_tab = xmb_get_system_tab(xmb, (unsigned)xmb->categories_selection_ptr); + xmb_system_tab = xmb_get_system_tab(xmb, (unsigned)xmb->categories_selection_ptr); if (xmb_system_tab <= XMB_SYSTEM_TAB_SETTINGS) { @@ -4254,6 +4255,8 @@ static int xmb_list_push(void *data, void *userdata, { case DISPLAYLIST_LOAD_CONTENT_LIST: { + settings_t *settings = config_get_ptr(); + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_append_enum(info->list, @@ -4286,7 +4289,6 @@ static int xmb_list_push(void *data, void *userdata, MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR, MENU_SETTING_ACTION, 0, 0); - settings_t *settings = config_get_ptr(); if (!settings->bools.kiosk_mode_enable) { menu_entries_append_enum(info->list,