mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2084 from xerpi/master

Browse Source 
(Vita) vita2d_gfx_free: Set textures to NULL
This commit is contained in:
Twinaphex 2015-09-01 01:55:51 +02:00
commit 795950c7b7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_vita.c
View File

@ -56,7 +56,7 @@ static void frontend_vita_get_environment_settings(int *argc, char *argv[],
strlcpy(retroarch_path, "cache0:/retroarch/", sizeof(retroarch_path)); strlcpy(retroarch_path, "cache0:/retroarch/", sizeof(retroarch_path));
fill_pathname_basedir(g_defaults.dir.port, retroarch_path, sizeof(g_defaults.dir.port)); strlcpy(g_defaults.dir.port, retroarch_path, sizeof(g_defaults.dir.port));
RARCH_LOG("port dir: [%s]\n", g_defaults.dir.port); RARCH_LOG("port dir: [%s]\n", g_defaults.dir.port);
fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port, fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port,

15
gfx/drivers/vita2d_gfx.c
View File

@ -67,7 +67,10 @@ static void *vita2d_gfx_init(const video_info_t *video,
if (!vita) if (!vita)
return NULL; return NULL;
RARCH_LOG("vita2d_gfx_init: w: %i h: %i\n", video->width, video->height); RARCH_LOG("vita2d_gfx_init: w: %i h: %i\n", video->width, video->height);
RARCH_LOG("RARCH_SCALE_BASE: %i input_scale: %i = %i\n",
RARCH_SCALE_BASE, video->input_scale, RARCH_SCALE_BASE * video->input_scale);
vita2d_init(); vita2d_init();
vita2d_set_clear_color(RGBA8(0x40, 0x40, 0x40, 0xFF)); vita2d_set_clear_color(RGBA8(0x40, 0x40, 0x40, 0xFF));
@ -150,7 +153,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
vita2d_start_drawing(); vita2d_start_drawing();
vita2d_clear_screen(); vita2d_clear_screen();
if (frame && vita->texture) if (vita->texture)
{ {
if (vita->fullscreen) if (vita->fullscreen)
vita2d_draw_texture_scale(vita->texture, vita2d_draw_texture_scale(vita->texture,
@ -248,11 +251,19 @@ static void vita2d_gfx_free(void *data)
{ {
vita_video_t *vita = (vita_video_t *)data; vita_video_t *vita = (vita_video_t *)data;
RARCH_LOG("vita2d_gfx_free()\n");
if (vita->menu.frame) if (vita->menu.frame)
{
vita2d_free_texture(vita->menu.frame); vita2d_free_texture(vita->menu.frame);
vita->menu.frame = NULL;
}
if (vita->texture) if (vita->texture)
{
vita2d_free_texture(vita->texture); vita2d_free_texture(vita->texture);
vita->texture = NULL;
}
vita2d_fini(); vita2d_fini();
} }