mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GL1) Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-03-18 04:50:50 +01:00
parent ab814efc62
commit 03641f2378
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/drivers_font/gl1_raster_font.c
View File

@ -237,22 +237,12 @@ static void gl1_raster_font_draw_vertices(gl1_raster_t *font,
const video_coords_t *coords, const video_coords_t *coords,
video_frame_info_t *video_info) video_frame_info_t *video_info)
{ {
video_shader_ctx_coords_t coords_data;
if (font->atlas->dirty) if (font->atlas->dirty)
{ {
gl1_raster_font_upload_atlas(font); gl1_raster_font_upload_atlas(font);
font->atlas->dirty = false; font->atlas->dirty = false;
} }
coords_data.handle_data = NULL;
coords_data.data = coords;
video_driver_set_coords(&coords_data);
/*video_info->cb_set_mvp(font->gl,
video_info->shader_data, &font->gl->mvp_no_rot);*/
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadMatrixf(font->gl->mvp.data); glLoadMatrixf(font->gl->mvp.data);

9
menu/drivers_display/menu_display_gl1.c
View File

@ -100,9 +100,7 @@ static void menu_display_gl1_draw(menu_display_ctx_draw_t *draw,
video_frame_info_t *video_info) video_frame_info_t *video_info)
{ {
video_shader_ctx_mvp_t mvp; video_shader_ctx_mvp_t mvp;
video_shader_ctx_coords_t coords; gl1_t *gl1 = (gl1_t*)video_info->userdata;
gl1_t *gl1 = video_info ?
(gl1_t*)video_info->userdata : NULL;
if (!gl1 || !draw) if (!gl1 || !draw)
return; return;
@ -120,11 +118,6 @@ static void menu_display_gl1_draw(menu_display_ctx_draw_t *draw,
glBindTexture(GL_TEXTURE_2D, (GLuint)draw->texture); glBindTexture(GL_TEXTURE_2D, (GLuint)draw->texture);
coords.handle_data = gl1;
coords.data = draw->coords;
video_driver_set_coords(&coords);
mvp.data = gl1; mvp.data = gl1;
mvp.matrix = draw->matrix_data ? (math_matrix_4x4*)draw->matrix_data mvp.matrix = draw->matrix_data ? (math_matrix_4x4*)draw->matrix_data
: (math_matrix_4x4*)menu_display_gl1_get_default_mvp(video_info); : (math_matrix_4x4*)menu_display_gl1_get_default_mvp(video_info);