Mercurial > repos > blastem
diff blastem.c @ 492:dffc07104b09
Merged OpenGL branch
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Sun, 27 Oct 2013 22:08:02 -0700 |
parents | 32f053ad9b02 |
children | 6fc71114d145 |
line wrap: on
line diff
--- a/blastem.c Thu Oct 03 21:22:05 2013 -0700 +++ b/blastem.c Sun Oct 27 22:08:02 2013 -0700 @@ -278,9 +278,9 @@ adjust_int_cycle(context, v_context); if (address) { if (break_on_sync) { - break_on_sync = 0; - debugger(context, address); - } + break_on_sync = 0; + debugger(context, address); + } if (save_state) { save_state = 0; while (!z_context->pc) @@ -1507,7 +1507,7 @@ context->master_clock = ((uint64_t)context->normal_clock * (uint64_t)percent) / 100; while (context->ym->current_cycle != context->psg->cycles) { sync_sound(context, context->psg->cycles + MCLKS_PER_PSG); - } +} ym_adjust_master_clock(context->ym, context->master_clock); psg_adjust_master_clock(context->psg, context->master_clock); } @@ -1773,7 +1773,7 @@ char * romfname = NULL; FILE *address_log = NULL; char * statefile = NULL; - uint8_t fullscreen = 0; + uint8_t fullscreen = 0, use_gl = 0; for (int i = 1; i < argc; i++) { if (argv[i][0] == '-') { switch(argv[i][1]) { @@ -1783,6 +1783,9 @@ case 'f': fullscreen = 1; break; + case 'g': + use_gl = 1; + break; case 'l': address_log = fopen("address.log", "w"); break; @@ -1885,7 +1888,7 @@ fps = 50; } if (!headless) { - render_init(width, height, title, fps, fullscreen); + render_init(width, height, title, fps, fullscreen, use_gl); } vdp_context v_context; genesis_context gen;