ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10802 from heuripedes/coz 

Ozone improvement
This commit is contained in:
Autechre 2020-06-07 03:01:47 +02:00 committed by GitHub
parent be76958070 ec197c441e
commit eddcde84b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/drivers_shader/shader_glsl.c
View File

@ -1443,10 +1443,10 @@ static bool gl_glsl_set_coords(void *shader_data,
elems *= coords->vertices * sizeof(GLfloat); elems *= coords->vertices * sizeof(GLfloat);
buffer = (GLfloat*)malloc(elems); buffer = (GLfloat*)malloc(elems);
}
if (!buffer) if (!buffer)
return false; return false;
}
if (uni->tex_coord >= 0) if (uni->tex_coord >= 0)
{ {

5
menu/drivers/ozone/ozone_entries.c
View File

@ -574,8 +574,6 @@ border_iterate:
menu_entry_init(&entry); menu_entry_init(&entry);
entry.path_enabled = false; entry.path_enabled = false;
entry.label_enabled = false; entry.label_enabled = false;
menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true);
menu_entry_get_value(&entry, &entry_value);
if (!node) if (!node)
continue; continue;
@ -585,6 +583,9 @@ border_iterate:
else if (y + scroll_y - node->height - 20 * scale_factor > bottom_boundary) else if (y + scroll_y - node->height - 20 * scale_factor > bottom_boundary)
goto icons_iterate; goto icons_iterate;
menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true);
menu_entry_get_value(&entry, &entry_value);
/* Prepare text */ /* Prepare text */
menu_entry_get_rich_label(&entry, &entry_rich_label); menu_entry_get_rich_label(&entry, &entry_rich_label);