Rename gl_font_raster_block to gfx_font_raster_block

This commit is contained in:
twinaphex 2015-07-12 04:07:06 +02:00
parent 4c1562fb70
commit 6bb0d87d87
4 changed files with 7 additions and 7 deletions

View File

@ -230,11 +230,11 @@ typedef struct gfx_coord_array
unsigned allocated; unsigned allocated;
} gfx_coord_array_t; } gfx_coord_array_t;
typedef struct gl_raster_block typedef struct gfx_raster_block
{ {
bool fullscreen; bool fullscreen;
gfx_coord_array_t carr; gfx_coord_array_t carr;
} gl_font_raster_block_t; } gfx_font_raster_block_t;
struct gl_font_renderer; struct gl_font_renderer;

View File

@ -44,7 +44,7 @@ typedef struct
const font_renderer_driver_t *font_driver; const font_renderer_driver_t *font_driver;
void *font_data; void *font_data;
gl_font_raster_block_t *block; gfx_font_raster_block_t *block;
} gl_raster_t; } gl_raster_t;
static void *gl_raster_font_init_font(void *data, static void *gl_raster_font_init_font(void *data,
@ -430,7 +430,7 @@ static const struct font_glyph *gl_raster_font_get_glyph(
static void gl_raster_font_flush_block(void *data) static void gl_raster_font_flush_block(void *data)
{ {
gl_raster_t *font = (gl_raster_t*)data; gl_raster_t *font = (gl_raster_t*)data;
gl_font_raster_block_t *block = font->block; gfx_font_raster_block_t *block = font->block;
if (font && block->carr.coords.vertices) if (font && block->carr.coords.vertices)
{ {
@ -443,7 +443,7 @@ static void gl_raster_font_flush_block(void *data)
static void gl_raster_font_bind_block(void *data, void *userdata) static void gl_raster_font_bind_block(void *data, void *userdata)
{ {
gl_raster_t *font = (gl_raster_t*)data; gl_raster_t *font = (gl_raster_t*)data;
gl_font_raster_block_t *block = (gl_font_raster_block_t*)userdata; gfx_font_raster_block_t *block = (gfx_font_raster_block_t*)userdata;
if (font) if (font)
font->block = block; font->block = block;

View File

@ -55,7 +55,7 @@ typedef struct glui_handle
GLuint white; GLuint white;
} textures; } textures;
gl_font_raster_block_t list_block; gfx_font_raster_block_t list_block;
} glui_handle_t; } glui_handle_t;
static void glui_blit_line(float x, float y, static void glui_blit_line(float x, float y,

View File

@ -222,7 +222,7 @@ typedef struct xmb_handle
xmb_node_t settings_node; xmb_node_t settings_node;
bool prevent_populate; bool prevent_populate;
gl_font_raster_block_t raster_block; gfx_font_raster_block_t raster_block;
} xmb_handle_t; } xmb_handle_t;
static const GLfloat rmb_vertex[] = { static const GLfloat rmb_vertex[] = {