Rename gfx_display_allocate_white_texture to
gfx_display_init_white_texture
This commit is contained in:
parent
5f89551e54
commit
a74d24c3ce
|
@ -1765,7 +1765,7 @@ void gfx_display_font_free(font_data_t *font)
|
||||||
font_driver_free(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;
|
struct texture_image ti;
|
||||||
static const uint8_t white_data[] = { 0xff, 0xff, 0xff, 0xff };
|
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;
|
ti.pixels = (uint32_t*)&white_data;
|
||||||
|
|
||||||
if (gfx_display_white_texture)
|
if (gfx_display_white_texture)
|
||||||
video_driver_texture_unload(&gfx_display_white_texture);
|
video_driver_texture_unload(&white_texture);
|
||||||
|
|
||||||
video_driver_texture_load(&ti,
|
video_driver_texture_load(&ti,
|
||||||
TEXTURE_FILTER_NEAREST, &gfx_display_white_texture);
|
TEXTURE_FILTER_NEAREST, &white_texture);
|
||||||
}
|
}
|
||||||
|
|
||||||
void gfx_display_free(void)
|
void gfx_display_free(void)
|
||||||
|
|
|
@ -359,7 +359,7 @@ float gfx_display_get_widget_dpi_scale(
|
||||||
float gfx_display_get_widget_pixel_scale(
|
float gfx_display_get_widget_pixel_scale(
|
||||||
unsigned width, unsigned height, bool fullscreen);
|
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);
|
bool gfx_display_driver_exists(const char *s);
|
||||||
|
|
||||||
|
|
|
@ -7834,7 +7834,7 @@ static bool materialui_load_image(void *userdata, void *data, enum menu_image_ty
|
||||||
materialui_context_bg_destroy(mui);
|
materialui_context_bg_destroy(mui);
|
||||||
video_driver_texture_load(data,
|
video_driver_texture_load(data,
|
||||||
TEXTURE_FILTER_MIPMAP_LINEAR, &mui->textures.bg);
|
TEXTURE_FILTER_MIPMAP_LINEAR, &mui->textures.bg);
|
||||||
gfx_display_allocate_white_texture();
|
gfx_display_init_white_texture(gfx_display_white_texture);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -8274,7 +8274,7 @@ static void materialui_context_reset(void *data, bool is_threaded)
|
||||||
|
|
||||||
materialui_layout(mui, is_threaded);
|
materialui_layout(mui, is_threaded);
|
||||||
materialui_context_bg_destroy(mui);
|
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_textures(mui);
|
||||||
materialui_context_reset_playlist_icons(mui);
|
materialui_context_reset_playlist_icons(mui);
|
||||||
|
|
||||||
|
|
|
@ -664,7 +664,7 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
|
||||||
gfx_display_set_width(width);
|
gfx_display_set_width(width);
|
||||||
gfx_display_set_height(height);
|
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);
|
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 */
|
/* Horizontal list */
|
||||||
ozone_context_reset_horizontal_list(ozone);
|
ozone_context_reset_horizontal_list(ozone);
|
||||||
|
|
|
@ -4692,7 +4692,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded)
|
||||||
if (!gfx_display_init_first_driver(video_is_threaded))
|
if (!gfx_display_init_first_driver(video_is_threaded))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
gfx_display_allocate_white_texture();
|
gfx_display_init_white_texture(gfx_display_white_texture);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -5664,7 +5664,7 @@ static void rgui_context_reset(void *data, bool is_threaded)
|
||||||
|
|
||||||
#ifdef HAVE_GFX_WIDGETS
|
#ifdef HAVE_GFX_WIDGETS
|
||||||
if (rgui->widgets_supported)
|
if (rgui->widgets_supported)
|
||||||
gfx_display_allocate_white_texture();
|
gfx_display_init_white_texture(gfx_display_white_texture);
|
||||||
#endif
|
#endif
|
||||||
video_driver_monitor_reset();
|
video_driver_monitor_reset();
|
||||||
}
|
}
|
||||||
|
|
|
@ -3442,7 +3442,7 @@ static void *stripes_init(void **userdata, bool video_is_threaded)
|
||||||
gfx_display_set_width(width);
|
gfx_display_set_width(width);
|
||||||
gfx_display_set_height(height);
|
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);
|
file_list_initialize(&stripes->horizontal_list);
|
||||||
stripes_init_horizontal_list(stripes);
|
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,
|
video_driver_texture_load(data,
|
||||||
TEXTURE_FILTER_MIPMAP_LINEAR,
|
TEXTURE_FILTER_MIPMAP_LINEAR,
|
||||||
&stripes->textures.bg);
|
&stripes->textures.bg);
|
||||||
gfx_display_allocate_white_texture();
|
gfx_display_init_white_texture(gfx_display_white_texture);
|
||||||
break;
|
break;
|
||||||
case MENU_IMAGE_THUMBNAIL:
|
case MENU_IMAGE_THUMBNAIL:
|
||||||
{
|
{
|
||||||
|
@ -3694,7 +3694,7 @@ static void stripes_context_reset_textures(
|
||||||
for (i = 0; i < STRIPES_TEXTURE_LAST; i++)
|
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_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.icon = stripes->textures.list[STRIPES_TEXTURE_MAIN_MENU];
|
||||||
stripes->main_menu_node.alpha = stripes->categories_active_alpha;
|
stripes->main_menu_node.alpha = stripes->categories_active_alpha;
|
||||||
|
|
|
@ -5648,7 +5648,7 @@ static void *xmb_init(void **userdata, bool video_is_threaded)
|
||||||
gfx_display_set_width(width);
|
gfx_display_set_width(width);
|
||||||
gfx_display_set_height(height);
|
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);
|
file_list_initialize(&xmb->horizontal_list);
|
||||||
|
|
||||||
|
@ -5744,7 +5744,7 @@ static bool xmb_load_image(void *userdata, void *data,
|
||||||
video_driver_texture_load(data,
|
video_driver_texture_load(data,
|
||||||
TEXTURE_FILTER_MIPMAP_LINEAR,
|
TEXTURE_FILTER_MIPMAP_LINEAR,
|
||||||
&xmb->textures.bg);
|
&xmb->textures.bg);
|
||||||
gfx_display_allocate_white_texture();
|
gfx_display_init_white_texture(gfx_display_white_texture);
|
||||||
break;
|
break;
|
||||||
case MENU_IMAGE_NONE:
|
case MENU_IMAGE_NONE:
|
||||||
default:
|
default:
|
||||||
|
@ -6018,7 +6018,7 @@ static void xmb_context_reset_textures(
|
||||||
|
|
||||||
xmb->assets_missing = false;
|
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++)
|
for (i = 0; i < XMB_TEXTURE_LAST; i++)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue