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

(griffin) Fix font renderer builds

This commit is contained in:
Higor Eurípedes 2015-02-20 23:34:19 -03:00
parent c281f0fc68
commit 30b766bba3
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/drivers_font_renderer/bitmapfont.c
View File

@ -21,14 +21,14 @@
#include <math.h> #include <math.h>
#include <boolean.h> #include <boolean.h>
#define ATLAS_COLS 16 #define BMP_ATLAS_COLS 16
#define ATLAS_ROWS 16 #define BMP_ATLAS_ROWS 16
#define ATLAS_SIZE (ATLAS_COLS * ATLAS_ROWS) #define BMP_ATLAS_SIZE (BMP_ATLAS_COLS * BMP_ATLAS_ROWS)
typedef struct bm_renderer typedef struct bm_renderer
{ {
unsigned scale_factor; unsigned scale_factor;
struct font_glyph glyphs[ATLAS_SIZE]; struct font_glyph glyphs[BMP_ATLAS_SIZE];
struct font_atlas atlas; struct font_atlas atlas;
} bm_renderer_t; } bm_renderer_t;
@ -46,7 +46,7 @@ static const struct font_glyph *font_renderer_bmp_get_glyph(
bm_renderer_t *handle = (bm_renderer_t*)data; bm_renderer_t *handle = (bm_renderer_t*)data;
if (!handle) if (!handle)
return NULL; return NULL;
return code < ATLAS_SIZE ? &handle->glyphs[code] : NULL; return code < BMP_ATLAS_SIZE ? &handle->glyphs[code] : NULL;
} }
static void char_to_texture(bm_renderer_t *handle, uint8_t letter, static void char_to_texture(bm_renderer_t *handle, uint8_t letter,
@ -90,14 +90,14 @@ static void *font_renderer_bmp_init(const char *font_path, float font_size)
if (!handle->scale_factor) if (!handle->scale_factor)
handle->scale_factor = 1; handle->scale_factor = 1;
handle->atlas.width = FONT_WIDTH * handle->scale_factor * ATLAS_COLS; handle->atlas.width = FONT_WIDTH * handle->scale_factor * BMP_ATLAS_COLS;
handle->atlas.height = FONT_HEIGHT * handle->scale_factor * ATLAS_ROWS; handle->atlas.height = FONT_HEIGHT * handle->scale_factor * BMP_ATLAS_ROWS;
handle->atlas.buffer = (uint8_t*)calloc(handle->atlas.width * handle->atlas.height, 1); handle->atlas.buffer = (uint8_t*)calloc(handle->atlas.width * handle->atlas.height, 1);
for (i = 0; i < ATLAS_SIZE; i++) for (i = 0; i < BMP_ATLAS_SIZE; i++)
{ {
unsigned x = (i % ATLAS_COLS) * handle->scale_factor * FONT_WIDTH; unsigned x = (i % BMP_ATLAS_COLS) * handle->scale_factor * FONT_WIDTH;
unsigned y = (i / ATLAS_COLS) * handle->scale_factor * FONT_HEIGHT; unsigned y = (i / BMP_ATLAS_COLS) * handle->scale_factor * FONT_HEIGHT;
char_to_texture(handle, i, x, y); char_to_texture(handle, i, x, y);

28
gfx/drivers_font_renderer/freetype.c
View File

@ -24,9 +24,9 @@
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#define ATLAS_ROWS 8 #define FT_ATLAS_ROWS 8
#define ATLAS_COLS 16 #define FT_ATLAS_COLS 16
#define ATLAS_SIZE (ATLAS_ROWS * ATLAS_COLS) #define FT_ATLAS_SIZE (FT_ATLAS_ROWS * FT_ATLAS_COLS)
typedef struct freetype_renderer typedef struct freetype_renderer
{ {
@ -34,7 +34,7 @@ typedef struct freetype_renderer
FT_Face face; FT_Face face;
struct font_atlas atlas; struct font_atlas atlas;
struct font_glyph glyphs[ATLAS_SIZE]; struct font_glyph glyphs[FT_ATLAS_SIZE];
} font_renderer_t; } font_renderer_t;
static const struct font_atlas *font_renderer_ft_get_atlas(void *data) static const struct font_atlas *font_renderer_ft_get_atlas(void *data)
@ -51,7 +51,7 @@ static const struct font_glyph *font_renderer_ft_get_glyph(
font_renderer_t *handle = (font_renderer_t*)data; font_renderer_t *handle = (font_renderer_t*)data;
if (!handle) if (!handle)
return NULL; return NULL;
return code < ATLAS_SIZE ? &handle->glyphs[code] : NULL; return code < FT_ATLAS_SIZE ? &handle->glyphs[code] : NULL;
} }
static void font_renderer_ft_free(void *data) static void font_renderer_ft_free(void *data)
@ -74,13 +74,13 @@ static bool font_renderer_create_atlas(font_renderer_t *handle)
unsigned i; unsigned i;
bool ret = true; bool ret = true;
uint8_t *buffer[ATLAS_SIZE] = {NULL}; uint8_t *buffer[FT_ATLAS_SIZE] = {NULL};
unsigned pitches[ATLAS_SIZE] = {0}; unsigned pitches[FT_ATLAS_SIZE] = {0};
unsigned max_width = 0; unsigned max_width = 0;
unsigned max_height = 0; unsigned max_height = 0;
for (i = 0; i < ATLAS_SIZE; i++) for (i = 0; i < FT_ATLAS_SIZE; i++)
{ {
struct font_glyph *glyph = &handle->glyphs[i]; struct font_glyph *glyph = &handle->glyphs[i];
@ -115,8 +115,8 @@ static bool font_renderer_create_atlas(font_renderer_t *handle)
max_height = max(max_height, (unsigned)slot->bitmap.rows); max_height = max(max_height, (unsigned)slot->bitmap.rows);
} }
handle->atlas.width = max_width * ATLAS_COLS; handle->atlas.width = max_width * FT_ATLAS_COLS;
handle->atlas.height = max_height * ATLAS_ROWS; handle->atlas.height = max_height * FT_ATLAS_ROWS;
handle->atlas.buffer = (uint8_t*) handle->atlas.buffer = (uint8_t*)
calloc(handle->atlas.width * handle->atlas.height, 1); calloc(handle->atlas.width * handle->atlas.height, 1);
@ -128,12 +128,12 @@ static bool font_renderer_create_atlas(font_renderer_t *handle)
} }
/* Blit our texture atlas. */ /* Blit our texture atlas. */
for (i = 0; i < ATLAS_SIZE; i++) for (i = 0; i < FT_ATLAS_SIZE; i++)
{ {
unsigned r, c; unsigned r, c;
uint8_t *dst = NULL; uint8_t *dst = NULL;
unsigned offset_x = (i % ATLAS_COLS) * max_width; unsigned offset_x = (i % FT_ATLAS_COLS) * max_width;
unsigned offset_y = (i / ATLAS_COLS) * max_height; unsigned offset_y = (i / FT_ATLAS_COLS) * max_height;
handle->glyphs[i].atlas_offset_x = offset_x; handle->glyphs[i].atlas_offset_x = offset_x;
handle->glyphs[i].atlas_offset_y = offset_y; handle->glyphs[i].atlas_offset_y = offset_y;
@ -153,7 +153,7 @@ static bool font_renderer_create_atlas(font_renderer_t *handle)
} }
end: end:
for (i = 0; i < ATLAS_SIZE; i++) for (i = 0; i < FT_ATLAS_SIZE; i++)
free(buffer[i]); free(buffer[i]);
return ret; return ret;
} }