repos/blastem: render_sdl.c annotate

annotate render_sdl.c @ 1936:2c1c88cd1a3f mame_interp

Merge from default

author	Michael Pavone <pavone@retrodev.com>
date	Sun, 19 Apr 2020 00:59:09 -0700
parents	16a795cababd
children	5a76a7373823

rev	line source
467 140af5509ce7 Added copyright notice to source files and added GPL license text in COPYING Mike Pavone <pavone@retrodev.com> parents: 445 diff changeset	1 /*
140af5509ce7 Added copyright notice to source files and added GPL license text in COPYING Mike Pavone <pavone@retrodev.com> parents: 445 diff changeset	2 Copyright 2013 Michael Pavone
487 c08a4efeee7f Update opengl branch from default. Fix build breakage unrelated to merge Mike Pavone <pavone@retrodev.com> parents: 449 486 diff changeset	3 This file is part of BlastEm.
467 140af5509ce7 Added copyright notice to source files and added GPL license text in COPYING Mike Pavone <pavone@retrodev.com> parents: 445 diff changeset	4 BlastEm is free software distributed under the terms of the GNU General Public License version 3 or greater. See COPYING for full license text.
140af5509ce7 Added copyright notice to source files and added GPL license text in COPYING Mike Pavone <pavone@retrodev.com> parents: 445 diff changeset	5 */
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	6 #include <stdlib.h>
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	7 #include <stdio.h>
745 daa31ee7d8cd Get windows build compiling again post-merge Michael Pavone <pavone@retrodev.com> parents: 744 diff changeset	8 #include <string.h>
500 251fe7a75a14 Preserve aspect ratio unless config file says otherwise Mike Pavone <pavone@retrodev.com> parents: 498 diff changeset	9 #include <math.h>
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	10 #include "render.h"
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	11 #include "render_sdl.h"
66 7a22a0e6c004 Gamepad support Mike Pavone <pavone@retrodev.com> parents: 64 diff changeset	12 #include "blastem.h"
1103 22e87b739ad6 WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well. Michael Pavone <pavone@retrodev.com> parents: 1102 diff changeset	13 #include "genesis.h"
1583 430dd12e4010 Refactor to split device bindings from IO emulation code Michael Pavone <pavone@retrodev.com> parents: 1580 diff changeset	14 #include "bindings.h"
497 0820a71b80f3 Move shader files to their own directory. Read shaders from /.config/blastem/shaders or from path_to_exe/shaders instead of the current working directory. Mike Pavone <pavone@retrodev.com> parents: 495 diff changeset	15 #include "util.h"
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	16 #include "paths.h"
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	17 #include "ppm.h"
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	18 #include "png.h"
1555 6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	19 #include "config.h"
1603 c0727712d529 Read extral SDL2 mappings on startup from controller_types.cfg Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	20 #include "controller_info.h"
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	21
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	22 #ifndef DISABLE_OPENGL
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	23 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	24 #include <SDL_opengles2.h>
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	25 #else
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	26 #include <GL/glew.h>
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	27 #endif
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	28 #endif
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	29
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	30 #define MAX_EVENT_POLL_PER_FRAME 2
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	31
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	32 static SDL_Window *main_window;
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	33 static SDL_Window **extra_windows;
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	34 static SDL_Renderer *main_renderer;
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	35 static SDL_Renderer **extra_renderers;
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	36 static SDL_Texture **sdl_textures;
1649 b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	37 static window_close_handler *close_handlers;
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	38 static uint8_t num_textures;
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	39 static SDL_Rect main_clip;
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	40 static SDL_GLContext *main_context;
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	41
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	42 static int main_width, main_height, windowed_width, windowed_height, is_fullscreen;
914 28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	43
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	44 static uint8_t render_gl = 1;
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	45 static uint8_t scanlines = 0;
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	46
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	47 static uint32_t last_frame = 0;
54 3b79cbcf6846 Get Flavio's color bar demo kind of sort of working Mike Pavone <pavone@retrodev.com> parents: 43 diff changeset	48
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	49 static SDL_mutex audio_mutex, frame_mutex, *free_buffer_mutex;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	50 static SDL_cond audio_ready, frame_ready;
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	51 static uint8_t quitting = 0;
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	52
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	53 static uint8_t sync_to_audio, run_on_audio_thread;
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	54 static uint32_t min_buffered;
354 15dd6418fe67 Initial PSG support. Mostly works, noise channel is borked though. Mike Pavone <pavone@retrodev.com> parents: 342 diff changeset	55
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	56 uint32_t **frame_buffers;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	57 uint32_t num_buffers;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	58 uint32_t buffer_storage;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	59
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	60 uint32_t render_min_buffered(void)
1552 13a82adb185b Add support for float32 format audio samples Michael Pavone <pavone@retrodev.com> parents: 1551 diff changeset	61 {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	62 return min_buffered;
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	63 }
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	64
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	65 uint8_t render_is_audio_sync(void)
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	66 {
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	67 return sync_to_audio \|\| run_on_audio_thread;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	68 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	69
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	70 uint8_t render_should_release_on_exit(void)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	71 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	72 return !run_on_audio_thread;
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	73 }
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	74
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	75 void render_buffer_consumed(audio_source *src)
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	76 {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	77 SDL_CondSignal(src->opaque);
1552 13a82adb185b Add support for float32 format audio samples Michael Pavone <pavone@retrodev.com> parents: 1551 diff changeset	78 }
13a82adb185b Add support for float32 format audio samples Michael Pavone <pavone@retrodev.com> parents: 1551 diff changeset	79
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	80 static void audio_callback(void * userdata, uint8_t *byte_stream, int len)
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	81 {
354 15dd6418fe67 Initial PSG support. Mostly works, noise channel is borked though. Mike Pavone <pavone@retrodev.com> parents: 342 diff changeset	82 SDL_LockMutex(audio_mutex);
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	83 uint8_t all_ready;
364 62177cc39049 Incredibly broken YM2612 support plus a fix to Z80 bus request Mike Pavone <pavone@retrodev.com> parents: 361 diff changeset	84 do {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	85 all_ready = all_sources_ready();
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	86 if (!quitting && !all_ready) {
364 62177cc39049 Incredibly broken YM2612 support plus a fix to Z80 bus request Mike Pavone <pavone@retrodev.com> parents: 361 diff changeset	87 SDL_CondWait(audio_ready, audio_mutex);
62177cc39049 Incredibly broken YM2612 support plus a fix to Z80 bus request Mike Pavone <pavone@retrodev.com> parents: 361 diff changeset	88 }
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	89 } while(!quitting && !all_ready);
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	90 if (!quitting) {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	91 mix_and_convert(byte_stream, len, NULL);
361 946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	92 }
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	93 SDL_UnlockMutex(audio_mutex);
1117 928a65750345 Initial support for Genesis/Megadrive PBC mode. VDP still needs Mode 4 to be useful. Michael Pavone <pavone@retrodev.com> parents: 1103 diff changeset	94 }
928a65750345 Initial support for Genesis/Megadrive PBC mode. VDP still needs Mode 4 to be useful. Michael Pavone <pavone@retrodev.com> parents: 1103 diff changeset	95
1564 48b08986bf8f Mostly working dynamic rate control. Needs some tweaking, especially for PAL Michael Pavone <pavone@retrodev.com> parents: 1563 diff changeset	96 #define NO_LAST_BUFFERED -2000000000
48b08986bf8f Mostly working dynamic rate control. Needs some tweaking, especially for PAL Michael Pavone <pavone@retrodev.com> parents: 1563 diff changeset	97 static int32_t last_buffered = NO_LAST_BUFFERED;
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	98 static float average_change;
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	99 #define BUFFER_FRAMES_THRESHOLD 6
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	100 #define BASE_MAX_ADJUST 0.0125
1565 61fafcbc2c38 Audio DRC now sounds good in both NTSC and PAL, just need to adjust constants to minimize latency without leading to dropouts Michael Pavone <pavone@retrodev.com> parents: 1564 diff changeset	101 static float max_adjust;
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	102 static int32_t cur_min_buffered;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	103 static uint32_t min_remaining_buffer;
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	104 static void audio_callback_drc(void userData, uint8_t byte_stream, int len)
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	105 {
1589 780604a036e4 Limit underflow warning spam Michael Pavone <pavone@retrodev.com> parents: 1588 diff changeset	106 if (cur_min_buffered < 0) {
780604a036e4 Limit underflow warning spam Michael Pavone <pavone@retrodev.com> parents: 1588 diff changeset	107 //underflow last frame, but main thread hasn't gotten a chance to call SDL_PauseAudio yet
780604a036e4 Limit underflow warning spam Michael Pavone <pavone@retrodev.com> parents: 1588 diff changeset	108 return;
780604a036e4 Limit underflow warning spam Michael Pavone <pavone@retrodev.com> parents: 1588 diff changeset	109 }
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	110 cur_min_buffered = mix_and_convert(byte_stream, len, &min_remaining_buffer);
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	111 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	112
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	113 static void audio_callback_run_on_audio(void user_data, uint8_t byte_stream, int len)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	114 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	115 if (current_system) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	116 current_system->resume_context(current_system);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	117 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	118 mix_and_convert(byte_stream, len, NULL);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	119 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	120
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	121 void render_lock_audio()
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	122 {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	123 if (sync_to_audio) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	124 SDL_LockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	125 } else {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	126 SDL_LockAudio();
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	127 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	128 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	129
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	130 void render_unlock_audio()
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	131 {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	132 if (sync_to_audio) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	133 SDL_UnlockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	134 } else {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	135 SDL_UnlockAudio();
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	136 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	137 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	138
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	139 static void render_close_audio()
361 946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	140 {
946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	141 SDL_LockMutex(audio_mutex);
946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	142 quitting = 1;
946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	143 SDL_CondSignal(audio_ready);
946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	144 SDL_UnlockMutex(audio_mutex);
946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	145 SDL_CloseAudio();
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	146 /*
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	147 FIXME: move this to render_audio.c
1797 5ff8f0d28188 Make sure there are no races between main thread and audio thread around mix_buf. Fix lack of proper termination in shader loading code Mike Pavone <pavone@retrodev.com> parents: 1796 diff changeset	148 if (mix_buf) {
5ff8f0d28188 Make sure there are no races between main thread and audio thread around mix_buf. Fix lack of proper termination in shader loading code Mike Pavone <pavone@retrodev.com> parents: 1796 diff changeset	149 free(mix_buf);
5ff8f0d28188 Make sure there are no races between main thread and audio thread around mix_buf. Fix lack of proper termination in shader loading code Mike Pavone <pavone@retrodev.com> parents: 1796 diff changeset	150 mix_buf = NULL;
5ff8f0d28188 Make sure there are no races between main thread and audio thread around mix_buf. Fix lack of proper termination in shader loading code Mike Pavone <pavone@retrodev.com> parents: 1796 diff changeset	151 }
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	152 */
361 946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	153 }
946ae3749260 Fix deadlock on quit Mike Pavone <pavone@retrodev.com> parents: 356 diff changeset	154
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	155 void *render_new_audio_opaque(void)
1555 6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	156 {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	157 return SDL_CreateCond();
1555 6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	158 }
6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	159
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	160 void render_free_audio_opaque(void *opaque)
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	161 {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	162 SDL_DestroyCond(opaque);
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	163 }
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	164
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	165 void render_audio_created(audio_source *source)
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	166 {
1574 ade5b8148caa Fix sync to audio option Michael Pavone <pavone@retrodev.com> parents: 1573 diff changeset	167 if (sync_to_audio && SDL_GetAudioStatus() == SDL_AUDIO_PAUSED) {
ade5b8148caa Fix sync to audio option Michael Pavone <pavone@retrodev.com> parents: 1573 diff changeset	168 SDL_PauseAudio(0);
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	169 }
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	170 if (current_system) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	171 current_system->request_exit(current_system);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	172 }
1796 51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	173 }
51417bb557b6 Configurable gain for overall output and individual components Michael Pavone <pavone@retrodev.com> parents: 1792 diff changeset	174
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	175 void render_source_paused(audio_source *src, uint8_t remaining_sources)
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	176 {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	177 if (sync_to_audio) {
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	178 SDL_CondSignal(audio_ready);
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	179 }
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	180 if (!remaining_sources) {
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	181 SDL_PauseAudio(0);
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	182 }
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	183 }
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	184
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	185 void render_source_resumed(audio_source *src)
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	186 {
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	187 if (sync_to_audio) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	188 SDL_PauseAudio(0);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	189 }
1551 ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	190 }
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend Michael Pavone <pavone@retrodev.com> parents: 1534 diff changeset	191
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	192 void render_do_audio_ready(audio_source *src)
1555 6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	193 {
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	194 if (run_on_audio_thread) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	195 int16_t *tmp = src->front;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	196 src->front = src->back;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	197 src->back = tmp;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	198 src->front_populated = 1;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	199 src->buffer_pos = 0;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	200 if (all_sources_ready()) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	201 //we've emulated far enough to fill the current buffer
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	202 current_system->request_exit(current_system);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	203 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	204 } else if (sync_to_audio) {
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	205 SDL_LockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	206 while (src->front_populated) {
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	207 SDL_CondWait(src->opaque, audio_mutex);
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	208 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	209 int16_t *tmp = src->front;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	210 src->front = src->back;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	211 src->back = tmp;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	212 src->front_populated = 1;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	213 src->buffer_pos = 0;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	214 SDL_CondSignal(audio_ready);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	215 SDL_UnlockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	216 } else {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	217 uint32_t num_buffered;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	218 SDL_LockAudio();
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	219 src->read_end = src->buffer_pos;
1565 61fafcbc2c38 Audio DRC now sounds good in both NTSC and PAL, just need to adjust constants to minimize latency without leading to dropouts Michael Pavone <pavone@retrodev.com> parents: 1564 diff changeset	220 num_buffered = ((src->read_end - src->read_start) & src->mask) / src->num_channels;
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	221 SDL_UnlockAudio();
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	222 if (num_buffered >= min_buffered && SDL_GetAudioStatus() == SDL_AUDIO_PAUSED) {
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	223 SDL_PauseAudio(0);
1555 6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	224 }
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	225 }
1555 6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	226 }
6ce36c3f250b More audio refactoring in preparation for allowing proper sync to video with dynamic audio rate control Michael Pavone <pavone@retrodev.com> parents: 1552 diff changeset	227
937 9364dad5561a Added reasonable handling of joystick hotplug Michael Pavone <pavone@retrodev.com> parents: 915 diff changeset	228 static SDL_Joystick * joysticks[MAX_JOYSTICKS];
1187 6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	229 static int joystick_sdl_index[MAX_JOYSTICKS];
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	230 static uint8_t joystick_index_locked[MAX_JOYSTICKS];
432 18cde14e8c10 Read joystick bindings from config file Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	231
914 28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	232 int render_width()
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	233 {
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	234 return main_width;
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	235 }
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	236
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	237 int render_height()
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	238 {
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	239 return main_height;
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	240 }
28ec32e720b2 Scale mouse data based on window size Michael Pavone <pavone@retrodev.com> parents: 907 diff changeset	241
915 9e882eca717e Initial support for relative mouse mode and skeleton of support for capture mode. Avoid mouse position overflow in absolute mode. Allow absolute mode to be set by ROM DB. Michael Pavone <pavone@retrodev.com> parents: 914 diff changeset	242 int render_fullscreen()
9e882eca717e Initial support for relative mouse mode and skeleton of support for capture mode. Avoid mouse position overflow in absolute mode. Allow absolute mode to be set by ROM DB. Michael Pavone <pavone@retrodev.com> parents: 914 diff changeset	243 {
9e882eca717e Initial support for relative mouse mode and skeleton of support for capture mode. Avoid mouse position overflow in absolute mode. Allow absolute mode to be set by ROM DB. Michael Pavone <pavone@retrodev.com> parents: 914 diff changeset	244 return is_fullscreen;
9e882eca717e Initial support for relative mouse mode and skeleton of support for capture mode. Avoid mouse position overflow in absolute mode. Allow absolute mode to be set by ROM DB. Michael Pavone <pavone@retrodev.com> parents: 914 diff changeset	245 }
9e882eca717e Initial support for relative mouse mode and skeleton of support for capture mode. Avoid mouse position overflow in absolute mode. Allow absolute mode to be set by ROM DB. Michael Pavone <pavone@retrodev.com> parents: 914 diff changeset	246
426 add9e2f5c0e3 Make VDP render in native pixel format of the renderer for a modest performance gain and to make it easier to use OpenGL for rendering Mike Pavone <pavone@retrodev.com> parents: 421 diff changeset	247 uint32_t render_map_color(uint8_t r, uint8_t g, uint8_t b)
add9e2f5c0e3 Make VDP render in native pixel format of the renderer for a modest performance gain and to make it easier to use OpenGL for rendering Mike Pavone <pavone@retrodev.com> parents: 421 diff changeset	248 {
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	249 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	250 return 255 << 24 \| b << 16 \| g << 8 \| r;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	251 #else
719 019d27995e32 Upgrade to SDL 2.0 and drop support for the non-OpenGL render path Michael Pavone <pavone@retrodev.com> parents: 655 diff changeset	252 return 255 << 24 \| r << 16 \| g << 8 \| b;
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	253 #endif
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	254 }
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	255
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	256 #ifndef DISABLE_OPENGL
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	257 static GLuint textures[3], buffers[2], vshader, fshader, program, un_textures[2], un_width, un_height, at_pos;
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	258
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	259 static GLfloat vertex_data_default[] = {
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	260 -1.0f, -1.0f,
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	261 1.0f, -1.0f,
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	262 -1.0f, 1.0f,
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	263 1.0f, 1.0f
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	264 };
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	265
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	266 static GLfloat vertex_data[8];
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	267
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	268 static const GLushort element_data[] = {0, 1, 2, 3};
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	269
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	270 static const GLchar shader_prefix[] =
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	271 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	272 "#version 100\n";
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	273 #else
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	274 "#version 110\n"
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	275 "#define lowp\n"
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	276 "#define mediump\n"
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	277 "#define highp\n";
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	278 #endif
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	279
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	280 static GLuint load_shader(char * fname, GLenum shader_type)
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	281 {
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	282 char * shader_path;
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	283 FILE *f;
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	284 GLchar *text;
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	285 long fsize;
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	286 #ifndef __ANDROID__
884 252dfd29831d Selecting a second game from the menu now works Michael Pavone <pavone@retrodev.com> parents: 874 diff changeset	287 char const * parts[] = {get_home_dir(), "/.config/blastem/shaders/", fname};
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	288 shader_path = alloc_concat_m(3, parts);
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	289 f = fopen(shader_path, "rb");
497 0820a71b80f3 Move shader files to their own directory. Read shaders from /.config/blastem/shaders or from path_to_exe/shaders instead of the current working directory. Mike Pavone <pavone@retrodev.com> parents: 495 diff changeset	290 free(shader_path);
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	291 if (f) {
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	292 fsize = file_size(f);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	293 text = malloc(fsize);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	294 if (fread(text, 1, fsize, f) != fsize) {
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	295 warning("Error reading from shader file %s\n", fname);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	296 free(text);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	297 return 0;
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	298 }
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	299 } else {
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	300 #endif
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	301 shader_path = path_append("shaders", fname);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	302 uint32_t fsize32;
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	303 text = read_bundled_file(shader_path, &fsize32);
497 0820a71b80f3 Move shader files to their own directory. Read shaders from /.config/blastem/shaders or from path_to_exe/shaders instead of the current working directory. Mike Pavone <pavone@retrodev.com> parents: 495 diff changeset	304 free(shader_path);
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	305 if (!text) {
800 ec23202df6a6 Minor cleanup Michael Pavone <pavone@retrodev.com> parents: 799 diff changeset	306 warning("Failed to open shader file %s for reading\n", fname);
497 0820a71b80f3 Move shader files to their own directory. Read shaders from /.config/blastem/shaders or from path_to_exe/shaders instead of the current working directory. Mike Pavone <pavone@retrodev.com> parents: 495 diff changeset	307 return 0;
0820a71b80f3 Move shader files to their own directory. Read shaders from /.config/blastem/shaders or from path_to_exe/shaders instead of the current working directory. Mike Pavone <pavone@retrodev.com> parents: 495 diff changeset	308 }
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	309 fsize = fsize32;
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	310 #ifndef __ANDROID__
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	311 }
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	312 #endif
1797 5ff8f0d28188 Make sure there are no races between main thread and audio thread around mix_buf. Fix lack of proper termination in shader loading code Mike Pavone <pavone@retrodev.com> parents: 1796 diff changeset	313 text[fsize] = 0;
1693 ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable Michael Pavone <pavone@retrodev.com> parents: 1686 diff changeset	314
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	315 if (strncmp(text, "#version", strlen("#version"))) {
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	316 GLchar *tmp = text;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	317 text = alloc_concat(shader_prefix, tmp);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	318 free(tmp);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	319 fsize += strlen(shader_prefix);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	320 }
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	321 GLuint ret = glCreateShader(shader_type);
1820 70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	322 if (!ret) {
70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	323 warning("glCreateShader failed with error %d\n", glGetError());
70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	324 return 0;
70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	325 }
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	326 glShaderSource(ret, 1, (const GLchar *)&text, (const GLint )&fsize);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	327 free(text);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	328 glCompileShader(ret);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	329 GLint compile_status, loglen;
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	330 glGetShaderiv(ret, GL_COMPILE_STATUS, &compile_status);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	331 if (!compile_status) {
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	332 glGetShaderiv(ret, GL_INFO_LOG_LENGTH, &loglen);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	333 text = malloc(loglen);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	334 glGetShaderInfoLog(ret, loglen, NULL, text);
800 ec23202df6a6 Minor cleanup Michael Pavone <pavone@retrodev.com> parents: 799 diff changeset	335 warning("Shader %s failed to compile:\n%s\n", fname, text);
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	336 free(text);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	337 glDeleteShader(ret);
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	338 return 0;
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	339 }
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	340 return ret;
32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	341 }
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	342 #endif
488 32f053ad9b02 Basic OpenGL rendering is working Mike Pavone <pavone@retrodev.com> parents: 487 diff changeset	343
1167 e758ddbf0624 Initial work on emulating top and bottom border area Michael Pavone <pavone@retrodev.com> parents: 1117 diff changeset	344 static uint32_t texture_buf[512 * 513];
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	345 #ifdef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	346 #define RENDER_FORMAT SDL_PIXELFORMAT_ARGB8888
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	347 #else
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	348 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	349 #define INTERNAL_FORMAT GL_RGBA
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	350 #define SRC_FORMAT GL_RGBA
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	351 #define RENDER_FORMAT SDL_PIXELFORMAT_ABGR8888
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	352 #else
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	353 #define INTERNAL_FORMAT GL_RGBA8
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	354 #define SRC_FORMAT GL_BGRA
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	355 #define RENDER_FORMAT SDL_PIXELFORMAT_ARGB8888
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	356 #endif
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	357 static void gl_setup()
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	358 {
1403 87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	359 tern_val def = {.ptrval = "linear"};
87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	360 char *scaling = tern_find_path_default(config, "video\0scaling\0", def, TVAL_PTR).ptrval;
87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	361 GLint filter = strcmp(scaling, "linear") ? GL_NEAREST : GL_LINEAR;
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	362 glGenTextures(3, textures);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	363 for (int i = 0; i < 3; i++)
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	364 {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	365 glBindTexture(GL_TEXTURE_2D, textures[i]);
1403 87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	366 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	367 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	368 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	369 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	370 if (i < 2) {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	371 //TODO: Fixme for PAL + invalid display mode
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	372 glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT, 512, 512, 0, SRC_FORMAT, GL_UNSIGNED_BYTE, texture_buf);
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	373 } else {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	374 uint32_t blank = 255 << 24;
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	375 glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT, 1, 1, 0, SRC_FORMAT, GL_UNSIGNED_BYTE, &blank);
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	376 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	377 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	378 glGenBuffers(2, buffers);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	379 glBindBuffer(GL_ARRAY_BUFFER, buffers[0]);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	380 glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	381 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffers[1]);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	382 glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(element_data), element_data, GL_STATIC_DRAW);
1403 87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	383 def.ptrval = "default.v.glsl";
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	384 vshader = load_shader(tern_find_path_default(config, "video\0vertex_shader\0", def, TVAL_PTR).ptrval, GL_VERTEX_SHADER);
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	385 def.ptrval = "default.f.glsl";
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	386 fshader = load_shader(tern_find_path_default(config, "video\0fragment_shader\0", def, TVAL_PTR).ptrval, GL_FRAGMENT_SHADER);
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	387 program = glCreateProgram();
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	388 glAttachShader(program, vshader);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	389 glAttachShader(program, fshader);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	390 glLinkProgram(program);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	391 GLint link_status;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	392 glGetProgramiv(program, GL_LINK_STATUS, &link_status);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	393 if (!link_status) {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	394 fputs("Failed to link shader program\n", stderr);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	395 exit(1);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	396 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	397 un_textures[0] = glGetUniformLocation(program, "textures[0]");
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	398 un_textures[1] = glGetUniformLocation(program, "textures[1]");
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	399 un_width = glGetUniformLocation(program, "width");
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	400 un_height = glGetUniformLocation(program, "height");
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	401 at_pos = glGetAttribLocation(program, "pos");
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	402 }
1593 24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	403
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	404 static void gl_teardown()
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	405 {
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	406 glDeleteProgram(program);
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	407 glDeleteShader(vshader);
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	408 glDeleteShader(fshader);
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	409 glDeleteBuffers(2, buffers);
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	410 glDeleteTextures(3, textures);
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	411 }
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	412 #endif
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	413
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	414 static uint8_t texture_init;
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	415 static void render_alloc_surfaces()
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	416 {
884 252dfd29831d Selecting a second game from the menu now works Michael Pavone <pavone@retrodev.com> parents: 874 diff changeset	417 if (texture_init) {
252dfd29831d Selecting a second game from the menu now works Michael Pavone <pavone@retrodev.com> parents: 874 diff changeset	418 return;
252dfd29831d Selecting a second game from the menu now works Michael Pavone <pavone@retrodev.com> parents: 874 diff changeset	419 }
1895 33c0c4579c1f Fix debug view window stuff that got broken when FRAMEBUFFER_UI got added Michael Pavone <pavone@retrodev.com> parents: 1881 diff changeset	420 sdl_textures= calloc(sizeof(SDL_Texture *), 3);
33c0c4579c1f Fix debug view window stuff that got broken when FRAMEBUFFER_UI got added Michael Pavone <pavone@retrodev.com> parents: 1881 diff changeset	421 num_textures = 3;
884 252dfd29831d Selecting a second game from the menu now works Michael Pavone <pavone@retrodev.com> parents: 874 diff changeset	422 texture_init = 1;
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	423 #ifndef DISABLE_OPENGL
062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	424 if (render_gl) {
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	425 gl_setup();
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	426 } else {
062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	427 #endif
1403 87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	428 tern_val def = {.ptrval = "linear"};
87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	429 char *scaling = tern_find_path_default(config, "video\0scaling\0", def, TVAL_PTR).ptrval;
87493f585c7f Allow selecting linear or nearet neighbor scaling for both the Open GL and SDL 2 renderers Michael Pavone <pavone@retrodev.com> parents: 1402 diff changeset	430 SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, scaling);
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	431 //TODO: Fixme for invalid display mode
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	432 sdl_textures[0] = sdl_textures[1] = SDL_CreateTexture(main_renderer, RENDER_FORMAT, SDL_TEXTUREACCESS_STREAMING, LINEBUF_SIZE, 588);
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	433 #ifndef DISABLE_OPENGL
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	434 }
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	435 #endif
426 add9e2f5c0e3 Make VDP render in native pixel format of the renderer for a modest performance gain and to make it easier to use OpenGL for rendering Mike Pavone <pavone@retrodev.com> parents: 421 diff changeset	436 }
add9e2f5c0e3 Make VDP render in native pixel format of the renderer for a modest performance gain and to make it easier to use OpenGL for rendering Mike Pavone <pavone@retrodev.com> parents: 421 diff changeset	437
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	438 static void free_surfaces(void)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	439 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	440 for (int i = 0; i < num_textures; i++)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	441 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	442 if (sdl_textures[i]) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	443 SDL_DestroyTexture(sdl_textures[i]);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	444 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	445 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	446 free(sdl_textures);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	447 sdl_textures = NULL;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	448 texture_init = 0;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	449 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	450
1102 c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	451 static char * caption = NULL;
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code Michael Pavone <pavone@retrodev.com> parents: 1077 diff changeset	452 static char * fps_caption = NULL;
486 db5880d8ea03 Add an FPS counter to the title bar Mike Pavone <pavone@retrodev.com> parents: 467 diff changeset	453
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	454 static void render_quit()
65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	455 {
65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	456 render_close_audio();
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	457 free_surfaces();
1593 24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	458 #ifndef DISABLE_OPENGL
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	459 if (render_gl) {
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	460 gl_teardown();
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	461 SDL_GL_DeleteContext(main_context);
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	462 }
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	463 #endif
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	464 }
65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	465
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	466 static float config_aspect()
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	467 {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	468 static float aspect = 0.0f;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	469 if (aspect == 0.0f) {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	470 char *config_aspect = tern_find_path_default(config, "video\0aspect\0", (tern_val){.ptrval = "4:3"}, TVAL_PTR).ptrval;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	471 if (strcmp("stretch", config_aspect)) {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	472 aspect = 4.0f/3.0f;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	473 char *end;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	474 float aspect_numerator = strtof(config_aspect, &end);
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	475 if (aspect_numerator > 0.0f && *end == ':') {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	476 float aspect_denominator = strtof(end+1, &end);
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	477 if (aspect_denominator > 0.0f && !*end) {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	478 aspect = aspect_numerator / aspect_denominator;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	479 }
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	480 }
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	481 } else {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	482 aspect = -1.0f;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	483 }
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	484 }
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	485 return aspect;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	486 }
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	487
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	488 static void update_aspect()
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	489 {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	490 //reset default values
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	491 #ifndef DISABLE_OPENGL
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	492 memcpy(vertex_data, vertex_data_default, sizeof(vertex_data));
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	493 #endif
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	494 main_clip.w = main_width;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	495 main_clip.h = main_height;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	496 main_clip.x = main_clip.y = 0;
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	497 if (config_aspect() > 0.0f) {
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	498 float aspect = (float)main_width / main_height;
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	499 if (fabs(aspect - config_aspect()) < 0.01f) {
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	500 //close enough for government work
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	501 return;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	502 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	503 #ifndef DISABLE_OPENGL
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	504 if (render_gl) {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	505 for (int i = 0; i < 4; i++)
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	506 {
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	507 if (aspect > config_aspect()) {
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	508 vertex_data[i2] = config_aspect()/aspect;
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	509 } else {
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	510 vertex_data[i2+1] = aspect/config_aspect();
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	511 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	512 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	513 } else {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	514 #endif
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	515 main_clip.w = aspect > config_aspect() ? config_aspect() * (float)main_height : main_width;
458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	516 main_clip.h = aspect > config_aspect() ? main_height : main_width / config_aspect();
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	517 main_clip.x = (main_width - main_clip.w) / 2;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	518 main_clip.y = (main_height - main_clip.h) / 2;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	519 #ifndef DISABLE_OPENGL
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	520 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	521 #endif
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	522 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	523 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	524
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	525 static ui_render_fun on_context_destroyed, on_context_created, on_ui_fb_resized;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	526 void render_set_gl_context_handlers(ui_render_fun destroy, ui_render_fun create)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	527 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	528 on_context_destroyed = destroy;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	529 on_context_created = create;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	530 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	531
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	532 void render_set_ui_fb_resize_handler(ui_render_fun resize)
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	533 {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	534 on_ui_fb_resized = resize;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	535 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	536
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	537 static uint8_t scancode_map[SDL_NUM_SCANCODES] = {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	538 [SDL_SCANCODE_A] = 0x1C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	539 [SDL_SCANCODE_B] = 0x32,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	540 [SDL_SCANCODE_C] = 0x21,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	541 [SDL_SCANCODE_D] = 0x23,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	542 [SDL_SCANCODE_E] = 0x24,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	543 [SDL_SCANCODE_F] = 0x2B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	544 [SDL_SCANCODE_G] = 0x34,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	545 [SDL_SCANCODE_H] = 0x33,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	546 [SDL_SCANCODE_I] = 0x43,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	547 [SDL_SCANCODE_J] = 0x3B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	548 [SDL_SCANCODE_K] = 0x42,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	549 [SDL_SCANCODE_L] = 0x4B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	550 [SDL_SCANCODE_M] = 0x3A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	551 [SDL_SCANCODE_N] = 0x31,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	552 [SDL_SCANCODE_O] = 0x44,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	553 [SDL_SCANCODE_P] = 0x4D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	554 [SDL_SCANCODE_Q] = 0x15,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	555 [SDL_SCANCODE_R] = 0x2D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	556 [SDL_SCANCODE_S] = 0x1B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	557 [SDL_SCANCODE_T] = 0x2C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	558 [SDL_SCANCODE_U] = 0x3C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	559 [SDL_SCANCODE_V] = 0x2A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	560 [SDL_SCANCODE_W] = 0x1D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	561 [SDL_SCANCODE_X] = 0x22,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	562 [SDL_SCANCODE_Y] = 0x35,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	563 [SDL_SCANCODE_Z] = 0x1A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	564 [SDL_SCANCODE_1] = 0x16,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	565 [SDL_SCANCODE_2] = 0x1E,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	566 [SDL_SCANCODE_3] = 0x26,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	567 [SDL_SCANCODE_4] = 0x25,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	568 [SDL_SCANCODE_5] = 0x2E,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	569 [SDL_SCANCODE_6] = 0x36,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	570 [SDL_SCANCODE_7] = 0x3D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	571 [SDL_SCANCODE_8] = 0x3E,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	572 [SDL_SCANCODE_9] = 0x46,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	573 [SDL_SCANCODE_0] = 0x45,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	574 [SDL_SCANCODE_RETURN] = 0x5A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	575 [SDL_SCANCODE_ESCAPE] = 0x76,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	576 [SDL_SCANCODE_SPACE] = 0x29,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	577 [SDL_SCANCODE_TAB] = 0x0D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	578 [SDL_SCANCODE_BACKSPACE] = 0x66,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	579 [SDL_SCANCODE_MINUS] = 0x4E,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	580 [SDL_SCANCODE_EQUALS] = 0x55,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	581 [SDL_SCANCODE_LEFTBRACKET] = 0x54,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	582 [SDL_SCANCODE_RIGHTBRACKET] = 0x5B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	583 [SDL_SCANCODE_BACKSLASH] = 0x5D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	584 [SDL_SCANCODE_SEMICOLON] = 0x4C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	585 [SDL_SCANCODE_APOSTROPHE] = 0x52,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	586 [SDL_SCANCODE_GRAVE] = 0x0E,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	587 [SDL_SCANCODE_COMMA] = 0x41,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	588 [SDL_SCANCODE_PERIOD] = 0x49,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	589 [SDL_SCANCODE_SLASH] = 0x4A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	590 [SDL_SCANCODE_CAPSLOCK] = 0x58,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	591 [SDL_SCANCODE_F1] = 0x05,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	592 [SDL_SCANCODE_F2] = 0x06,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	593 [SDL_SCANCODE_F3] = 0x04,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	594 [SDL_SCANCODE_F4] = 0x0C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	595 [SDL_SCANCODE_F5] = 0x03,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	596 [SDL_SCANCODE_F6] = 0x0B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	597 [SDL_SCANCODE_F7] = 0x83,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	598 [SDL_SCANCODE_F8] = 0x0A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	599 [SDL_SCANCODE_F9] = 0x01,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	600 [SDL_SCANCODE_F10] = 0x09,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	601 [SDL_SCANCODE_F11] = 0x78,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	602 [SDL_SCANCODE_F12] = 0x07,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	603 [SDL_SCANCODE_LCTRL] = 0x14,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	604 [SDL_SCANCODE_LSHIFT] = 0x12,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	605 [SDL_SCANCODE_LALT] = 0x11,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	606 [SDL_SCANCODE_RCTRL] = 0x18,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	607 [SDL_SCANCODE_RSHIFT] = 0x59,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	608 [SDL_SCANCODE_RALT] = 0x17,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	609 [SDL_SCANCODE_INSERT] = 0x81,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	610 [SDL_SCANCODE_PAUSE] = 0x82,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	611 [SDL_SCANCODE_PRINTSCREEN] = 0x84,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	612 [SDL_SCANCODE_SCROLLLOCK] = 0x7E,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	613 [SDL_SCANCODE_DELETE] = 0x85,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	614 [SDL_SCANCODE_LEFT] = 0x86,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	615 [SDL_SCANCODE_HOME] = 0x87,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	616 [SDL_SCANCODE_END] = 0x88,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	617 [SDL_SCANCODE_UP] = 0x89,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	618 [SDL_SCANCODE_DOWN] = 0x8A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	619 [SDL_SCANCODE_PAGEUP] = 0x8B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	620 [SDL_SCANCODE_PAGEDOWN] = 0x8C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	621 [SDL_SCANCODE_RIGHT] = 0x8D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	622 [SDL_SCANCODE_NUMLOCKCLEAR] = 0x77,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	623 [SDL_SCANCODE_KP_DIVIDE] = 0x80,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	624 [SDL_SCANCODE_KP_MULTIPLY] = 0x7C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	625 [SDL_SCANCODE_KP_MINUS] = 0x7B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	626 [SDL_SCANCODE_KP_PLUS] = 0x79,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	627 [SDL_SCANCODE_KP_ENTER] = 0x19,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	628 [SDL_SCANCODE_KP_1] = 0x69,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	629 [SDL_SCANCODE_KP_2] = 0x72,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	630 [SDL_SCANCODE_KP_3] = 0x7A,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	631 [SDL_SCANCODE_KP_4] = 0x6B,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	632 [SDL_SCANCODE_KP_5] = 0x73,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	633 [SDL_SCANCODE_KP_6] = 0x74,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	634 [SDL_SCANCODE_KP_7] = 0x6C,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	635 [SDL_SCANCODE_KP_8] = 0x75,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	636 [SDL_SCANCODE_KP_9] = 0x7D,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	637 [SDL_SCANCODE_KP_0] = 0x70,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	638 [SDL_SCANCODE_KP_PERIOD] = 0x71,
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	639 };
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	640
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	641 static drop_handler drag_drop_handler;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	642 void render_set_drag_drop_handler(drop_handler handler)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	643 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	644 drag_drop_handler = handler;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	645 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	646
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	647 static event_handler custom_event_handler;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	648 void render_set_event_handler(event_handler handler)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	649 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	650 custom_event_handler = handler;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	651 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	652
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	653 static int find_joystick_index(SDL_JoystickID instanceID)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	654 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	655 for (int i = 0; i < MAX_JOYSTICKS; i++) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	656 if (joysticks[i] && SDL_JoystickInstanceID(joysticks[i]) == instanceID) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	657 return i;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	658 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	659 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	660 return -1;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	661 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	662
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	663 static int lowest_unused_joystick_index()
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	664 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	665 for (int i = 0; i < MAX_JOYSTICKS; i++) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	666 if (!joysticks[i]) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	667 return i;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	668 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	669 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	670 return -1;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	671 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	672
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	673 static int lowest_unlocked_joystick_index(void)
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	674 {
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	675 for (int i = 0; i < MAX_JOYSTICKS; i++) {
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	676 if (!joystick_index_locked[i]) {
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	677 return i;
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	678 }
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	679 }
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	680 return -1;
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	681 }
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	682
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	683 SDL_Joystick *render_get_joystick(int index)
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	684 {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	685 if (index >= MAX_JOYSTICKS) {
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	686 return NULL;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	687 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	688 return joysticks[index];
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	689 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	690
1608 419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	691 char* render_joystick_type_id(int index)
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	692 {
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	693 SDL_Joystick *stick = render_get_joystick(index);
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	694 if (!stick) {
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	695 return NULL;
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	696 }
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	697 char *guid_string = malloc(33);
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	698 SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(stick), guid_string, 33);
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	699 return guid_string;
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	700 }
419a0a133b5c Allow a gamepad mapping to apply to all controllers, controllers of a particular type (i.e.e 6-button PS4 controllers) or specific controllers (based on SDL2 GUID) in addition to the controller in a certain slot Michael Pavone <pavone@retrodev.com> parents: 1603 diff changeset	701
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	702 SDL_GameController *render_get_controller(int index)
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	703 {
1862 e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	704 if (index >= MAX_JOYSTICKS \|\| !joysticks[index]) {
1596 437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	705 return NULL;
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	706 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	707 return SDL_GameControllerOpen(joystick_sdl_index[index]);
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	708 }
437e80a700aa Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller Michael Pavone <pavone@retrodev.com> parents: 1593 diff changeset	709
1862 e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	710 static uint8_t gc_events_enabled;
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	711 static SDL_GameController *controllers[MAX_JOYSTICKS];
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	712 void render_enable_gamepad_events(uint8_t enabled)
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	713 {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	714 if (enabled != gc_events_enabled) {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	715 gc_events_enabled = enabled;
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	716 for (int i = 0; i < MAX_JOYSTICKS; i++) {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	717 if (enabled) {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	718 controllers[i] = render_get_controller(i);
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	719 } else if (controllers[i]) {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	720 SDL_GameControllerClose(controllers[i]);
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	721 controllers[i] = NULL;
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	722 }
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	723 }
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	724 }
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	725 }
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	726
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	727 static uint32_t overscan_top[NUM_VID_STD] = {2, 21};
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	728 static uint32_t overscan_bot[NUM_VID_STD] = {1, 17};
1267 3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	729 static uint32_t overscan_left[NUM_VID_STD] = {13, 13};
3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	730 static uint32_t overscan_right[NUM_VID_STD] = {14, 14};
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	731 static vid_std video_standard = VID_NTSC;
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	732 static uint8_t need_ui_fb_resize;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	733
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	734 int lock_joystick_index(int joystick, int desired_index)
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	735 {
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	736 if (desired_index < 0) {
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	737 desired_index = lowest_unlocked_joystick_index();
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	738 if (desired_index < 0 \|\| desired_index >= joystick) {
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	739 return joystick;
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	740 }
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	741 }
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	742 SDL_Joystick *tmp_joy = joysticks[joystick];
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	743 int tmp_index = joystick_sdl_index[joystick];
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	744 joysticks[joystick] = joysticks[desired_index];
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	745 joystick_sdl_index[joystick] = joystick_sdl_index[desired_index];
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	746 joystick_index_locked[joystick] = joystick_sdl_index[desired_index];
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	747 joysticks[desired_index] = tmp_joy;
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	748 joystick_sdl_index[desired_index] = tmp_index;
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	749 joystick_index_locked[desired_index] = 1;
1861 fc05f49075c2 Reprocess bindings when SDL2 mappings, controller types or controller order change Michael Pavone <pavone@retrodev.com> parents: 1860 diff changeset	750 //update bindings as the controllers being swapped may have different mappings
fc05f49075c2 Reprocess bindings when SDL2 mappings, controller types or controller order change Michael Pavone <pavone@retrodev.com> parents: 1860 diff changeset	751 handle_joy_added(desired_index);
fc05f49075c2 Reprocess bindings when SDL2 mappings, controller types or controller order change Michael Pavone <pavone@retrodev.com> parents: 1860 diff changeset	752 if (joysticks[joystick]) {
fc05f49075c2 Reprocess bindings when SDL2 mappings, controller types or controller order change Michael Pavone <pavone@retrodev.com> parents: 1860 diff changeset	753 handle_joy_added(joystick);
fc05f49075c2 Reprocess bindings when SDL2 mappings, controller types or controller order change Michael Pavone <pavone@retrodev.com> parents: 1860 diff changeset	754 }
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	755 return desired_index;
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	756 }
bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	757
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	758 static int32_t handle_event(SDL_Event *event)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	759 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	760 if (custom_event_handler) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	761 custom_event_handler(event);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	762 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	763 switch (event->type) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	764 case SDL_KEYDOWN:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	765 handle_keydown(event->key.keysym.sym, scancode_map[event->key.keysym.scancode]);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	766 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	767 case SDL_KEYUP:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	768 handle_keyup(event->key.keysym.sym, scancode_map[event->key.keysym.scancode]);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	769 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	770 case SDL_JOYBUTTONDOWN:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	771 handle_joydown(find_joystick_index(event->jbutton.which), event->jbutton.button);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	772 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	773 case SDL_JOYBUTTONUP:
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	774 handle_joyup(lock_joystick_index(find_joystick_index(event->jbutton.which), -1), event->jbutton.button);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	775 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	776 case SDL_JOYHATMOTION:
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	777 handle_joy_dpad(lock_joystick_index(find_joystick_index(event->jhat.which), -1), event->jhat.hat, event->jhat.value);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	778 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	779 case SDL_JOYAXISMOTION:
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	780 handle_joy_axis(lock_joystick_index(find_joystick_index(event->jaxis.which), -1), event->jaxis.axis, event->jaxis.value);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	781 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	782 case SDL_JOYDEVICEADDED:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	783 if (event->jdevice.which < MAX_JOYSTICKS) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	784 int index = lowest_unused_joystick_index();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	785 if (index >= 0) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	786 SDL_Joystick * joy = joysticks[index] = SDL_JoystickOpen(event->jdevice.which);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	787 joystick_sdl_index[index] = event->jdevice.which;
1860 bdca98187c9f Reorder controllers based on which one receives player input first Michael Pavone <pavone@retrodev.com> parents: 1851 diff changeset	788 joystick_index_locked[index] = 0;
1862 e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	789 if (gc_events_enabled) {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	790 controllers[index] = SDL_GameControllerOpen(event->jdevice.which);
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	791 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	792 if (joy) {
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	793 debug_message("Joystick %d added: %s\n", index, SDL_JoystickName(joy));
52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	794 debug_message("\tNum Axes: %d\n\tNum Buttons: %d\n\tNum Hats: %d\n", SDL_JoystickNumAxes(joy), SDL_JoystickNumButtons(joy), SDL_JoystickNumHats(joy));
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	795 handle_joy_added(index);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	796 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	797 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	798 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	799 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	800 case SDL_JOYDEVICEREMOVED: {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	801 int index = find_joystick_index(event->jdevice.which);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	802 if (index >= 0) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	803 SDL_JoystickClose(joysticks[index]);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	804 joysticks[index] = NULL;
1862 e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	805 if (controllers[index]) {
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	806 SDL_GameControllerClose(controllers[index]);
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	807 controllers[index] = NULL;
e07fc3d473b2 Basic UI navigation with controller Michael Pavone <pavone@retrodev.com> parents: 1861 diff changeset	808 }
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	809 debug_message("Joystick %d removed\n", index);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	810 } else {
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	811 debug_message("Failed to find removed joystick with instance ID: %d\n", index);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	812 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	813 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	814 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	815 case SDL_MOUSEMOTION:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	816 handle_mouse_moved(event->motion.which, event->motion.x, event->motion.y + overscan_top[video_standard], event->motion.xrel, event->motion.yrel);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	817 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	818 case SDL_MOUSEBUTTONDOWN:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	819 handle_mousedown(event->button.which, event->button.button);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	820 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	821 case SDL_MOUSEBUTTONUP:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	822 handle_mouseup(event->button.which, event->button.button);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	823 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	824 case SDL_WINDOWEVENT:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	825 switch (event->window.event)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	826 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	827 case SDL_WINDOWEVENT_SIZE_CHANGED:
1820 70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	828 if (!main_window) {
70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	829 break;
70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	830 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	831 main_width = event->window.data1;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	832 main_height = event->window.data2;
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	833 need_ui_fb_resize = 1;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	834 update_aspect();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	835 #ifndef DISABLE_OPENGL
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	836 if (render_gl) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	837 if (on_context_destroyed) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	838 on_context_destroyed();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	839 }
1593 24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	840 gl_teardown();
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	841 SDL_GL_DeleteContext(main_context);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	842 main_context = SDL_GL_CreateContext(main_window);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	843 gl_setup();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	844 if (on_context_created) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	845 on_context_created();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	846 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	847 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	848 #endif
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	849 break;
1649 b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	850 case SDL_WINDOWEVENT_CLOSE:
1820 70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	851 if (main_window && SDL_GetWindowID(main_window) == event->window.windowID) {
1649 b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	852 exit(0);
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	853 } else {
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	854 for (int i = 0; i < num_textures - FRAMEBUFFER_USER_START; i++)
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	855 {
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	856 if (SDL_GetWindowID(extra_windows[i]) == event->window.windowID) {
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	857 if (close_handlers[i]) {
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	858 close_handlers[i](i + FRAMEBUFFER_USER_START);
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	859 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	860 break;
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	861 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	862 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	863 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	864 break;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	865 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	866 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	867 case SDL_DROPFILE:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	868 if (drag_drop_handler) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	869 drag_drop_handler(event->drop.file);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	870 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	871 SDL_free(event->drop.file);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	872 break;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	873 case SDL_QUIT:
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	874 puts("");
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	875 exit(0);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	876 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	877 return 0;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	878 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	879
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	880 static void drain_events()
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	881 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	882 SDL_Event event;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	883 while(SDL_PollEvent(&event))
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	884 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	885 handle_event(&event);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	886 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	887 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	888
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	889 static char *vid_std_names[NUM_VID_STD] = {"ntsc", "pal"};
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	890 static int display_hz;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	891 static int source_hz;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	892 static int source_frame;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	893 static int source_frame_count;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	894 static int frame_repeat[60];
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	895
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	896 static uint32_t sample_rate;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	897 static void init_audio()
354 15dd6418fe67 Initial PSG support. Mostly works, noise channel is borked though. Mike Pavone <pavone@retrodev.com> parents: 342 diff changeset	898 {
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	899 SDL_AudioSpec desired, actual;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	900 char * rate_str = tern_find_path(config, "audio\0rate\0", TVAL_PTR).ptrval;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	901 int rate = rate_str ? atoi(rate_str) : 0;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	902 if (!rate) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	903 rate = 48000;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	904 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	905 desired.freq = rate;
1933 16a795cababd Make requested sample format configurable Michael Pavone <pavone@retrodev.com> parents: 1932 diff changeset	906 char *config_format = tern_find_path_default(config, "audio\0format\0", (tern_val){.ptrval="f32"}, TVAL_PTR).ptrval;
16a795cababd Make requested sample format configurable Michael Pavone <pavone@retrodev.com> parents: 1932 diff changeset	907 desired.format = !strcmp(config_format, "s16") ? AUDIO_S16SYS : AUDIO_F32SYS;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	908 desired.channels = 2;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	909 char * samples_str = tern_find_path(config, "audio\0buffer\0", TVAL_PTR).ptrval;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	910 int samples = samples_str ? atoi(samples_str) : 0;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	911 if (!samples) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	912 samples = 512;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	913 }
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	914 debug_message("config says: %d\n", samples);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	915 desired.samples = samples*2;
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	916 desired.callback = sync_to_audio ? audio_callback : run_on_audio_thread ? audio_callback_run_on_audio : audio_callback_drc;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	917 desired.userdata = NULL;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	918
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	919 if (SDL_OpenAudio(&desired, &actual) < 0) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	920 fatal_error("Unable to open SDL audio: %s\n", SDL_GetError());
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	921 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	922 sample_rate = actual.freq;
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	923 debug_message("Initialized audio at frequency %d with a %d sample buffer, ", actual.freq, actual.samples);
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	924 render_audio_format format = RENDER_AUDIO_UNKNOWN;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	925 if (actual.format == AUDIO_S16SYS) {
1810 73a9d06413bc Restore some newlines in debug output that got lost when fixing GDB remote debugging issue Michael Pavone <pavone@retrodev.com> parents: 1809 diff changeset	926 debug_message("signed 16-bit int format\n");
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	927 format = RENDER_AUDIO_S16;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	928 } else if (actual.format == AUDIO_F32SYS) {
1810 73a9d06413bc Restore some newlines in debug output that got lost when fixing GDB remote debugging issue Michael Pavone <pavone@retrodev.com> parents: 1809 diff changeset	929 debug_message("32-bit float format\n");
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	930 format = RENDER_AUDIO_FLOAT;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	931 } else {
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	932 debug_message("unsupported format %X\n", actual.format);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	933 warning("Unsupported audio sample format: %X\n", actual.format);
1402 458df351af06 Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified Michael Pavone <pavone@retrodev.com> parents: 1398 diff changeset	934 }
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	935 render_audio_initialized(format, actual.freq, actual.channels, actual.samples, SDL_AUDIO_BITSIZE(actual.format) / 8);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	936 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	937
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	938 void window_setup(void)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	939 {
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	940 uint32_t flags = SDL_WINDOW_RESIZABLE;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	941 if (is_fullscreen) {
719 019d27995e32 Upgrade to SDL 2.0 and drop support for the non-OpenGL render path Michael Pavone <pavone@retrodev.com> parents: 655 diff changeset	942 flags \|= SDL_WINDOW_FULLSCREEN_DESKTOP;
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	943 }
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	944
1659 19331a21da3a Switched default sync source back to audio as the video option is not ready for prime timeop Mike Pavone <pavone@retrodev.com> parents: 1658 diff changeset	945 tern_val def = {.ptrval = "audio"};
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	946 char *sync_src = tern_find_path_default(config, "system\0sync_source\0", def, TVAL_PTR).ptrval;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	947 sync_to_audio = !strcmp(sync_src, "audio");
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	948 run_on_audio_thread = !strcmp(sync_src, "audio_thread");
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	949
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	950 const char *vsync;
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	951 if (sync_to_audio) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	952 def.ptrval = "off";
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	953 vsync = tern_find_path_default(config, "video\0vsync\0", def, TVAL_PTR).ptrval;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	954 } else {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	955 vsync = "on";
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	956 }
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	957
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	958 tern_node *video = tern_find_node(config, "video");
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	959 if (video)
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	960 {
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	961 for (int i = 0; i < NUM_VID_STD; i++)
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	962 {
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	963 tern_node *std_settings = tern_find_node(video, vid_std_names[i]);
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	964 if (std_settings) {
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	965 char *val = tern_find_path_default(std_settings, "overscan\0top\0", (tern_val){.ptrval = NULL}, TVAL_PTR).ptrval;
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	966 if (val) {
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	967 overscan_top[i] = atoi(val);
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	968 }
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	969 val = tern_find_path_default(std_settings, "overscan\0bottom\0", (tern_val){.ptrval = NULL}, TVAL_PTR).ptrval;
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	970 if (val) {
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	971 overscan_bot[i] = atoi(val);
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	972 }
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	973 val = tern_find_path_default(std_settings, "overscan\0left\0", (tern_val){.ptrval = NULL}, TVAL_PTR).ptrval;
1267 3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	974 if (val) {
3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	975 overscan_left[i] = atoi(val);
3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	976 }
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	977 val = tern_find_path_default(std_settings, "overscan\0right\0", (tern_val){.ptrval = NULL}, TVAL_PTR).ptrval;
1267 3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	978 if (val) {
3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	979 overscan_right[i] = atoi(val);
3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	980 }
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	981 }
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	982 }
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	983 }
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	984 render_gl = 0;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	985
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	986 #ifndef DISABLE_OPENGL
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	987 char *gl_enabled_str = tern_find_path_default(config, "video\0gl\0", def, TVAL_PTR).ptrval;
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	988 uint8_t gl_enabled = strcmp(gl_enabled_str, "off") != 0;
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	989 if (gl_enabled)
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	990 {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	991 flags \|= SDL_WINDOW_OPENGL;
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	992 SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	993 SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	994 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	995 SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	996 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	997 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	998 SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	999 SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1000 SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1001 #endif
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1002 }
1074 3a0f684891ae Fix NOGL compile option Michael Pavone <pavone@retrodev.com> parents: 1068 diff changeset	1003 #endif
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1004 main_window = SDL_CreateWindow(caption, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, main_width, main_height, flags);
719 019d27995e32 Upgrade to SDL 2.0 and drop support for the non-OpenGL render path Michael Pavone <pavone@retrodev.com> parents: 655 diff changeset	1005 if (!main_window) {
792 724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1006 fatal_error("Unable to create SDL window: %s\n", SDL_GetError());
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1007 }
1074 3a0f684891ae Fix NOGL compile option Michael Pavone <pavone@retrodev.com> parents: 1068 diff changeset	1008 #ifndef DISABLE_OPENGL
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1009 if (gl_enabled)
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1010 {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1011 main_context = SDL_GL_CreateContext(main_window);
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1012 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1013 int major_version;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1014 if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major_version) == 0 && major_version >= 2) {
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1015 #else
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1016 GLenum res = glewInit();
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1017 if (res != GLEW_OK) {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1018 warning("Initialization of GLEW failed with code %d\n", res);
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1019 }
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1020
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1021 if (res == GLEW_OK && GLEW_VERSION_2_0) {
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1022 #endif
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1023 render_gl = 1;
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1024 SDL_GL_MakeCurrent(main_window, main_context);
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1025 if (!strcmp("tear", vsync)) {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1026 if (SDL_GL_SetSwapInterval(-1) < 0) {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1027 warning("late tear is not available (%s), using normal vsync\n", SDL_GetError());
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1028 vsync = "on";
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1029 } else {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1030 vsync = NULL;
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1031 }
1004 fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1032 }
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1033 if (vsync) {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1034 if (SDL_GL_SetSwapInterval(!strcmp("on", vsync)) < 0) {
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	1035 #ifdef __ANDROID__
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	1036 debug_message("Failed to set vsync to %s: %s\n", vsync, SDL_GetError());
78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	1037 #else
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1038 warning("Failed to set vsync to %s: %s\n", vsync, SDL_GetError());
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	1039 #endif
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1040 }
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1041 }
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1042 } else {
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1043 warning("OpenGL 2.0 is unavailable, falling back to SDL2 renderer\n");
1004 fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1044 }
1328 70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1045 }
70faad89d491 Add config file option to disable Open GL rendering Michael Pavone <pavone@retrodev.com> parents: 1326 diff changeset	1046 if (!render_gl) {
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1047 #endif
1004 fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1048 flags = SDL_RENDERER_ACCELERATED;
fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1049 if (!strcmp("on", vsync) \|\| !strcmp("tear", vsync)) {
fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1050 flags \|= SDL_RENDERER_PRESENTVSYNC;
fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1051 }
fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1052 main_renderer = SDL_CreateRenderer(main_window, -1, flags);
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1053
1074 3a0f684891ae Fix NOGL compile option Michael Pavone <pavone@retrodev.com> parents: 1068 diff changeset	1054 if (!main_renderer) {
3a0f684891ae Fix NOGL compile option Michael Pavone <pavone@retrodev.com> parents: 1068 diff changeset	1055 fatal_error("unable to create SDL renderer: %s\n", SDL_GetError());
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1056 }
1658 fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1057 SDL_RendererInfo rinfo;
fa9ae059e4d3 Added support for GLES in addition to desktop GL Mike Pavone <pavone@retrodev.com> parents: 1649 diff changeset	1058 SDL_GetRendererInfo(main_renderer, &rinfo);
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1059 debug_message("SDL2 Render Driver: %s\n", rinfo.name);
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1060 main_clip.x = main_clip.y = 0;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1061 main_clip.w = main_width;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1062 main_clip.h = main_height;
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1063 #ifndef DISABLE_OPENGL
719 019d27995e32 Upgrade to SDL 2.0 and drop support for the non-OpenGL render path Michael Pavone <pavone@retrodev.com> parents: 655 diff changeset	1064 }
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	1065 #endif
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1066
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1067 SDL_GetWindowSize(main_window, &main_width, &main_height);
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1068 debug_message("Window created with size: %d x %d\n", main_width, main_height);
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1069 update_aspect();
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1070 render_alloc_surfaces();
1004 fc000f245cc8 Set vsync state based on config file rather than just using whatever the system decides for us. Michael Pavone <pavone@retrodev.com> parents: 1003 diff changeset	1071 def.ptrval = "off";
1326 071e761bcdcf Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in Michael Pavone <pavone@retrodev.com> parents: 1268 diff changeset	1072 scanlines = !strcmp(tern_find_path_default(config, "video\0scanlines\0", def, TVAL_PTR).ptrval, "on");
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1073 }
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1074
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1075 void render_init(int width, int height, char * title, uint8_t fullscreen)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1076 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1077 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| SDL_INIT_JOYSTICK \| SDL_INIT_GAMECONTROLLER) < 0) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1078 fatal_error("Unable to init SDL: %s\n", SDL_GetError());
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1079 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1080 atexit(SDL_Quit);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1081 if (height <= 0) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1082 float aspect = config_aspect() > 0.0f ? config_aspect() : 4.0f/3.0f;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1083 height = ((float)width / aspect) + 0.5f;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1084 }
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1085 debug_message("width: %d, height: %d\n", width, height);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1086 windowed_width = width;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1087 windowed_height = height;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1088
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1089 SDL_DisplayMode mode;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1090 //TODO: Explicit multiple monitor support
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1091 SDL_GetCurrentDisplayMode(0, &mode);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1092 display_hz = mode.refresh_rate;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1093
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1094 if (fullscreen) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1095 //the SDL2 migration guide suggests setting width and height to 0 when using SDL_WINDOW_FULLSCREEN_DESKTOP
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1096 //but that doesn't seem to work right when using OpenGL, at least on Linux anyway
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1097 width = mode.w;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1098 height = mode.h;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1099 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1100 main_width = width;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1101 main_height = height;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1102 is_fullscreen = fullscreen;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1103
486 db5880d8ea03 Add an FPS counter to the title bar Mike Pavone <pavone@retrodev.com> parents: 467 diff changeset	1104 caption = title;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1105
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1106 window_setup();
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1107
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1108 audio_mutex = SDL_CreateMutex();
7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1109 audio_ready = SDL_CreateCond();
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1110
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1111 if (run_on_audio_thread) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1112 frame_mutex = SDL_CreateMutex();
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1113 free_buffer_mutex = SDL_CreateMutex();
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1114 frame_ready = SDL_CreateCond();
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1115 buffer_storage = 4;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1116 frame_buffers = calloc(buffer_storage, sizeof(uint32_t*));
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1117 frame_buffers[0] = texture_buf;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1118 num_buffers = 1;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1119 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1120
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1121 init_audio();
1355 03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1122
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1123 uint32_t db_size;
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1124 char *db_data = read_bundled_file("gamecontrollerdb.txt", &db_size);
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1125 if (db_data) {
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1126 int added = SDL_GameControllerAddMappingsFromRW(SDL_RWFromMem(db_data, db_size), 1);
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1127 free(db_data);
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1128 debug_message("Added %d game controller mappings from gamecontrollerdb.txt\n", added);
1355 03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1129 }
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt Michael Pavone <pavone@retrodev.com> parents: 1336 diff changeset	1130
1603 c0727712d529 Read extral SDL2 mappings on startup from controller_types.cfg Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1131 controller_add_mappings();
c0727712d529 Read extral SDL2 mappings on startup from controller_types.cfg Michael Pavone <pavone@retrodev.com> parents: 1600 diff changeset	1132
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1133 SDL_JoystickEventState(SDL_ENABLE);
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1134
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1135 render_set_video_standard(VID_NTSC);
874 b6842dfb8edf ROM is now run after being selected in menu. Initial path for menu is read from config file. Michael Pavone <pavone@retrodev.com> parents: 816 diff changeset	1136
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	1137 atexit(render_quit);
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1138 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1139 #include<unistd.h>
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1140 static int in_toggle;
1590 220ede292e97 Initial attempt at handling switches between sync modes at runtime. Needs work Michael Pavone <pavone@retrodev.com> parents: 1589 diff changeset	1141
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1142 void render_config_updated(void)
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1143 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1144 uint8_t old_sync_to_audio = sync_to_audio;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1145
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1146 free_surfaces();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1147 #ifndef DISABLE_OPENGL
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1148 if (render_gl) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1149 if (on_context_destroyed) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1150 on_context_destroyed();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1151 }
1593 24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind Michael Pavone <pavone@retrodev.com> parents: 1591 diff changeset	1152 gl_teardown();
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1153 SDL_GL_DeleteContext(main_context);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1154 } else {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1155 #endif
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1156 SDL_DestroyRenderer(main_renderer);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1157 #ifndef DISABLE_OPENGL
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1158 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1159 #endif
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1160 in_toggle = 1;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1161 SDL_DestroyWindow(main_window);
1820 70a1304b432b Fix crash that occurs when changing video screen settings if the emulator window is currently fullscreen. Add a little more error handling to Open GL code Mike Pavone <pavone@retrodev.com> parents: 1810 diff changeset	1162 main_window = NULL;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1163 drain_events();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1164
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1165 char *config_width = tern_find_path(config, "video\0width\0", TVAL_PTR).ptrval;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1166 if (config_width) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1167 windowed_width = atoi(config_width);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1168 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1169 char *config_height = tern_find_path(config, "video\0height\0", TVAL_PTR).ptrval;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1170 if (config_height) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1171 windowed_height = atoi(config_height);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1172 } else {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1173 float aspect = config_aspect() > 0.0f ? config_aspect() : 4.0f/3.0f;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1174 windowed_height = ((float)windowed_width / aspect) + 0.5f;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1175 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1176 char *config_fullscreen = tern_find_path(config, "video\0fullscreen\0", TVAL_PTR).ptrval;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1177 is_fullscreen = config_fullscreen && !strcmp("on", config_fullscreen);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1178 if (is_fullscreen) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1179 SDL_DisplayMode mode;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1180 //TODO: Multiple monitor support
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1181 SDL_GetCurrentDisplayMode(0, &mode);
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1182 main_width = mode.w;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1183 main_height = mode.h;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1184 } else {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1185 main_width = windowed_width;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1186 main_height = windowed_height;
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1187 }
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1188 if (on_ui_fb_resized) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1189 on_ui_fb_resized();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1190 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1191
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1192 window_setup();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1193 update_aspect();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1194 #ifndef DISABLE_OPENGL
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1195 //need to check render_gl again after window_setup as render option could have changed
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1196 if (render_gl && on_context_created) {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1197 on_context_created();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1198 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1199 #endif
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1200
1580 ea7d5ced2415 Fix deadlock when changing settings before loading first ROM Michael Pavone <pavone@retrodev.com> parents: 1574 diff changeset	1201 uint8_t was_paused = SDL_GetAudioStatus() == SDL_AUDIO_PAUSED;
ea7d5ced2415 Fix deadlock when changing settings before loading first ROM Michael Pavone <pavone@retrodev.com> parents: 1574 diff changeset	1202 render_close_audio();
ea7d5ced2415 Fix deadlock when changing settings before loading first ROM Michael Pavone <pavone@retrodev.com> parents: 1574 diff changeset	1203 quitting = 0;
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1204 init_audio();
1590 220ede292e97 Initial attempt at handling switches between sync modes at runtime. Needs work Michael Pavone <pavone@retrodev.com> parents: 1589 diff changeset	1205 render_set_video_standard(video_standard);
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1206
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1207 drain_events();
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1208 in_toggle = 0;
1590 220ede292e97 Initial attempt at handling switches between sync modes at runtime. Needs work Michael Pavone <pavone@retrodev.com> parents: 1589 diff changeset	1209 if (!was_paused) {
220ede292e97 Initial attempt at handling switches between sync modes at runtime. Needs work Michael Pavone <pavone@retrodev.com> parents: 1589 diff changeset	1210 SDL_PauseAudio(0);
220ede292e97 Initial attempt at handling switches between sync modes at runtime. Needs work Michael Pavone <pavone@retrodev.com> parents: 1589 diff changeset	1211 }
1573 a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed Michael Pavone <pavone@retrodev.com> parents: 1567 diff changeset	1212 }
719 019d27995e32 Upgrade to SDL 2.0 and drop support for the non-OpenGL render path Michael Pavone <pavone@retrodev.com> parents: 655 diff changeset	1213
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1214 SDL_Window *render_get_window(void)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1215 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1216 return main_window;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1217 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1218
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1219 uint32_t render_audio_syncs_per_sec(void)
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1220 {
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1221 //sync samples with audio thread approximately every 8 lines when doing sync to video
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1222 return render_is_audio_sync() ? 0 : source_hz * (video_standard == VID_PAL ? 313 : 262) / 8;
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1223 }
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1224
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1225 void render_set_video_standard(vid_std std)
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1226 {
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1227 video_standard = std;
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1228 if (render_is_audio_sync()) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1229 return;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1230 }
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1231 source_hz = std == VID_PAL ? 50 : 60;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1232 uint32_t max_repeat = 0;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1233 if (abs(source_hz - display_hz) < 2) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1234 memset(frame_repeat, 0, sizeof(int)*display_hz);
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1235 } else {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1236 int inc = display_hz * 100000 / source_hz;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1237 int accum = 0;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1238 int dst_frames = 0;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1239 for (int src_frame = 0; src_frame < source_hz; src_frame++)
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1240 {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1241 frame_repeat[src_frame] = -1;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1242 accum += inc;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1243 while (accum > 100000)
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1244 {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1245 accum -= 100000;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1246 frame_repeat[src_frame]++;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1247 max_repeat = frame_repeat[src_frame] > max_repeat ? frame_repeat[src_frame] : max_repeat;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1248 dst_frames++;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1249 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1250 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1251 if (dst_frames != display_hz) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1252 frame_repeat[source_hz-1] += display_hz - dst_frames;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1253 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1254 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1255 source_frame = 0;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1256 source_frame_count = frame_repeat[0];
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1257 max_repeat++;
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1258 min_buffered = (((float)max_repeat * (float)sample_rate/(float)source_hz)/* / (float)buffer_samples*/);// + 0.9999;
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1259 //min_buffered *= buffer_samples;
1792 52a47611a273 Avoid printing a bunch of junk to stdout when GDB remote debugging is enabled as this can confuse GDB Michael Pavone <pavone@retrodev.com> parents: 1693 diff changeset	1260 debug_message("Min samples buffered before audio start: %d\n", min_buffered);
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1261 max_adjust = BASE_MAX_ADJUST / source_hz;
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1262 }
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1263
874 b6842dfb8edf ROM is now run after being selected in menu. Initial path for menu is read from config file. Michael Pavone <pavone@retrodev.com> parents: 816 diff changeset	1264 void render_update_caption(char *title)
b6842dfb8edf ROM is now run after being selected in menu. Initial path for menu is read from config file. Michael Pavone <pavone@retrodev.com> parents: 816 diff changeset	1265 {
b6842dfb8edf ROM is now run after being selected in menu. Initial path for menu is read from config file. Michael Pavone <pavone@retrodev.com> parents: 816 diff changeset	1266 caption = title;
1068 624696318b5b Fix a memory corruption bug from failing to grow the buffer for the window caption when switching games Michael Pavone <pavone@retrodev.com> parents: 1033 diff changeset	1267 free(fps_caption);
624696318b5b Fix a memory corruption bug from failing to grow the buffer for the window caption when switching games Michael Pavone <pavone@retrodev.com> parents: 1033 diff changeset	1268 fps_caption = NULL;
874 b6842dfb8edf ROM is now run after being selected in menu. Initial path for menu is read from config file. Michael Pavone <pavone@retrodev.com> parents: 816 diff changeset	1269 }
b6842dfb8edf ROM is now run after being selected in menu. Initial path for menu is read from config file. Michael Pavone <pavone@retrodev.com> parents: 816 diff changeset	1270
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1271 static char *screenshot_path;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1272 void render_save_screenshot(char *path)
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1273 {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1274 if (screenshot_path) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1275 free(screenshot_path);
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1276 }
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1277 screenshot_path = path;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1278 }
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1279
1649 b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	1280 uint8_t render_create_window(char *caption, uint32_t width, uint32_t height, window_close_handler close_handler)
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1281 {
1642 c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1282 uint8_t win_idx = 0xFF;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1283 for (int i = 0; i < num_textures - FRAMEBUFFER_USER_START; i++)
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1284 {
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1285 if (!extra_windows[i]) {
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1286 win_idx = i;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1287 break;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1288 }
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1289 }
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1290
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1291 if (win_idx == 0xFF) {
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1292 num_textures++;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1293 sdl_textures = realloc(sdl_textures, num_textures * sizeof(*sdl_textures));
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1294 extra_windows = realloc(extra_windows, (num_textures - FRAMEBUFFER_USER_START) * sizeof(*extra_windows));
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1295 extra_renderers = realloc(extra_renderers, (num_textures - FRAMEBUFFER_USER_START) * sizeof(*extra_renderers));
1649 b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	1296 close_handlers = realloc(close_handlers, (num_textures - FRAMEBUFFER_USER_START) * sizeof(*close_handlers));
1642 c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1297 win_idx = num_textures - FRAMEBUFFER_USER_START - 1;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1298 }
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1299 extra_windows[win_idx] = SDL_CreateWindow(caption, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, 0);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1300 if (!extra_windows[win_idx]) {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1301 goto fail_window;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1302 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1303 extra_renderers[win_idx] = SDL_CreateRenderer(extra_windows[win_idx], -1, SDL_RENDERER_ACCELERATED);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1304 if (!extra_renderers[win_idx]) {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1305 goto fail_renderer;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1306 }
1642 c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1307 uint8_t texture_idx = win_idx + FRAMEBUFFER_USER_START;
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1308 sdl_textures[texture_idx] = SDL_CreateTexture(extra_renderers[win_idx], SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, width, height);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1309 if (!sdl_textures[texture_idx]) {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1310 goto fail_texture;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1311 }
1649 b500e971da75 Allow closing VDP debug windows with the close button in the window title bar Michael Pavone <pavone@retrodev.com> parents: 1642 diff changeset	1312 close_handlers[win_idx] = close_handler;
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1313 return texture_idx;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1314
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1315 fail_texture:
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1316 SDL_DestroyRenderer(extra_renderers[win_idx]);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1317 fail_renderer:
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1318 SDL_DestroyWindow(extra_windows[win_idx]);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1319 fail_window:
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1320 num_textures--;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1321 return 0;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1322 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1323
1642 c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1324 void render_destroy_window(uint8_t which)
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1325 {
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1326 uint8_t win_idx = which - FRAMEBUFFER_USER_START;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1327 //Destroying the renderers also frees the textures
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1328 SDL_DestroyRenderer(extra_renderers[win_idx]);
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1329 SDL_DestroyWindow(extra_windows[win_idx]);
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1330
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1331 extra_renderers[win_idx] = NULL;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1332 extra_windows[win_idx] = NULL;
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1333 }
c6b2c0f8cc61 Implemented support for toggling off a debug view Michael Pavone <pavone@retrodev.com> parents: 1635 diff changeset	1334
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1335 uint32_t *locked_pixels;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1336 uint32_t locked_pitch;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1337 uint32_t render_get_framebuffer(uint8_t which, int pitch)
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1338 {
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1339 if (run_on_audio_thread) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1340 pitch = LINEBUF_SIZE sizeof(uint32_t);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1341 uint32_t *buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1342 SDL_LockMutex(free_buffer_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1343 if (num_buffers) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1344 buffer = frame_buffers[--num_buffers];
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1345 } else {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1346 buffer = calloc(512*512, sizeof(uint32_t));
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1347 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1348 SDL_UnlockMutex(free_buffer_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1349 locked_pixels = buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1350 return buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1351 }
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1352 #ifndef DISABLE_OPENGL
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1353 if (render_gl && which <= FRAMEBUFFER_EVEN) {
1267 3772bb926be5 Initial stab at horizontal border emulation. Only works for H40 and still has a few minor holes to fill Michael Pavone <pavone@retrodev.com> parents: 1263 diff changeset	1354 pitch = LINEBUF_SIZE sizeof(uint32_t);
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1355 return texture_buf;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1356 } else {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1357 #endif
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1358 if (which == FRAMEBUFFER_UI && !sdl_textures[which]) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1359 sdl_textures[which] = SDL_CreateTexture(main_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, main_width, main_height);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1360 }
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1361 if (which >= num_textures) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1362 warning("Request for invalid framebuffer number %d\n", which);
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1363 return NULL;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1364 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1365 void *pixels;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1366 if (SDL_LockTexture(sdl_textures[which], NULL, &pixels, pitch) < 0) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1367 warning("Failed to lock texture: %s\n", SDL_GetError());
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1368 return NULL;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1369 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1370 static uint8_t last;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1371 if (which <= FRAMEBUFFER_EVEN) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1372 locked_pixels = pixels;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1373 if (which == FRAMEBUFFER_EVEN) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1374 pixels += *pitch;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1375 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1376 locked_pitch = *pitch;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1377 if (which != last) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1378 pitch = 2;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1379 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1380 last = which;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1381 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1382 return pixels;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1383 #ifndef DISABLE_OPENGL
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1384 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1385 #endif
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1386 }
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	1387
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1388 static void release_buffer(uint32_t *buffer)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1389 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1390 SDL_LockMutex(free_buffer_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1391 if (num_buffers == buffer_storage) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1392 buffer_storage *= 2;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1393 frame_buffers = realloc(frame_buffers, sizeof(uint32_t)buffer_storage);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1394 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1395 frame_buffers[num_buffers++] = buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1396 SDL_UnlockMutex(free_buffer_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1397 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1398
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1399 uint8_t events_processed;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1400 #ifdef __ANDROID__
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1401 #define FPS_INTERVAL 10000
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1402 #else
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1403 #define FPS_INTERVAL 1000
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1404 #endif
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1405
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1406 static uint32_t last_width, last_height;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1407 static uint8_t interlaced;
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1408 static void process_framebuffer(uint32_t *buffer, uint8_t which, int width)
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1409 {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1410 static uint8_t last;
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1411 if (!render_is_audio_sync() && which <= FRAMEBUFFER_EVEN && source_frame_count < 0) {
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1412 source_frame++;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1413 if (source_frame >= source_hz) {
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1414 source_frame = 0;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1415 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1416 source_frame_count = frame_repeat[source_frame];
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1417 //TODO: Figure out what to do about SDL Render API texture locking
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1418 return;
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1419 }
6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1420
1398 08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1421 last_width = width;
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1422 uint32_t height = which <= FRAMEBUFFER_EVEN
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1423 ? (video_standard == VID_NTSC ? 243 : 294) - (overscan_top[video_standard] + overscan_bot[video_standard])
b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1424 : 240;
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1425 FILE *screenshot_file = NULL;
1336 baaf05fd64c4 Make internal screenshot functionality completely ignore overscan settings rather than only doing it for the height Michael Pavone <pavone@retrodev.com> parents: 1328 diff changeset	1426 uint32_t shot_height, shot_width;
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1427 char *ext;
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1428 if (screenshot_path && which == FRAMEBUFFER_ODD) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1429 screenshot_file = fopen(screenshot_path, "wb");
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1430 if (screenshot_file) {
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1431 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1432 ext = path_extension(screenshot_path);
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1433 #endif
1851 419b458f93cd Demote screenshot message to debug level so that a popup is not spawned when saving a screenshot Michael Pavone <pavone@retrodev.com> parents: 1839 diff changeset	1434 debug_message("Saving screenshot to %s\n", screenshot_path);
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1435 } else {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1436 warning("Failed to open screenshot file %s for writing\n", screenshot_path);
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1437 }
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1438 free(screenshot_path);
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1439 screenshot_path = NULL;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1440 shot_height = video_standard == VID_NTSC ? 243 : 294;
1336 baaf05fd64c4 Make internal screenshot functionality completely ignore overscan settings rather than only doing it for the height Michael Pavone <pavone@retrodev.com> parents: 1328 diff changeset	1441 shot_width = width;
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1442 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1443 interlaced = last != which;
1336 baaf05fd64c4 Make internal screenshot functionality completely ignore overscan settings rather than only doing it for the height Michael Pavone <pavone@retrodev.com> parents: 1328 diff changeset	1444 width -= overscan_left[video_standard] + overscan_right[video_standard];
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1445 #ifndef DISABLE_OPENGL
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1446 if (render_gl && which <= FRAMEBUFFER_EVEN) {
1633 9b7cba9ba541 Use SDL_GL_MakeCurrent to make the SDL renderer API windows play nice with GL windows Michael Pavone <pavone@retrodev.com> parents: 1631 diff changeset	1447 SDL_GL_MakeCurrent(main_window, main_context);
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1448 glBindTexture(GL_TEXTURE_2D, textures[which]);
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1449 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LINEBUF_SIZE, height, SRC_FORMAT, GL_UNSIGNED_BYTE, buffer + overscan_left[video_standard] + LINEBUF_SIZE * overscan_top[video_standard]);
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1450
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1451 if (screenshot_file) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1452 //properly supporting interlaced modes here is non-trivial, so only save the odd field for now
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1453 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1454 if (!strcasecmp(ext, "png")) {
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1455 free(ext);
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1456 save_png(screenshot_file, buffer, shot_width, shot_height, LINEBUF_SIZE*sizeof(uint32_t));
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1457 } else {
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1458 free(ext);
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1459 #endif
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1460 save_ppm(screenshot_file, buffer, shot_width, shot_height, LINEBUF_SIZE*sizeof(uint32_t));
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1461 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1462 }
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1463 #endif
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1464 }
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1465 } else {
062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1466 #endif
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1467 //TODO: Support run_on_audio_thread for render API framebuffers
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1468 if (which <= FRAMEBUFFER_EVEN && last != which) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1469 uint8_t cur_dst = (uint8_t )locked_pixels;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1470 uint8_t cur_saved = (uint8_t )texture_buf;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1471 uint32_t dst_off = which == FRAMEBUFFER_EVEN ? 0 : locked_pitch;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1472 uint32_t src_off = which == FRAMEBUFFER_EVEN ? locked_pitch : 0;
1184 b1147418254a Overscan is now configurable Michael Pavone <pavone@retrodev.com> parents: 1167 diff changeset	1473 for (int i = 0; i < height; ++i)
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1474 {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1475 //copy saved line from other field
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1476 memcpy(cur_dst + dst_off, cur_saved, locked_pitch);
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1477 //save line from this field to buffer for next frame
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1478 memcpy(cur_saved, cur_dst + src_off, locked_pitch);
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1479 cur_dst += locked_pitch * 2;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1480 cur_saved += locked_pitch;
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1481 }
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1482 height = 480;
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1483 }
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1484 if (screenshot_file) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1485 uint32_t shot_pitch = locked_pitch;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1486 if (which == FRAMEBUFFER_EVEN) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1487 shot_height *= 2;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1488 } else {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1489 shot_pitch *= 2;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1490 }
1532 b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1491 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1492 if (!strcasecmp(ext, "png")) {
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1493 free(ext);
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1494 save_png(screenshot_file, locked_pixels, shot_width, shot_height, shot_pitch);
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1495 } else {
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1496 free(ext);
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1497 #endif
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1498 save_ppm(screenshot_file, locked_pixels, shot_width, shot_height, shot_pitch);
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1499 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1500 }
b505083dcd87 Added png screenshot support Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1501 #endif
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1502 }
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1503 SDL_UnlockTexture(sdl_textures[which]);
798 062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1504 #ifndef DISABLE_OPENGL
062a2199daf6 Use SDL2 renderer as a fallback =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 797 diff changeset	1505 }
797 65181c3ee560 Add pure SDL2 renderer =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com> parents: 766 diff changeset	1506 #endif
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1507 last_height = height;
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1508 if (which <= FRAMEBUFFER_EVEN) {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1509 render_update_display();
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1510 } else if (which == FRAMEBUFFER_UI) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1511 SDL_RenderCopy(main_renderer, sdl_textures[which], NULL, NULL);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1512 if (need_ui_fb_resize) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1513 SDL_DestroyTexture(sdl_textures[which]);
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1514 sdl_textures[which] = NULL;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1515 if (on_ui_fb_resized) {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1516 on_ui_fb_resized();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1517 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1518 need_ui_fb_resize = 0;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1519 }
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1520 } else {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1521 SDL_RenderCopy(extra_renderers[which - FRAMEBUFFER_USER_START], sdl_textures[which], NULL, NULL);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1522 SDL_RenderPresent(extra_renderers[which - FRAMEBUFFER_USER_START]);
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1523 }
1263 5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1524 if (screenshot_file) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1525 fclose(screenshot_file);
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10 Michael Pavone <pavone@retrodev.com> parents: 1258 diff changeset	1526 }
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1527 if (which <= FRAMEBUFFER_EVEN) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1528 last = which;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1529 static uint32_t frame_counter, start;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1530 frame_counter++;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1531 last_frame= SDL_GetTicks();
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1532 if ((last_frame - start) > FPS_INTERVAL) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1533 if (start && (last_frame-start)) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1534 #ifdef __ANDROID__
1839 78abbabfd58d Get Android build working again and update for SDL 2.0.7 (last version to support older versions of Android) Michael Pavone <pavone@retrodev.com> parents: 1825 diff changeset	1535 debug_message("%s - %.1f fps", caption, ((float)frame_counter) / (((float)(last_frame-start)) / 1000.0));
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1536 #else
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1537 if (!fps_caption) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1538 fps_caption = malloc(strlen(caption) + strlen(" - 100000000.1 fps") + 1);
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1539 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1540 sprintf(fps_caption, "%s - %.1f fps", caption, ((float)frame_counter) / (((float)(last_frame-start)) / 1000.0));
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1541 SDL_SetWindowTitle(main_window, fps_caption);
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1542 #endif
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1543 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1544 start = last_frame;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1545 frame_counter = 0;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1546 }
449 7696d824489d Started work on OpenGL support in new branch Mike Pavone <pavone@retrodev.com> parents: 426 diff changeset	1547 }
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1548 if (!render_is_audio_sync()) {
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1549 int32_t local_cur_min, local_min_remaining;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1550 SDL_LockAudio();
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1551 if (last_buffered > NO_LAST_BUFFERED) {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1552 average_change *= 0.9f;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1553 average_change += (cur_min_buffered - last_buffered) * 0.1f;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1554 }
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1555 local_cur_min = cur_min_buffered;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1556 local_min_remaining = min_remaining_buffer;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1557 last_buffered = cur_min_buffered;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1558 SDL_UnlockAudio();
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1559 float frames_to_problem;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1560 if (average_change < 0) {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1561 frames_to_problem = (float)local_cur_min / -average_change;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1562 } else {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1563 frames_to_problem = (float)local_min_remaining / average_change;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1564 }
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1565 float adjust_ratio = 0.0f;
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1566 if (
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1567 frames_to_problem < BUFFER_FRAMES_THRESHOLD
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1568 \|\| (average_change < 0 && local_cur_min < 3*min_buffered / 4)
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1569 \|\| (average_change >0 && local_cur_min > 5 * min_buffered / 4)
1635 022d01b64496 Fix edge case in DRC audio path Michael Pavone <pavone@retrodev.com> parents: 1633 diff changeset	1570 \|\| cur_min_buffered < 0
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1571 ) {
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1572
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1573 if (cur_min_buffered < 0) {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1574 adjust_ratio = max_adjust;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1575 SDL_PauseAudio(1);
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1576 last_buffered = NO_LAST_BUFFERED;
1589 780604a036e4 Limit underflow warning spam Michael Pavone <pavone@retrodev.com> parents: 1588 diff changeset	1577 cur_min_buffered = 0;
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1578 } else {
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1579 adjust_ratio = -1.0 * average_change / ((float)sample_rate / (float)source_hz);
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1580 adjust_ratio /= 2.5 * source_hz;
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1581 if (fabsf(adjust_ratio) > max_adjust) {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1582 adjust_ratio = adjust_ratio > 0 ? max_adjust : -max_adjust;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1583 }
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1584 }
1567 66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1585 } else if (local_cur_min < min_buffered / 2) {
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1586 adjust_ratio = max_adjust;
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1587 }
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs Michael Pavone <pavone@retrodev.com> parents: 1566 diff changeset	1588 if (adjust_ratio != 0.0f) {
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1589 average_change = 0;
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1590 render_audio_adjust_speed(adjust_ratio);
4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1591
1566 cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1592 }
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1593 while (source_frame_count > 0)
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1594 {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1595 render_update_display();
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1596 source_frame_count--;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1597 }
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1598 source_frame++;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1599 if (source_frame >= source_hz) {
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1600 source_frame = 0;
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1601 }
cbb40af77a94 Moved resample rate adjustment to after frame flip rather than in audio callback as it makes more sense there. Needs adjustment to avoid audible pitch changes Michael Pavone <pavone@retrodev.com> parents: 1565 diff changeset	1602 source_frame_count = frame_repeat[source_frame];
1563 6a62434d6bb1 WIP dynamic rate control Michael Pavone <pavone@retrodev.com> parents: 1562 diff changeset	1603 }
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1604 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1605
1932 b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1606 typedef struct {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1607 uint32_t *buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1608 int width;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1609 uint8_t which;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1610 } frame;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1611 frame frame_queue[4];
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1612 int frame_queue_len, frame_queue_read, frame_queue_write;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1613
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1614 void render_framebuffer_updated(uint8_t which, int width)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1615 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1616 if (run_on_audio_thread) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1617 SDL_LockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1618 while (frame_queue_len == 4) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1619 SDL_CondSignal(frame_ready);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1620 SDL_UnlockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1621 SDL_Delay(1);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1622 SDL_LockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1623 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1624 for (int cur = frame_queue_read, i = 0; i < frame_queue_len; i++) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1625 if (frame_queue[cur].which == which) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1626 int last = (frame_queue_write - 1) & 3;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1627 frame_queue_len--;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1628 release_buffer(frame_queue[cur].buffer);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1629 if (last != cur) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1630 frame_queue[cur] = frame_queue[last];
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1631 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1632 frame_queue_write = last;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1633 break;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1634 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1635 cur = (cur + 1) & 3;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1636 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1637 frame_queue[frame_queue_write++] = (frame){
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1638 .buffer = locked_pixels,
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1639 .width = width,
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1640 .which = which
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1641 };
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1642 frame_queue_write &= 0x3;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1643 frame_queue_len++;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1644 SDL_CondSignal(frame_ready);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1645 SDL_UnlockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1646 return;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1647 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1648 //TODO: Maybe fixme for render API
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1649 process_framebuffer(texture_buf, which, width);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1650 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1651
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1652 void render_video_loop(void)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1653 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1654 if (!run_on_audio_thread) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1655 return;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1656 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1657 SDL_PauseAudio(0);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1658 SDL_LockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1659 for(;;)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1660 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1661 while (!frame_queue_len)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1662 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1663 SDL_CondWait(frame_ready, frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1664 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1665 for (int i = 0; i < frame_queue_len; i++)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1666 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1667 frame f = frame_queue[frame_queue_read++];
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1668 frame_queue_read &= 0x3;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1669 process_framebuffer(f.buffer, f.which, f.width);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1670 release_buffer(f.buffer);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1671 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1672 frame_queue_len = 0;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1673 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1674
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1675 SDL_UnlockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1676 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread Michael Pavone <pavone@retrodev.com> parents: 1895 diff changeset	1677
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1678 static ui_render_fun render_ui;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1679 void render_set_ui_render_fun(ui_render_fun fun)
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1680 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1681 render_ui = fun;
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1682 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1683
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1684 void render_update_display()
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1685 {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1686 #ifndef DISABLE_OPENGL
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1687 if (render_gl) {
1528 855210dca5b9 Set glClearColor back to black Michael Pavone <pavone@retrodev.com> parents: 1483 diff changeset	1688 glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
1474 c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1689 glClear(GL_COLOR_BUFFER_BIT);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1690
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1691 glUseProgram(program);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1692 glActiveTexture(GL_TEXTURE0);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1693 glBindTexture(GL_TEXTURE_2D, textures[0]);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1694 glUniform1i(un_textures[0], 0);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1695
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1696 glActiveTexture(GL_TEXTURE1);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1697 glBindTexture(GL_TEXTURE_2D, textures[interlaced ? 1 : scanlines ? 2 : 0]);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1698 glUniform1i(un_textures[1], 1);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1699
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1700 glUniform1f(un_width, render_emulated_width());
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1701 glUniform1f(un_height, last_height);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1702
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1703 glBindBuffer(GL_ARRAY_BUFFER, buffers[0]);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1704 glVertexAttribPointer(at_pos, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat[2]), (void *)0);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1705 glEnableVertexAttribArray(at_pos);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1706
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1707 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffers[1]);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1708 glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, (void *)0);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1709
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1710 glDisableVertexAttribArray(at_pos);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1711
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1712 if (render_ui) {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1713 render_ui();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1714 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1715
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1716 SDL_GL_SwapWindow(main_window);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1717 } else {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1718 #endif
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1719 SDL_Rect src_clip = {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1720 .x = overscan_left[video_standard],
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1721 .y = overscan_top[video_standard],
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1722 .w = render_emulated_width(),
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1723 .h = last_height
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1724 };
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1725 SDL_SetRenderDrawColor(main_renderer, 0, 0, 0, 255);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1726 SDL_RenderClear(main_renderer);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1727 SDL_RenderCopy(main_renderer, sdl_textures[FRAMEBUFFER_ODD], &src_clip, &main_clip);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1728 if (render_ui) {
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1729 render_ui();
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1730 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1731 SDL_RenderPresent(main_renderer);
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1732 #ifndef DISABLE_OPENGL
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1733 }
c5c022c7aa54 Initial work on Nuklear-based UI Michael Pavone <pavone@retrodev.com> parents: 1441 diff changeset	1734 #endif
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1735 if (!events_processed) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1736 process_events();
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1737 }
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1738 events_processed = 0;
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1739 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1740
1398 08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1741 uint32_t render_emulated_width()
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1742 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1743 return last_width - overscan_left[video_standard] - overscan_right[video_standard];
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1744 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1745
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1746 uint32_t render_emulated_height()
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1747 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1748 return (video_standard == VID_NTSC ? 243 : 294) - overscan_top[video_standard] - overscan_bot[video_standard];
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1749 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1750
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1751 uint32_t render_overscan_left()
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1752 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1753 return overscan_left[video_standard];
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1754 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1755
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1756 uint32_t render_overscan_top()
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1757 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1758 return overscan_top[video_standard];
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1759 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used Michael Pavone <pavone@retrodev.com> parents: 1397 diff changeset	1760
1881 55198fc9cc1f Don't render lines that are cropped by overscan. Allows submitting frame earlier when bottom overscan is non-zero which can reduce latency in some cases Mike Pavone <pavone@retrodev.com> parents: 1865 diff changeset	1761 uint32_t render_overscan_bot()
55198fc9cc1f Don't render lines that are cropped by overscan. Allows submitting frame earlier when bottom overscan is non-zero which can reduce latency in some cases Mike Pavone <pavone@retrodev.com> parents: 1865 diff changeset	1762 {
55198fc9cc1f Don't render lines that are cropped by overscan. Allows submitting frame earlier when bottom overscan is non-zero which can reduce latency in some cases Mike Pavone <pavone@retrodev.com> parents: 1865 diff changeset	1763 return overscan_bot[video_standard];
55198fc9cc1f Don't render lines that are cropped by overscan. Allows submitting frame earlier when bottom overscan is non-zero which can reduce latency in some cases Mike Pavone <pavone@retrodev.com> parents: 1865 diff changeset	1764 }
55198fc9cc1f Don't render lines that are cropped by overscan. Allows submitting frame earlier when bottom overscan is non-zero which can reduce latency in some cases Mike Pavone <pavone@retrodev.com> parents: 1865 diff changeset	1765
1865 4c322abd9fa5 Split generic part of audio code into a separate file so it can be used in other targets besides SDL Michael Pavone <pavone@retrodev.com> parents: 1862 diff changeset	1766 void render_wait_quit(void)
20 f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1767 {
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1768 SDL_Event event;
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1769 while(SDL_WaitEvent(&event)) {
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1770 switch (event.type) {
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1771 case SDL_QUIT:
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1772 return;
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1773 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1774 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1775 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer Mike Pavone <pavone@retrodev.com> parents: diff changeset	1776
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1777 int render_lookup_button(char *name)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1778 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1779 static tern_node *button_lookup;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1780 if (!button_lookup) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1781 for (int i = SDL_CONTROLLER_BUTTON_A; i < SDL_CONTROLLER_BUTTON_MAX; i++)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1782 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1783 button_lookup = tern_insert_int(button_lookup, SDL_GameControllerGetStringForButton(i), i);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1784 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1785 //alternative Playstation-style names
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1786 button_lookup = tern_insert_int(button_lookup, "cross", SDL_CONTROLLER_BUTTON_A);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1787 button_lookup = tern_insert_int(button_lookup, "circle", SDL_CONTROLLER_BUTTON_B);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1788 button_lookup = tern_insert_int(button_lookup, "square", SDL_CONTROLLER_BUTTON_X);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1789 button_lookup = tern_insert_int(button_lookup, "triangle", SDL_CONTROLLER_BUTTON_Y);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1790 button_lookup = tern_insert_int(button_lookup, "share", SDL_CONTROLLER_BUTTON_BACK);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1791 button_lookup = tern_insert_int(button_lookup, "select", SDL_CONTROLLER_BUTTON_BACK);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1792 button_lookup = tern_insert_int(button_lookup, "options", SDL_CONTROLLER_BUTTON_START);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1793 button_lookup = tern_insert_int(button_lookup, "l1", SDL_CONTROLLER_BUTTON_LEFTSHOULDER);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1794 button_lookup = tern_insert_int(button_lookup, "r1", SDL_CONTROLLER_BUTTON_RIGHTSHOULDER);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1795 button_lookup = tern_insert_int(button_lookup, "l3", SDL_CONTROLLER_BUTTON_LEFTSTICK);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1796 button_lookup = tern_insert_int(button_lookup, "r3", SDL_CONTROLLER_BUTTON_RIGHTSTICK);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1797 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1798 return (int)tern_find_int(button_lookup, name, SDL_CONTROLLER_BUTTON_INVALID);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1799 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1800
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1801 int render_lookup_axis(char *name)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1802 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1803 static tern_node *axis_lookup;
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1804 if (!axis_lookup) {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1805 for (int i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++)
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1806 {
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1807 axis_lookup = tern_insert_int(axis_lookup, SDL_GameControllerGetStringForAxis(i), i);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1808 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1809 //alternative Playstation-style names
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1810 axis_lookup = tern_insert_int(axis_lookup, "l2", SDL_CONTROLLER_AXIS_TRIGGERLEFT);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1811 axis_lookup = tern_insert_int(axis_lookup, "r2", SDL_CONTROLLER_AXIS_TRIGGERRIGHT);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1812 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1813 return (int)tern_find_int(axis_lookup, name, SDL_CONTROLLER_AXIS_INVALID);
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1814 }
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1815
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1816 int32_t render_translate_input_name(int32_t controller, char *name, uint8_t is_axis)
1187 6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1817 {
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1818 tern_node button_lookup, axis_lookup;
1187 6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1819 if (controller > MAX_JOYSTICKS \|\| !joysticks[controller]) {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1820 return RENDER_NOT_PLUGGED_IN;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1821 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1822
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1823 if (!SDL_IsGameController(joystick_sdl_index[controller])) {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1824 return RENDER_NOT_MAPPED;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1825 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1826 SDL_GameController *control = SDL_GameControllerOpen(joystick_sdl_index[controller]);
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1827 if (!control) {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1828 warning("Failed to open game controller %d: %s\n", controller, SDL_GetError());
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1829 return RENDER_NOT_PLUGGED_IN;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1830 }
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1831
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1832 SDL_GameControllerButtonBind cbind;
1804 34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1799 diff changeset	1833 int32_t is_positive = RENDER_AXIS_POS;
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1834 if (is_axis) {
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1835
18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1836 int sdl_axis = render_lookup_axis(name);
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1837 if (sdl_axis == SDL_CONTROLLER_AXIS_INVALID) {
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1838 SDL_GameControllerClose(control);
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1839 return RENDER_INVALID_NAME;
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1840 }
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1841 cbind = SDL_GameControllerGetBindForAxis(control, sdl_axis);
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1842 } else {
1623 18a946ec74c8 Pull current controller config in binding UI from whatever the actual binding code would end up using Michael Pavone <pavone@retrodev.com> parents: 1608 diff changeset	1843 int sdl_button = render_lookup_button(name);
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1844 if (sdl_button == SDL_CONTROLLER_BUTTON_INVALID) {
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1845 SDL_GameControllerClose(control);
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1846 return RENDER_INVALID_NAME;
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1847 }
1804 34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1799 diff changeset	1848 if (sdl_button == SDL_CONTROLLER_BUTTON_DPAD_UP \|\| sdl_button == SDL_CONTROLLER_BUTTON_DPAD_LEFT) {
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1799 diff changeset	1849 //assume these will be negative if they are an axis
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1799 diff changeset	1850 is_positive = 0;
34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1799 diff changeset	1851 }
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1852 cbind = SDL_GameControllerGetBindForButton(control, sdl_button);
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1853 }
1187 6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1854 SDL_GameControllerClose(control);
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1855 switch (cbind.bindType)
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1856 {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1857 case SDL_CONTROLLER_BINDTYPE_BUTTON:
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1858 return cbind.value.button;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1859 case SDL_CONTROLLER_BINDTYPE_AXIS:
1804 34370330eaf3 Support controllers that have their dpad mapped to an axis Michael Pavone <pavone@retrodev.com> parents: 1799 diff changeset	1860 return RENDER_AXIS_BIT \| cbind.value.axis \| is_positive;
1187 6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1861 case SDL_CONTROLLER_BINDTYPE_HAT:
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1862 return RENDER_DPAD_BIT \| (cbind.value.hat.hat << 4) \| cbind.value.hat.hat_mask;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1863 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1864 return RENDER_NOT_MAPPED;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1865 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1866
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1867 int32_t render_dpad_part(int32_t input)
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1868 {
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1869 return input >> 4 & 0xFFFFFF;
1187 6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1870 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1871
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1872 uint8_t render_direction_part(int32_t input)
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1873 {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1874 return input & 0xF;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1875 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality Michael Pavone <pavone@retrodev.com> parents: 1184 diff changeset	1876
1207 9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1877 int32_t render_axis_part(int32_t input)
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1878 {
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1879 return input & 0xFFFFFFF;
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1880 }
9d6f155732ed Basic support for mapping an analog axis to functionality Michael Pavone <pavone@retrodev.com> parents: 1205 diff changeset	1881
409 c1bddeadc566 Process events in vgm player so that quitting works Mike Pavone <pavone@retrodev.com> parents: 398 diff changeset	1882 void process_events()
c1bddeadc566 Process events in vgm player so that quitting works Mike Pavone <pavone@retrodev.com> parents: 398 diff changeset	1883 {
1077 1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1884 if (events_processed > MAX_EVENT_POLL_PER_FRAME) {
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1885 return;
1a66d5165ea7 Cleanup the separation of render backend and VDP code in preparation for having extra debug windows. Make determination of H40/H32 based on number of lines in each mode. Michael Pavone <pavone@retrodev.com> parents: 1074 diff changeset	1886 }
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1887 drain_events();
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1888 events_processed++;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1889 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1890
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1891 #define TOGGLE_MIN_DELAY 250
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1892 void render_toggle_fullscreen()
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1893 {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1894 //protect against event processing causing us to attempt to toggle while still toggling
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1895 if (in_toggle) {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1896 return;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1897 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1898 in_toggle = 1;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1899
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1900 //toggling too fast seems to cause a deadlock
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1901 static uint32_t last_toggle;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1902 uint32_t cur = SDL_GetTicks();
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1903 if (last_toggle && cur - last_toggle < TOGGLE_MIN_DELAY) {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1904 in_toggle = 0;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1905 return;
409 c1bddeadc566 Process events in vgm player so that quitting works Mike Pavone <pavone@retrodev.com> parents: 398 diff changeset	1906 }
1202 a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1907 last_toggle = cur;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1908
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1909 drain_events();
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1910 is_fullscreen = !is_fullscreen;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1911 if (is_fullscreen) {
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1912 SDL_DisplayMode mode;
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1913 //TODO: Multiple monitor support
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1914 SDL_GetCurrentDisplayMode(0, &mode);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1915 //In theory, the SDL2 docs suggest this is unnecessary
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1916 //but without it the OpenGL context remains the original size
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1917 //This needs to happen before the fullscreen transition to have any effect
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1918 //because SDL does not apply window size changes in fullscreen
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1919 SDL_SetWindowSize(main_window, mode.w, mode.h);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1920 }
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1921 SDL_SetWindowFullscreen(main_window, is_fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1922 //Since we change the window size on transition to full screen
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1923 //we need to set it back to normal so we can also go back to windowed mode
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1924 //normally you would think that this should only be done when actually transitioning
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1925 //but something is screwy in the guts of SDL (at least on Linux) and setting it each time
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1926 //is the only thing that seems to work reliably
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1927 //when we've just switched to fullscreen mode this should be harmless though
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1928 SDL_SetWindowSize(main_window, windowed_width, windowed_height);
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1929 drain_events();
a6ae693974e0 Allow toggling full screen mode at runtime. Allow resizing the window in windowed mode. Allow specifying the aspect ratio in the config file. Michael Pavone <pavone@retrodev.com> parents: 1198 diff changeset	1930 in_toggle = 0;
1825 56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled Michael Pavone <pavone@retrodev.com> parents: 1820 diff changeset	1931 need_ui_fb_resize = 1;
409 c1bddeadc566 Process events in vgm player so that quitting works Mike Pavone <pavone@retrodev.com> parents: 398 diff changeset	1932 }
c1bddeadc566 Process events in vgm player so that quitting works Mike Pavone <pavone@retrodev.com> parents: 398 diff changeset	1933
792 724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1934 void render_errorbox(char title, char message)
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1935 {
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1936 SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, message, NULL);
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1937 }
354 15dd6418fe67 Initial PSG support. Mostly works, noise channel is borked though. Mike Pavone <pavone@retrodev.com> parents: 342 diff changeset	1938
792 724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1939 void render_warnbox(char title, char message)
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1940 {
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1941 SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_WARNING, title, message, NULL);
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1942 }
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1943
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1944 void render_infobox(char title, char message)
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1945 {
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1946 SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, title, message, NULL);
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1947 }
724bbec47f86 Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows). Michael Pavone <pavone@retrodev.com> parents: 766 diff changeset	1948
1482 2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1949 uint32_t render_elapsed_ms(void)
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1950 {
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1951 return SDL_GetTicks();
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1952 }
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1953
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1954 void render_sleep_ms(uint32_t delay)
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1955 {
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1956 return SDL_Delay(delay);
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1957 }
2d203bf73dbd Avoid burning a huge amount of CPU in the menu when emulation is not running and vsync is disabled Michael Pavone <pavone@retrodev.com> parents: 1476 diff changeset	1958
1483 001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1959 uint8_t render_has_gl(void)
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1960 {
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1961 return render_gl;
001120e91fed Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable Michael Pavone <pavone@retrodev.com> parents: 1482 diff changeset	1962 }
1631 c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1963
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1964 uint8_t render_get_active_framebuffer(void)
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1965 {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1966 if (SDL_GetWindowFlags(main_window) & SDL_WINDOW_INPUT_FOCUS) {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1967 return FRAMEBUFFER_ODD;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1968 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1969 for (int i = 0; i < num_textures - 2; i++)
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1970 {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1971 if (extra_windows[i] && (SDL_GetWindowFlags(extra_windows[i]) & SDL_WINDOW_INPUT_FOCUS)) {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1972 return FRAMEBUFFER_USER_START + i;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1973 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1974 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1975 return 0xFF;
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally Michael Pavone <pavone@retrodev.com> parents: 1623 diff changeset	1976 }

Mercurial > repos > blastem

annotate render_sdl.c @ 1936:2c1c88cd1a3f mame_interp