From 855070a2870b7f2fe777fded9bb705385f6cd2e2 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Fri, 12 Jun 2020 19:55:06 +0200 Subject: cpu rendering working --- src/assets.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/assets.h') diff --git a/src/assets.h b/src/assets.h index 6f7e40f..8b459a8 100644 --- a/src/assets.h +++ b/src/assets.h @@ -11,7 +11,6 @@ typedef struct t_image { u8 *start_addr; u8 *end_addr; bool loaded; - bool keep_in_memory; bool is_bitmap; s32 width; s32 height; @@ -91,7 +90,7 @@ void assets_destroy(); bool assets_do_post_process(); void *assets_queue_worker(); -image *assets_load_image(u8 *start_addr, u8 *end_addr, bool keep_in_memory); +image *assets_load_image(u8 *start_addr, u8 *end_addr); void assets_destroy_image(image *image); image *assets_load_bitmap(u8 *start_addr, u8 *end_addr); @@ -100,8 +99,8 @@ void assets_destroy_bitmap(image *image); font *assets_load_font(u8 *start_addr, u8 *end_addr, s16 size); void assets_destroy_font(font *font); -#define load_image(_name, _inmem) assets_load_image(_binary____data_imgs_##_name##_start,_binary____data_imgs_##_name##_end, _inmem) -#define load_font(_name, _inmem) assets_load_font(_binary____data_fonts_##_name##_start,_binary____data_fonts_##_name##_end, _inmem) +#define load_image(_name, _inmem) assets_load_image(_binary____data_imgs_##_name##_start,_binary____data_imgs_##_name##_end) +#define load_font(_name, _size) assets_load_font(_binary____data_fonts_##_name##_start,_binary____data_fonts_##_name##_end, _size) #define load_bitmap(_name) assets_load_bitmap(_binary____data_imgs_##_name##_start,_binary____data_imgs_##_name##_end) #endif \ No newline at end of file -- cgit v1.2.3-70-g09d2