walkero
/
lite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made rencache warn on exhausting command buffer instead of panicing

This commit is contained in:
rxi 2020-05-14 08:52:07 +01:00
parent 4c2c03ed4d
commit 9bf0ed2419
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/rencache.c
View File

@ -78,13 +78,13 @@ static RenRect merge_rects(RenRect a, RenRect b) {
static Command* push_command(int type, int size) { static Command* push_command(int type, int size) {
Command *cmd = (Command*) (command_buf + command_buf_idx); Command *cmd = (Command*) (command_buf + command_buf_idx);
memset(cmd, 0, sizeof(Command));
int n = command_buf_idx + size; int n = command_buf_idx + size;
if (n > COMMAND_BUF_SIZE) { if (n > COMMAND_BUF_SIZE) {
fprintf(stderr, "Fatal error in " __FILE__ ": exhausted command buffer\n"); fprintf(stderr, "Warning: (" __FILE__ "): exhausted command buffer\n");
exit(EXIT_FAILURE); return NULL;
} }
command_buf_idx = n; command_buf_idx = n;
memset(cmd, 0, sizeof(Command));
cmd->type = type; cmd->type = type;
cmd->size = size; cmd->size = size;
return cmd; return cmd;
@ -121,8 +121,10 @@ void rencache_set_clip_rect(RenRect rect) {
void rencache_draw_rect(RenRect rect, RenColor color) { void rencache_draw_rect(RenRect rect, RenColor color) {
if (!rects_overlap(screen_rect, rect)) { return; } if (!rects_overlap(screen_rect, rect)) { return; }
Command *cmd = push_command(DRAW_RECT, sizeof(Command)); Command *cmd = push_command(DRAW_RECT, sizeof(Command));
cmd->rect = rect; if (cmd) {
cmd->color = color; cmd->rect = rect;
cmd->color = color;
}
} }
@ -136,10 +138,12 @@ int rencache_draw_text(RenFont *font, const char *text, int x, int y, RenColor c
if (rects_overlap(screen_rect, rect)) { if (rects_overlap(screen_rect, rect)) {
int sz = strlen(text) + 1; int sz = strlen(text) + 1;
Command *cmd = push_command(DRAW_TEXT, sizeof(Command) + sz); Command *cmd = push_command(DRAW_TEXT, sizeof(Command) + sz);
memcpy(cmd->text, text, sz); if (cmd) {
cmd->color = color; memcpy(cmd->text, text, sz);
cmd->font = font; cmd->color = color;
cmd->rect = rect; cmd->font = font;
cmd->rect = rect;
}
} }
return x + rect.width; return x + rect.width;