diff --git a/gfx/drivers_font/ctr_font.c b/gfx/drivers_font/ctr_font.c index 0183a42f3a..1814a81eaa 100644 --- a/gfx/drivers_font/ctr_font.c +++ b/gfx/drivers_font/ctr_font.c @@ -305,9 +305,9 @@ static void ctr_font_render_message( const unsigned int color, float pos_x, float pos_y, unsigned width, unsigned height, unsigned text_align) { + float line_height; struct font_line_metrics *line_metrics = NULL; int lines = 0; - float line_height; if (!msg || !*msg) return; @@ -328,7 +328,7 @@ static void ctr_font_render_message( for (;;) { const char* delim = strchr(msg, '\n'); - size_t msg_len = delim ? + size_t msg_len = delim ? (delim - msg) : strlen(msg); /* Draw the line */ @@ -348,15 +348,15 @@ static void ctr_font_render_msg( void* data, const char* msg, const struct font_params *params) { - float x, y, scale, drop_mod, drop_alpha; int drop_x, drop_y; - enum text_alignment text_align; unsigned color, r, g, b, alpha; - ctr_font_t * font = (ctr_font_t*)data; - ctr_video_t *ctr = (ctr_video_t*)userdata; - unsigned width = ctr->render_font_bottom ? + enum text_alignment text_align; + float x, y, scale, drop_mod, drop_alpha; + ctr_font_t *font = (ctr_font_t*)data; + ctr_video_t *ctr = (ctr_video_t*)userdata; + unsigned width = ctr->render_font_bottom ? CTR_BOTTOM_FRAMEBUFFER_WIDTH : CTR_TOP_FRAMEBUFFER_WIDTH; - unsigned height = ctr->render_font_bottom ? + unsigned height = ctr->render_font_bottom ? CTR_BOTTOM_FRAMEBUFFER_HEIGHT : CTR_TOP_FRAMEBUFFER_HEIGHT; if (!font || !msg || !*msg) @@ -364,21 +364,21 @@ static void ctr_font_render_msg( if (params) { - x = params->x; - y = params->y; - scale = params->scale; - text_align = params->text_align; - drop_x = params->drop_x; - drop_y = params->drop_y; - drop_mod = params->drop_mod; - drop_alpha = params->drop_alpha; + x = params->x; + y = params->y; + scale = params->scale; + text_align = params->text_align; + drop_x = params->drop_x; + drop_y = params->drop_y; + drop_mod = params->drop_mod; + drop_alpha = params->drop_alpha; - r = FONT_COLOR_GET_RED(params->color); - g = FONT_COLOR_GET_GREEN(params->color); - b = FONT_COLOR_GET_BLUE(params->color); - alpha = FONT_COLOR_GET_ALPHA(params->color); + r = FONT_COLOR_GET_RED(params->color); + g = FONT_COLOR_GET_GREEN(params->color); + b = FONT_COLOR_GET_BLUE(params->color); + alpha = FONT_COLOR_GET_ALPHA(params->color); - color = COLOR_ABGR(r, g, b, alpha); + color = COLOR_ABGR(r, g, b, alpha); } else { diff --git a/gfx/drivers_font/d3d10_font.c b/gfx/drivers_font/d3d10_font.c index dbbb216069..02feb7c627 100644 --- a/gfx/drivers_font/d3d10_font.c +++ b/gfx/drivers_font/d3d10_font.c @@ -129,9 +129,9 @@ static void d3d10_font_render_line( unsigned height, unsigned text_align) { + d3d10_sprite_t *v; unsigned i, count; void * mapped_vbo; - d3d10_sprite_t * v; const struct font_glyph* glyph_q = NULL; int x = roundf(pos_x * width); int y = roundf((1.0 - pos_y) * height); @@ -285,35 +285,35 @@ static void d3d10_font_render_msg( const char* msg, const struct font_params *params) { - float x, y, scale, drop_mod, drop_alpha; - int drop_x, drop_y; - enum text_alignment text_align; - unsigned color, r, g, b, alpha; - d3d10_font_t* font = (d3d10_font_t*)data; - d3d10_video_t* d3d10 = (d3d10_video_t*)userdata; - unsigned width = d3d10->vp.full_width; - unsigned height = d3d10->vp.full_height; + int drop_x, drop_y; + enum text_alignment text_align; + unsigned color, r, g, b, alpha; + float x, y, scale, drop_mod, drop_alpha; + d3d10_font_t *font = (d3d10_font_t*)data; + d3d10_video_t *d3d10 = (d3d10_video_t*)userdata; + unsigned width = d3d10->vp.full_width; + unsigned height = d3d10->vp.full_height; if (!font || !msg || !*msg) return; if (params) { - x = params->x; - y = params->y; - scale = params->scale; - text_align = params->text_align; - drop_x = params->drop_x; - drop_y = params->drop_y; - drop_mod = params->drop_mod; - drop_alpha = params->drop_alpha; + x = params->x; + y = params->y; + scale = params->scale; + text_align = params->text_align; + drop_x = params->drop_x; + drop_y = params->drop_y; + drop_mod = params->drop_mod; + drop_alpha = params->drop_alpha; - r = FONT_COLOR_GET_RED(params->color); - g = FONT_COLOR_GET_GREEN(params->color); - b = FONT_COLOR_GET_BLUE(params->color); - alpha = FONT_COLOR_GET_ALPHA(params->color); + r = FONT_COLOR_GET_RED(params->color); + g = FONT_COLOR_GET_GREEN(params->color); + b = FONT_COLOR_GET_BLUE(params->color); + alpha = FONT_COLOR_GET_ALPHA(params->color); - color = DXGI_COLOR_RGBA(r, g, b, alpha); + color = DXGI_COLOR_RGBA(r, g, b, alpha); } else { diff --git a/gfx/drivers_font/d3d11_font.c b/gfx/drivers_font/d3d11_font.c index 95466501ba..e701085abe 100644 --- a/gfx/drivers_font/d3d11_font.c +++ b/gfx/drivers_font/d3d11_font.c @@ -289,35 +289,35 @@ static void d3d11_font_render_msg( const char* msg, const struct font_params *params) { - float x, y, scale, drop_mod, drop_alpha; - int drop_x, drop_y; - enum text_alignment text_align; - unsigned color, r, g, b, alpha; - d3d11_font_t* font = (d3d11_font_t*)data; - d3d11_video_t * d3d11 = (d3d11_video_t*)userdata; - unsigned width = d3d11->vp.full_width; - unsigned height = d3d11->vp.full_height; + int drop_x, drop_y; + enum text_alignment text_align; + unsigned color, r, g, b, alpha; + float x, y, scale, drop_mod, drop_alpha; + d3d11_font_t *font = (d3d11_font_t*)data; + d3d11_video_t *d3d11 = (d3d11_video_t*)userdata; + unsigned width = d3d11->vp.full_width; + unsigned height = d3d11->vp.full_height; if (!font || !msg || !*msg) return; if (params) { - x = params->x; - y = params->y; - scale = params->scale; - text_align = params->text_align; - drop_x = params->drop_x; - drop_y = params->drop_y; - drop_mod = params->drop_mod; - drop_alpha = params->drop_alpha; + x = params->x; + y = params->y; + scale = params->scale; + text_align = params->text_align; + drop_x = params->drop_x; + drop_y = params->drop_y; + drop_mod = params->drop_mod; + drop_alpha = params->drop_alpha; - r = FONT_COLOR_GET_RED(params->color); - g = FONT_COLOR_GET_GREEN(params->color); - b = FONT_COLOR_GET_BLUE(params->color); - alpha = FONT_COLOR_GET_ALPHA(params->color); + r = FONT_COLOR_GET_RED(params->color); + g = FONT_COLOR_GET_GREEN(params->color); + b = FONT_COLOR_GET_BLUE(params->color); + alpha = FONT_COLOR_GET_ALPHA(params->color); - color = DXGI_COLOR_RGBA(r, g, b, alpha); + color = DXGI_COLOR_RGBA(r, g, b, alpha); } else { @@ -346,11 +346,11 @@ static void d3d11_font_render_msg( if (drop_x || drop_y) { - unsigned r_dark = r * drop_mod; - unsigned g_dark = g * drop_mod; - unsigned b_dark = b * drop_mod; - unsigned alpha_dark = alpha * drop_alpha; - unsigned color_dark = DXGI_COLOR_RGBA(r_dark, g_dark, b_dark, alpha_dark); + unsigned r_dark = r * drop_mod; + unsigned g_dark = g * drop_mod; + unsigned b_dark = b * drop_mod; + unsigned alpha_dark = alpha * drop_alpha; + unsigned color_dark = DXGI_COLOR_RGBA(r_dark, g_dark, b_dark, alpha_dark); d3d11_font_render_message(d3d11, font, msg, scale, color_dark, diff --git a/gfx/drivers_font/gdi_font.c b/gfx/drivers_font/gdi_font.c index 4a1649fb58..97afb4b488 100644 --- a/gfx/drivers_font/gdi_font.c +++ b/gfx/drivers_font/gdi_font.c @@ -141,20 +141,20 @@ static void gdi_font_render_msg( switch (align) { case TEXT_ALIGN_LEFT: - new_x = x * width * scale; - new_drop_x = drop_x * width * scale; + new_x = x * width * scale; + new_drop_x = drop_x * width * scale; break; case TEXT_ALIGN_RIGHT: - new_x = (x * width * scale) - text_size.cx; - new_drop_x = (drop_x * width * scale) - text_size.cx; + new_x = (x * width * scale) - text_size.cx; + new_drop_x = (drop_x * width * scale) - text_size.cx; break; case TEXT_ALIGN_CENTER: - new_x = (x * width * scale) - (text_size.cx / 2); - new_drop_x = (drop_x * width * scale) - (text_size.cx / 2); + new_x = (x * width * scale) - (text_size.cx / 2); + new_drop_x = (drop_x * width * scale) - (text_size.cx / 2); break; default: - new_x = 0; - new_drop_x = 0; + new_x = 0; + new_drop_x = 0; break; } diff --git a/gfx/drivers_font/gl1_raster_font.c b/gfx/drivers_font/gl1_raster_font.c index dc4d8e40d9..9bbc532759 100644 --- a/gfx/drivers_font/gl1_raster_font.c +++ b/gfx/drivers_font/gl1_raster_font.c @@ -77,7 +77,7 @@ static void gl1_raster_font_free(void *data, free(font); } -static bool gl1_raster_font_upload_atlas(gl1_raster_t *font) +static void gl1_raster_font_upload_atlas(gl1_raster_t *font) { unsigned i, j; GLint gl_internal = GL_LUMINANCE_ALPHA; @@ -117,8 +117,6 @@ static bool gl1_raster_font_upload_atlas(gl1_raster_t *font) 0, gl_format, GL_UNSIGNED_BYTE, tmp); free(tmp); - - return true; } static void *gl1_raster_font_init(void *data, @@ -158,8 +156,7 @@ static void *gl1_raster_font_init(void *data, font->tex_width = next_pow2(font->atlas->width); font->tex_height = next_pow2(font->atlas->height); - if (!gl1_raster_font_upload_atlas(font)) - goto error; + gl1_raster_font_upload_atlas(font); font->atlas->dirty = false; @@ -167,12 +164,6 @@ static void *gl1_raster_font_init(void *data, glBindTexture(GL_TEXTURE_2D, font->gl->texture[font->gl->tex_index]); return font; - -error: - gl1_raster_font_free(font, is_threaded); - font = NULL; - - return NULL; } static int gl1_raster_font_get_message_width(void *data, const char *msg, diff --git a/gfx/drivers_font/gl2_raster_font.c b/gfx/drivers_font/gl2_raster_font.c index 196ca329a3..fab9b3bc60 100644 --- a/gfx/drivers_font/gl2_raster_font.c +++ b/gfx/drivers_font/gl2_raster_font.c @@ -82,7 +82,7 @@ static void gl2_raster_font_free(void *data, free(font); } -static bool gl2_raster_font_upload_atlas(gl2_raster_t *font) +static void gl2_raster_font_upload_atlas(gl2_raster_t *font) { int i, j; GLint gl_internal = GL_LUMINANCE_ALPHA; @@ -121,8 +121,6 @@ static bool gl2_raster_font_upload_atlas(gl2_raster_t *font) 0, gl_format, GL_UNSIGNED_BYTE, tmp); free(tmp); - - return true; } static void *gl2_raster_font_init(void *data, @@ -159,8 +157,7 @@ static void *gl2_raster_font_init(void *data, font->tex_width = next_pow2(font->atlas->width); font->tex_height = next_pow2(font->atlas->height); - if (!gl2_raster_font_upload_atlas(font)) - goto error; + gl2_raster_font_upload_atlas(font); font->atlas->dirty = false; @@ -168,12 +165,6 @@ static void *gl2_raster_font_init(void *data, glBindTexture(GL_TEXTURE_2D, font->gl->texture[font->gl->tex_index]); return font; - -error: - gl2_raster_font_free(font, is_threaded); - font = NULL; - - return NULL; } static int gl2_raster_font_get_message_width(void *data, const char *msg, diff --git a/gfx/drivers_font/gl3_raster_font.c b/gfx/drivers_font/gl3_raster_font.c index 8dcc1f9bb0..8afb8580c0 100644 --- a/gfx/drivers_font/gl3_raster_font.c +++ b/gfx/drivers_font/gl3_raster_font.c @@ -73,7 +73,7 @@ static void gl3_raster_font_free(void *data, free(font); } -static bool gl3_raster_font_upload_atlas(gl3_raster_t *font) +static void gl3_raster_font_upload_atlas(gl3_raster_t *font) { if (font->tex) glDeleteTextures(1, &font->tex); @@ -91,8 +91,6 @@ static bool gl3_raster_font_upload_atlas(gl3_raster_t *font) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glBindTexture(GL_TEXTURE_2D, 0); - - return true; } static void *gl3_raster_font_init(void *data, @@ -123,15 +121,10 @@ static void *gl3_raster_font_init(void *data, font->atlas = font->font_driver->get_atlas(font->font_data); - if (!gl3_raster_font_upload_atlas(font)) - goto error; + gl3_raster_font_upload_atlas(font); font->atlas->dirty = false; return font; - -error: - gl3_raster_font_free(font, is_threaded); - return NULL; } static int gl3_raster_font_get_message_width(void *data, const char *msg, diff --git a/gfx/drivers_font/vita2d_font.c b/gfx/drivers_font/vita2d_font.c index 9a17804b5e..a82c88c8b6 100644 --- a/gfx/drivers_font/vita2d_font.c +++ b/gfx/drivers_font/vita2d_font.c @@ -78,7 +78,7 @@ static void *vita2d_font_init(void *data, for (j = 0; j < atlas->height; j++) for (k = 0; k < atlas->width; k++) - tex32[k + j*stride] = frame32[k + j*pitch]; + tex32[k + j * stride] = frame32[k + j*pitch]; font->atlas->dirty = false; @@ -165,11 +165,9 @@ static void vita2d_font_render_line( for (i = 0; i < msg_len; i++) { + int j, k; int off_x, off_y, tex_x, tex_y, width, height; - unsigned int stride, pitch, j, k; const struct font_glyph *glyph = NULL; - const uint8_t *frame32 = NULL; - uint8_t *tex32 = NULL; const char *msg_tmp = &msg[i]; unsigned code = utf8_walk(&msg_tmp); unsigned skip = msg_tmp - &msg[i]; @@ -191,14 +189,14 @@ static void vita2d_font_render_line( if (font->atlas->dirty) { - stride = vita2d_texture_get_stride(font->texture); - tex32 = vita2d_texture_get_datap(font->texture); - frame32 = font->atlas->buffer; - pitch = font->atlas->width; + unsigned int stride = vita2d_texture_get_stride(font->texture); + uint8_t *tex32 = vita2d_texture_get_datap(font->texture); + const uint8_t *frame32 = font->atlas->buffer; + unsigned int pitch = font->atlas->width; for (j = 0; j < font->atlas->height; j++) for (k = 0; k < font->atlas->width; k++) - tex32[k + j*stride] = frame32[k + j*pitch]; + tex32[k + j*stride] = frame32[k + j * pitch]; font->atlas->dirty = false; } @@ -264,35 +262,35 @@ static void vita2d_font_render_msg( const char *msg, const struct font_params *params) { - float x, y, scale, drop_mod, drop_alpha; int drop_x, drop_y; - enum text_alignment text_align; unsigned color, r, g, b, alpha; - bool full_screen = false ; - vita_video_t *vita = (vita_video_t *)userdata; - vita_font_t *font = (vita_font_t *)data; - unsigned width = vita->video_width; - unsigned height = vita->video_height; + enum text_alignment text_align; + float x, y, scale, drop_mod, drop_alpha; + bool full_screen = false; + vita_video_t *vita = (vita_video_t *)userdata; + vita_font_t *font = (vita_font_t *)data; + unsigned width = vita->video_width; + unsigned height = vita->video_height; if (!font || !msg || !*msg) return; if (params) { - x = params->x; - y = params->y; - scale = params->scale; - full_screen = params->full_screen; - text_align = params->text_align; - drop_x = params->drop_x; - drop_y = params->drop_y; - drop_mod = params->drop_mod; - drop_alpha = params->drop_alpha; - r = FONT_COLOR_GET_RED(params->color); - g = FONT_COLOR_GET_GREEN(params->color); - b = FONT_COLOR_GET_BLUE(params->color); - alpha = FONT_COLOR_GET_ALPHA(params->color); - color = RGBA8(r,g,b,alpha); + x = params->x; + y = params->y; + scale = params->scale; + full_screen = params->full_screen; + text_align = params->text_align; + drop_x = params->drop_x; + drop_y = params->drop_y; + drop_mod = params->drop_mod; + drop_alpha = params->drop_alpha; + r = FONT_COLOR_GET_RED(params->color); + g = FONT_COLOR_GET_GREEN(params->color); + b = FONT_COLOR_GET_BLUE(params->color); + alpha = FONT_COLOR_GET_ALPHA(params->color); + color = RGBA8(r,g,b,alpha); } else { diff --git a/gfx/drivers_font/wiiu_font.c b/gfx/drivers_font/wiiu_font.c index a6bef75145..13ca9c56b5 100644 --- a/gfx/drivers_font/wiiu_font.c +++ b/gfx/drivers_font/wiiu_font.c @@ -297,30 +297,30 @@ static void wiiu_font_render_msg( int drop_x, drop_y; enum text_alignment text_align; unsigned color, r, g, b, alpha; - wiiu_video_t *wiiu = (wiiu_video_t*)userdata; - wiiu_font_t *font = (wiiu_font_t*)data; - unsigned width = wiiu->vp.full_width; - unsigned height = wiiu->vp.full_height; + wiiu_video_t *wiiu = (wiiu_video_t*)userdata; + wiiu_font_t *font = (wiiu_font_t*)data; + unsigned width = wiiu->vp.full_width; + unsigned height = wiiu->vp.full_height; if (!font || !msg || !*msg) return; if (params) { - x = params->x; - y = params->y; - scale = params->scale; - text_align = params->text_align; - drop_x = params->drop_x; - drop_y = params->drop_y; - drop_mod = params->drop_mod; - drop_alpha = params->drop_alpha; + x = params->x; + y = params->y; + scale = params->scale; + text_align = params->text_align; + drop_x = params->drop_x; + drop_y = params->drop_y; + drop_mod = params->drop_mod; + drop_alpha = params->drop_alpha; - r = FONT_COLOR_GET_RED(params->color); - g = FONT_COLOR_GET_GREEN(params->color); - b = FONT_COLOR_GET_BLUE(params->color); - alpha = FONT_COLOR_GET_ALPHA(params->color); - color = params->color; + r = FONT_COLOR_GET_RED(params->color); + g = FONT_COLOR_GET_GREEN(params->color); + b = FONT_COLOR_GET_BLUE(params->color); + alpha = FONT_COLOR_GET_ALPHA(params->color); + color = params->color; } else {