From d79da7fc1fefb8f0af7a25dbf5781daf5a4f99d2 Mon Sep 17 00:00:00 2001 From: Nathan S Date: Wed, 29 Jun 2016 14:22:30 +0200 Subject: [PATCH] (gl_raster_font) Fixed the viewport issue --- gfx/drivers_font/gl_raster_font.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index 1016c80443..6a9976d3ec 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -409,7 +409,7 @@ static void gl_raster_font_setup_viewport(gl_raster_t *font, bool full_screen) video_shader_driver_use(&shader_info); } -static void gl_raster_font_restore_viewport(gl_t *gl) +static void gl_raster_font_restore_viewport(gl_t *gl, bool full_screen) { unsigned width, height; @@ -418,7 +418,7 @@ static void gl_raster_font_restore_viewport(gl_t *gl) glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); glDisable(GL_BLEND); - video_driver_set_viewport(width, height, false, true); + video_driver_set_viewport(width, height, full_screen, true); } static void gl_raster_font_render_msg(void *data, const char *msg, @@ -502,7 +502,7 @@ static void gl_raster_font_render_msg(void *data, const char *msg, gl_raster_font_render_message(font, msg, scale, color, x, y, text_align); if (!font->block) - gl_raster_font_restore_viewport(gl); + gl_raster_font_restore_viewport(gl, false); } static const struct font_glyph *gl_raster_font_get_glyph( @@ -527,7 +527,7 @@ static void gl_raster_font_flush_block(void *data) gl_raster_font_setup_viewport(font, block->fullscreen); gl_raster_font_draw_vertices(font->gl, (video_coords_t*)&block->carr.coords); - gl_raster_font_restore_viewport(font->gl); + gl_raster_font_restore_viewport(font->gl, block->fullscreen); } static void gl_raster_font_bind_block(void *data, void *userdata)