CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-04 01:17:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(CoreText) Preliminary font work/updating

Browse Source
This commit is contained in:
Twinaphex 2016-11-04 16:45:09 +01:00
parent 01961cbf5e
commit 103a22b3db
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gfx/drivers_font_renderer/coretext.c
View File

@ -38,10 +38,19 @@
#define CT_ATLAS_COLS 16
#define CT_ATLAS_SIZE (CT_ATLAS_ROWS * CT_ATLAS_COLS)
typedef struct coretext_atlas_slot
{
struct font_glyph glyph;
unsigned charcode;
unsigned last_used;
struct coretext_atlas_slot *next;
} coretext_atlas_slot_t;
typedef struct coretext_renderer
{
struct font_atlas atlas;
struct font_glyph glyphs[CT_ATLAS_SIZE];
coretext_atlas_slot_t atlas_slots[CT_ATLAS_SIZE];
coretext_atlas_slot_t *uc_map[0x100];
CGFloat metrics_height;
} ct_font_renderer_t;
@ -53,15 +62,18 @@ static struct font_atlas *font_renderer_ct_get_atlas(void *data)
return &handle->atlas;
}
static const struct font_glyph *font_renderer_ct_get_glyph(void *data, uint32_t code)
static const struct font_glyph *font_renderer_ct_get_glyph(
void *data, uint32_t charcode)
{
ct_font_renderer_t *handle = (ct_font_renderer_t*)data;
coretext_atlas_slot_t *atlas_slot = NULL;
ct_font_renderer_t *handle = (ct_font_renderer_t*)data;
if (!handle)
if (!handle || charcode >= CT_ATLAS_SIZE)
return NULL;
if (code >= CT_ATLAS_SIZE)
return NULL;
return &handle->glyphs[code];
atlas_slot = (coretext_atlas_slot_t*)&handle->atlas_slots[charcode];
return &atlas_slot->glyph;
}
static void font_renderer_ct_free(void *data)
@ -75,7 +87,7 @@ static void font_renderer_ct_free(void *data)
free(handle);
}
static bool font_renderer_create_atlas(CTFontRef face, ct_font_renderer_t *handle)
static bool coretext_font_renderer_create_atlas(CTFontRef face, ct_font_renderer_t *handle)
{
int max_width, max_height;
unsigned i;
@ -126,7 +138,7 @@ static bool font_renderer_create_atlas(CTFontRef face, ct_font_renderer_t *handl
for (i = 0; i < CT_ATLAS_SIZE; i++)
{
int origin_x, origin_y;
struct font_glyph *glyph = &handle->glyphs[i];
struct font_glyph *glyph = &handle->atlas_slots[i].glyph;
if (!glyph)
continue;
@ -157,10 +169,7 @@ static bool font_renderer_create_atlas(CTFontRef face, ct_font_renderer_t *handl
calloc(handle->atlas.width * handle->atlas.height, 1);
if (!handle->atlas.buffer)
{
ret = false;
goto end;
}
return false;
bytesPerRow = max_width;
bitmapData = calloc(max_height, bytesPerRow);
@ -182,7 +191,7 @@ static bool font_renderer_create_atlas(CTFontRef face, ct_font_renderer_t *handl
CFStringRef glyph_cfstr;
CFAttributedStringRef attrString;
CTLineRef line;
struct font_glyph *glyph = &handle->glyphs[i];
struct font_glyph *glyph = &handle->atlas_slots[i].glyph;
if (!glyph)
continue;
@ -240,7 +249,6 @@ static bool font_renderer_create_atlas(CTFontRef face, ct_font_renderer_t *handl
offscreen = NULL;
free(bitmapData);
end:
return ret;
}
@ -273,7 +281,7 @@ static void *font_renderer_ct_init(const char *font_path, float font_size)
goto error;
}
if (!font_renderer_create_atlas(face, handle))
if (!coretext_font_renderer_create_atlas(face, handle))
{
err = 1;
goto error;