Merge Hekate fixes to gfx, minerva

This commit is contained in:
shchmue 2019-12-29 14:32:37 -07:00
parent fa41ad507f
commit a55e62d45a
2 changed files with 3 additions and 1 deletions

View File

@ -188,7 +188,7 @@ void gfx_putc(char c)
for (u32 i = 0; i < 16; i+=2) for (u32 i = 0; i < 16; i+=2)
{ {
u8 v = *cbuf++; u8 v = *cbuf;
for (u32 k = 0; k < 2; k++) for (u32 k = 0; k < 2; k++)
{ {
for (u32 j = 0; j < 8; j++) for (u32 j = 0; j < 8; j++)
@ -213,6 +213,7 @@ void gfx_putc(char c)
fb += gfx_ctxt.stride - 16; fb += gfx_ctxt.stride - 16;
v = *cbuf; v = *cbuf;
} }
cbuf++;
} }
gfx_con.x += 16; gfx_con.x += 16;
if (gfx_con.x >= gfx_ctxt.width - 16) { if (gfx_con.x >= gfx_ctxt.width - 16) {

View File

@ -32,6 +32,7 @@ u32 minerva_init()
{ {
u32 curr_ram_idx = 0; u32 curr_ram_idx = 0;
minerva_cfg = NULL;
mtc_config_t *mtc_cfg = (mtc_config_t *)&nyx_str->mtc_cfg; mtc_config_t *mtc_cfg = (mtc_config_t *)&nyx_str->mtc_cfg;
// Set table to nyx storage. // Set table to nyx storage.