From a74d24c3cefc3e8d917664db2e180c78bb34b38f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 24 Sep 2020 06:46:21 +0200 Subject: [PATCH] Rename gfx_display_allocate_white_texture to gfx_display_init_white_texture --- gfx/gfx_display.c | 6 +++--- gfx/gfx_display.h | 2 +- menu/drivers/materialui.c | 4 ++-- menu/drivers/ozone/ozone.c | 4 ++-- menu/drivers/rgui.c | 4 ++-- menu/drivers/stripes.c | 6 +++--- menu/drivers/xmb.c | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c index 8a66573272..33b45fa45b 100644 --- a/gfx/gfx_display.c +++ b/gfx/gfx_display.c @@ -1765,7 +1765,7 @@ void gfx_display_font_free(font_data_t *font) font_driver_free(font); } -void gfx_display_allocate_white_texture(void) +void gfx_display_init_white_texture(uintptr_t white_texture) { struct texture_image ti; static const uint8_t white_data[] = { 0xff, 0xff, 0xff, 0xff }; @@ -1775,10 +1775,10 @@ void gfx_display_allocate_white_texture(void) ti.pixels = (uint32_t*)&white_data; if (gfx_display_white_texture) - video_driver_texture_unload(&gfx_display_white_texture); + video_driver_texture_unload(&white_texture); video_driver_texture_load(&ti, - TEXTURE_FILTER_NEAREST, &gfx_display_white_texture); + TEXTURE_FILTER_NEAREST, &white_texture); } void gfx_display_free(void) diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h index 9ea1a6470a..7040edeeed 100644 --- a/gfx/gfx_display.h +++ b/gfx/gfx_display.h @@ -359,7 +359,7 @@ float gfx_display_get_widget_dpi_scale( float gfx_display_get_widget_pixel_scale( unsigned width, unsigned height, bool fullscreen); -void gfx_display_allocate_white_texture(void); +void gfx_display_init_white_texture(uintptr_t white_texture); bool gfx_display_driver_exists(const char *s); diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index eeb303ae75..5db53ad198 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -7834,7 +7834,7 @@ static bool materialui_load_image(void *userdata, void *data, enum menu_image_ty materialui_context_bg_destroy(mui); video_driver_texture_load(data, TEXTURE_FILTER_MIPMAP_LINEAR, &mui->textures.bg); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); } return true; @@ -8274,7 +8274,7 @@ static void materialui_context_reset(void *data, bool is_threaded) materialui_layout(mui, is_threaded); materialui_context_bg_destroy(mui); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); materialui_context_reset_textures(mui); materialui_context_reset_playlist_icons(mui); diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c index 8eacd37497..ac586a15c4 100644 --- a/menu/drivers/ozone/ozone.c +++ b/menu/drivers/ozone/ozone.c @@ -664,7 +664,7 @@ static void *ozone_init(void **userdata, bool video_is_threaded) gfx_display_set_width(width); gfx_display_set_height(height); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); file_list_initialize(&ozone->horizontal_list); @@ -1167,7 +1167,7 @@ static void ozone_context_reset(void *data, bool is_threaded) } } - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); /* Horizontal list */ ozone_context_reset_horizontal_list(ozone); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 9812f0c531..ae8451d2f3 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -4692,7 +4692,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded) if (!gfx_display_init_first_driver(video_is_threaded)) goto error; - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); } #endif @@ -5664,7 +5664,7 @@ static void rgui_context_reset(void *data, bool is_threaded) #ifdef HAVE_GFX_WIDGETS if (rgui->widgets_supported) - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); #endif video_driver_monitor_reset(); } diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index 756ec3d089..02169ef101 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -3442,7 +3442,7 @@ static void *stripes_init(void **userdata, bool video_is_threaded) gfx_display_set_width(width); gfx_display_set_height(height); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); file_list_initialize(&stripes->horizontal_list); stripes_init_horizontal_list(stripes); @@ -3521,7 +3521,7 @@ static bool stripes_load_image(void *userdata, void *data, enum menu_image_type video_driver_texture_load(data, TEXTURE_FILTER_MIPMAP_LINEAR, &stripes->textures.bg); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); break; case MENU_IMAGE_THUMBNAIL: { @@ -3694,7 +3694,7 @@ static void stripes_context_reset_textures( for (i = 0; i < STRIPES_TEXTURE_LAST; i++) gfx_display_reset_textures_list(stripes_texture_path(i), iconpath, &stripes->textures.list[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); stripes->main_menu_node.icon = stripes->textures.list[STRIPES_TEXTURE_MAIN_MENU]; stripes->main_menu_node.alpha = stripes->categories_active_alpha; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c8570da30b..dee7179860 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -5648,7 +5648,7 @@ static void *xmb_init(void **userdata, bool video_is_threaded) gfx_display_set_width(width); gfx_display_set_height(height); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); file_list_initialize(&xmb->horizontal_list); @@ -5744,7 +5744,7 @@ static bool xmb_load_image(void *userdata, void *data, video_driver_texture_load(data, TEXTURE_FILTER_MIPMAP_LINEAR, &xmb->textures.bg); - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); break; case MENU_IMAGE_NONE: default: @@ -6018,7 +6018,7 @@ static void xmb_context_reset_textures( xmb->assets_missing = false; - gfx_display_allocate_white_texture(); + gfx_display_init_white_texture(gfx_display_white_texture); for (i = 0; i < XMB_TEXTURE_LAST; i++) {