Mercurial > repos > blastem

annotate render_sdl.c @ 2600:251cc75574af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Basic emscripten support
author Michael Pavone <pavone@retrodev.com>
date Thu, 13 Feb 2025 02:18:30 -0800
parents 35f765c2bc87
children f5603b4ee14d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
32
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
33 typedef struct {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
34 SDL_Window *win;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
35 SDL_Renderer *renderer;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
36 SDL_Texture *sdl_texture;
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
37 SDL_Texture **static_images;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
38 window_close_handler on_close;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
39 uint32_t width;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
40 uint32_t height;
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
41 uint8_t num_static;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
42 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
43 SDL_GLContext *gl_context;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
44 uint32_t *texture_buf;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
45 uint32_t tex_width;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
46 uint32_t tex_height;
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
47 GLuint gl_texture[2];
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
48 GLuint *gl_static_images;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
49 GLuint vshader;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
50 GLuint fshader;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
51 GLuint program;
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
52 GLuint gl_buffers[3];
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
53 GLuint image_buffer;
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
54 GLfloat *image_vertices;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
55 GLint un_texture;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
56 GLint un_width;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
57 GLint un_height;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
58 GLint at_pos;
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
59 GLint at_uv;
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
60 uint8_t color[4];
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
61 #endif
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
62 } extra_window;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
63
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
64 static SDL_Window *main_window;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
65 static extra_window *extras;
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
66 static SDL_Renderer *main_renderer;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
67 static SDL_Texture *sdl_textures[FRAMEBUFFER_UI + 1];
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
68 static window_close_handler *close_handlers;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
69 static uint8_t num_extras;
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
70 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
71 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
72
2392
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
73 static int main_width, main_height, windowed_width, windowed_height;
914
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
74
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
75 static uint8_t render_gl = 1;
2392
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
76 static uint8_t scanlines, is_fullscreen, force_cursor;
20
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
77
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
78 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
79
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
80 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
81 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
82 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
83
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
84 enum {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
85 SYNC_AUDIO,
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
86 SYNC_AUDIO_THREAD,
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
87 SYNC_VIDEO,
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
88 SYNC_EXTERNAL
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
89 };
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
90
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
91 static uint8_t sync_src;
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
92 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
93
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
94 uint32_t **frame_buffers;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
95 uint32_t num_buffers;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
96 uint32_t buffer_storage;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
97
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
98 uint32_t render_min_buffered(void)
1552
13a82adb185b Add support for float32 format audio samples
Michael Pavone <pavone@retrodev.com>
parents: 1551
diff changeset
99 {
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
100 return min_buffered;
1796
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1792
diff changeset
101 }
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1792
diff changeset
102
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
103 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
104 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
105 return sync_src < SYNC_VIDEO;
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
106 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
107
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
108 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
109 {
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
110 #ifdef __EMSCRIPTEN__
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
111 return 0;
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
112 #else
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
113 return sync_src != SYNC_AUDIO_THREAD;
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
114 #endif
1796
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1792
diff changeset
115 }
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1792
diff changeset
116
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
117 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
118 {
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
119 SDL_CondSignal(src->opaque);
1552
13a82adb185b Add support for float32 format audio samples
Michael Pavone <pavone@retrodev.com>
parents: 1551
diff changeset
120 }
13a82adb185b Add support for float32 format audio samples
Michael Pavone <pavone@retrodev.com>
parents: 1551
diff changeset
121
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
122 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
123 {
354
15dd6418fe67 Initial PSG support. Mostly works, noise channel is borked though.
Mike Pavone <pavone@retrodev.com>
parents: 342
diff changeset
124 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
125 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
126 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
127 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
128 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
129 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
130 }
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
131 } 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
132 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
133 mix_and_convert(byte_stream, len, NULL);
361
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
134 }
1551
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents: 1534
diff changeset
135 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
136 }
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
137
1564
48b08986bf8f Mostly working dynamic rate control. Needs some tweaking, especially for PAL
Michael Pavone <pavone@retrodev.com>
parents: 1563
diff changeset
138 #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
139 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
140 static float average_change;
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
141 #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
142 #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
143 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
144 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
145 static uint32_t min_remaining_buffer;
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
146 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
147 {
1589
780604a036e4 Limit underflow warning spam
Michael Pavone <pavone@retrodev.com>
parents: 1588
diff changeset
148 if (cur_min_buffered < 0) {
780604a036e4 Limit underflow warning spam
Michael Pavone <pavone@retrodev.com>
parents: 1588
diff changeset
149 //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
150 return;
780604a036e4 Limit underflow warning spam
Michael Pavone <pavone@retrodev.com>
parents: 1588
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 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
153 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
154
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
155 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
156 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
157 if (current_system) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
158 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
159 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
160 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
161 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
162
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
163 void render_lock_audio()
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
164 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
165 if (sync_src == SYNC_AUDIO) {
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
166 SDL_LockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
167 } else {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
168 SDL_LockAudio();
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
169 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
170 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
171
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
172 void render_unlock_audio()
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
173 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
174 if (sync_src == SYNC_AUDIO) {
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
175 SDL_UnlockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
176 } else {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
177 SDL_UnlockAudio();
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
178 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
179 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
180
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
181 static void render_close_audio()
361
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
182 {
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
183 SDL_LockMutex(audio_mutex);
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
184 quitting = 1;
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
185 SDL_CondSignal(audio_ready);
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
186 SDL_UnlockMutex(audio_mutex);
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
187 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
188 /*
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
189 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
190 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
191 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
192 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
193 }
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
194 */
361
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
195 }
946ae3749260 Fix deadlock on quit
Mike Pavone <pavone@retrodev.com>
parents: 356
diff changeset
196
2370
6bcc2ab01ac6 Fix netplay crash
Michael Pavone <pavone@retrodev.com>
parents: 2368
diff changeset
197 static uint8_t audio_active;
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
198 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
199 {
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
200 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
201 }
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
202
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
203 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
204 {
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
205 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
206 }
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
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
208 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
209 {
2370
6bcc2ab01ac6 Fix netplay crash
Michael Pavone <pavone@retrodev.com>
parents: 2368
diff changeset
210 audio_active = 1;
1981
3537514ea206 Go back to unpausing audio in render_video_loop to ensure the core is no longer running on the main thread when audio callbacks start when using run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1980
diff changeset
211 if (sync_src == SYNC_AUDIO) {
2004
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
212 //SDL_PauseAudio acquires the audio device lock, which is held while the callback runs
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
213 //since our callback can itself be stuck waiting on the audio_ready condition variable
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
214 //calling SDL_PauseAudio(0) again for audio sources after the first can deadlock
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
215 //fortunately SDL_GetAudioStatus does not acquire the lock so is safe to call here
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
216 if (SDL_GetAudioStatus() == SDL_AUDIO_PAUSED) {
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
217 SDL_PauseAudio(0);
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
218 }
1551
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents: 1534
diff changeset
219 }
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
220 if (current_system && sync_src == SYNC_AUDIO_THREAD) {
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
221 system_request_exit(current_system, 0);
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
222 }
1796
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1792
diff changeset
223 }
51417bb557b6 Configurable gain for overall output and individual components
Michael Pavone <pavone@retrodev.com>
parents: 1792
diff changeset
224
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
225 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
226 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
227 if (sync_src == SYNC_AUDIO) {
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
228 SDL_CondSignal(audio_ready);
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
229 }
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
230 if (!remaining_sources && render_is_audio_sync()) {
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
231 SDL_PauseAudio(1);
2370
6bcc2ab01ac6 Fix netplay crash
Michael Pavone <pavone@retrodev.com>
parents: 2368
diff changeset
232 audio_active = 0;
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
233 if (sync_src == SYNC_AUDIO_THREAD) {
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
234 SDL_CondSignal(frame_ready);
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
235 }
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
236 }
1551
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents: 1534
diff changeset
237 }
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents: 1534
diff changeset
238
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
239 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
240 {
2370
6bcc2ab01ac6 Fix netplay crash
Michael Pavone <pavone@retrodev.com>
parents: 2368
diff changeset
241 audio_active = 1;
1981
3537514ea206 Go back to unpausing audio in render_video_loop to ensure the core is no longer running on the main thread when audio callbacks start when using run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1980
diff changeset
242 if (sync_src == SYNC_AUDIO) {
2004
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
243 //SDL_PauseAudio acquires the audio device lock, which is held while the callback runs
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
244 //since our callback can itself be stuck waiting on the audio_ready condition variable
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
245 //calling SDL_PauseAudio(0) again for audio sources after the first can deadlock
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
246 //fortunately SDL_GetAudioStatus does not acquire the lock so is safe to call here
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
247 if (SDL_GetAudioStatus() == SDL_AUDIO_PAUSED) {
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
248 SDL_PauseAudio(0);
66f08024d9e9 Fix occasional deadlock on startup when using audio sync
Michael Pavone <pavone@retrodev.com>
parents: 1981
diff changeset
249 }
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
250 }
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
251 if (current_system && sync_src == SYNC_AUDIO_THREAD) {
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
252 system_request_exit(current_system, 0);
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
253 }
1551
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents: 1534
diff changeset
254 }
ce1f93be0104 Small cleanup to audio interface between emulation code and renderer backend
Michael Pavone <pavone@retrodev.com>
parents: 1534
diff changeset
255
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
256 uint8_t audio_deadlock_hack(void);
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
257
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
258 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
259 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
260 if (sync_src == SYNC_AUDIO_THREAD) {
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
261 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
262 src->front = src->back;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
263 src->back = tmp;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
264 src->front_populated = 1;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
265 src->buffer_pos = 0;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
266 if (all_sources_ready()) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
267 //we've emulated far enough to fill the current buffer
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
268 system_request_exit(current_system, 0);
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
269 }
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
270 } else if (sync_src == SYNC_AUDIO) {
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
271 SDL_LockMutex(audio_mutex);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
272 if (src->front_populated) {
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
273 if (audio_deadlock_hack()) {
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
274 SDL_CondSignal(audio_ready);
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
275 }
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
276 }
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
277 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
278 SDL_CondWait(src->opaque, audio_mutex);
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
279 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
280 int16_t *tmp = src->front;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
281 src->front = src->back;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
282 src->back = tmp;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
283 src->front_populated = 1;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
284 src->buffer_pos = 0;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
285 SDL_CondSignal(audio_ready);
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
286 SDL_UnlockMutex(audio_mutex);
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
287 } else {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
288 uint32_t num_buffered;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
289 SDL_LockAudio();
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
290 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
291 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
292 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
293 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
294 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
295 }
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
296 }
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
297 }
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
298
937
9364dad5561a Added reasonable handling of joystick hotplug
Michael Pavone <pavone@retrodev.com>
parents: 915
diff changeset
299 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
300 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
301 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
302
914
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
303 int render_width()
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
304 {
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
305 return main_width;
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
306 }
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
307
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
308 int render_height()
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
309 {
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
310 return main_height;
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
311 }
28ec32e720b2 Scale mouse data based on window size
Michael Pavone <pavone@retrodev.com>
parents: 907
diff changeset
312
2405
b50fa7602e39 Fix libblastem target
Michael Pavone <pavone@retrodev.com>
parents: 2404
diff changeset
313 uint8_t render_fullscreen(void)
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
314 {
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
315 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
316 }
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
317
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
318 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
319 {
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
320 #ifdef USE_GLES
2346
0111c8344477 Fix some issues identified by asan/ubsan
Michael Pavone <pavone@retrodev.com>
parents: 2318
diff changeset
321 return 255UL << 24 | b << 16 | g << 8 | r;
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
322 #else
2346
0111c8344477 Fix some issues identified by asan/ubsan
Michael Pavone <pavone@retrodev.com>
parents: 2318
diff changeset
323 return 255UL << 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
324 #endif
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
325 }
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
326
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
327 static uint8_t external_sync;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
328 void render_set_external_sync(uint8_t ext_sync_on)
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
329 {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
330 if (ext_sync_on != external_sync) {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
331 external_sync = ext_sync_on;
1975
3701517d852c Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents: 1967
diff changeset
332 if (windowed_width) {
3701517d852c Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents: 1967
diff changeset
333 //only do this if render_init has already been called
3701517d852c Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents: 1967
diff changeset
334 render_config_updated();
3701517d852c Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents: 1967
diff changeset
335 }
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
336 }
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
337 }
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
338
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
339 static int tex_width, tex_height;
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
340 #ifndef DISABLE_OPENGL
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
341 static GLuint textures[3], buffers[2], vshader, fshader, program;
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
342 static GLint un_textures[2], un_width, un_height, un_texsize, un_curfield, un_interlaced, un_scanlines, at_pos;
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
343
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
344 static GLfloat vertex_data_default[] = {
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
345 -1.0f, -1.0f,
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
346 1.0f, -1.0f,
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
347 -1.0f, 1.0f,
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
348 1.0f, 1.0f
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
349 };
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
350
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
351 static GLfloat uvs[] = {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
352 0.0f, 1.0f,
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
353 1.0f, 1.0f,
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
354 0.0f, 0.0f,
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
355 1.0f, 0.0f
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
356 };
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
357
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
358 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
359
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
360 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
361
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
362 static const GLchar shader_prefix[] =
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
363 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
364 "#version 100\n";
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
365 #else
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
366 "#version 110\n"
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
367 "#define lowp\n"
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
368 "#define mediump\n"
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
369 "#define highp\n";
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
370 #endif
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
371
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
372 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
373 {
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
374 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
375 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
376 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
377 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
378 #ifndef __ANDROID__
884
252dfd29831d Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents: 874
diff changeset
379 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
380 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
381 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
382 free(shader_path);
1693
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
383 if (f) {
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
384 fsize = file_size(f);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
385 text = malloc(fsize);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
386 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
387 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
388 free(text);
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
389 return 0;
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
390 }
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
391 } 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
392 #endif
1693
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
393 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
394 uint32_t fsize32;
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
395 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
396 free(shader_path);
1693
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
397 if (!text) {
800
ec23202df6a6 Minor cleanup
Michael Pavone <pavone@retrodev.com>
parents: 799
diff changeset
398 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
399 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
400 }
1693
ba3fb7a3be6b Added some Makefile options to build a packaging friendly executable
Michael Pavone <pavone@retrodev.com>
parents: 1686
diff changeset
401 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
402 #ifndef __ANDROID__
488
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
403 }
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
404 #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
405 text[fsize] = 0;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
406
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
407 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
408 GLchar *tmp = text;
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
409 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
410 free(tmp);
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
411 fsize += strlen(shader_prefix);
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
412 }
488
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
413 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
414 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
415 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
416 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
417 }
488
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
418 glShaderSource(ret, 1, (const GLchar **)&text, (const GLint *)&fsize);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
419 free(text);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
420 glCompileShader(ret);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
421 GLint compile_status, loglen;
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
422 glGetShaderiv(ret, GL_COMPILE_STATUS, &compile_status);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
423 if (!compile_status) {
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
424 glGetShaderiv(ret, GL_INFO_LOG_LENGTH, &loglen);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
425 text = malloc(loglen);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
426 glGetShaderInfoLog(ret, loglen, NULL, text);
800
ec23202df6a6 Minor cleanup
Michael Pavone <pavone@retrodev.com>
parents: 799
diff changeset
427 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
428 free(text);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
429 glDeleteShader(ret);
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
430 return 0;
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
431 }
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
432 return ret;
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
433 }
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
434 #endif
488
32f053ad9b02 Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents: 487
diff changeset
435
1167
e758ddbf0624 Initial work on emulating top and bottom border area
Michael Pavone <pavone@retrodev.com>
parents: 1117
diff changeset
436 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
437 #ifdef DISABLE_OPENGL
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
438 #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
439 #else
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
440 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
441 #define INTERNAL_FORMAT GL_RGBA
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
442 #define SRC_FORMAT GL_RGBA
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
443 #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
444 #else
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
445 #define INTERNAL_FORMAT GL_RGBA8
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
446 #define SRC_FORMAT GL_BGRA
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
447 #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
448 #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
449 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
450 {
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
451 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
452 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
453 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
454 glGenTextures(3, textures);
1977
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
455 def.ptrval = "off";
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
456 char *npot_textures = tern_find_path_default(config, "video\0npot_textures\0", def, TVAL_PTR).ptrval;
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
457 if (!strcmp(npot_textures, "on")) {
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
458 tex_width = LINEBUF_SIZE;
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
459 tex_height = 294; //PAL height with full borders
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
460 } else {
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
461 tex_width = tex_height = 512;
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
462 }
2031
0757da8ee702 Fix some stuff that was calling printf directly
Michael Pavone <pavone@retrodev.com>
parents: 2018
diff changeset
463 debug_message("Using %dx%d textures\n", tex_width, tex_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
464 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
465 {
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
466 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
467 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
468 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
469 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
470 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
471 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
472 //TODO: Fixme for PAL + invalid display mode
1977
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
473 glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT, tex_width, tex_height, 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
474 } else {
2346
0111c8344477 Fix some issues identified by asan/ubsan
Michael Pavone <pavone@retrodev.com>
parents: 2318
diff changeset
475 uint32_t blank = 255UL << 24;
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
476 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
477 }
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
478 }
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
479 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
480 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
481 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
482 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
483 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
484 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
485 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
486 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
487 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
488 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
489 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
490 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
491 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
492 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
493 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
494 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
495 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
496 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
497 }
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 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
499 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
500 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
501 un_height = glGetUniformLocation(program, "height");
1977
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
502 un_texsize = glGetUniformLocation(program, "texsize");
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
503 un_curfield = glGetUniformLocation(program, "curfield");
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
504 un_interlaced = glGetUniformLocation(program, "interlaced");
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
505 un_scanlines = glGetUniformLocation(program, "scanlines");
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
506 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
507 }
1593
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1591
diff changeset
508
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1591
diff changeset
509 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
510 {
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1591
diff changeset
511 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
512 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
513 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
514 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
515 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
516 }
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 #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
518
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
519 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
520 static void render_alloc_surfaces()
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
521 {
884
252dfd29831d Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents: 874
diff changeset
522 if (texture_init) {
252dfd29831d Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents: 874
diff changeset
523 return;
252dfd29831d Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents: 874
diff changeset
524 }
252dfd29831d Selecting a second game from the menu now works
Michael Pavone <pavone@retrodev.com>
parents: 874
diff changeset
525 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
526 #ifndef DISABLE_OPENGL
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
527 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
528 gl_setup();
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
529 } else {
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
530 #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
531 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
532 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
533 SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, scaling);
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
534 //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
535 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
536 #ifndef DISABLE_OPENGL
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
537 }
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
538 #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
539 }
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
540
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
541 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
542 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
543 for (int i = 0; i <= FRAMEBUFFER_UI; i++)
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
544 {
a051d8ee4528 Only save config file if 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 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
546 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
547 }
a051d8ee4528 Only save config file if 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 }
a051d8ee4528 Only save config file if 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 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
550 }
a051d8ee4528 Only save config file if 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
1102
c15896605bf2 Clean up symbol visiblity and delete a ltitle bit of dead code
Michael Pavone <pavone@retrodev.com>
parents: 1077
diff changeset
552 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
553 static char * fps_caption = NULL;
486
db5880d8ea03 Add an FPS counter to the title bar
Mike Pavone <pavone@retrodev.com>
parents: 467
diff changeset
554
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
555 static void render_quit()
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
556 {
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
557 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
558 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
559 #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
560 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
561 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
562 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
563 }
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1591
diff changeset
564 #endif
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
565 }
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
566
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
567 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
568 {
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
569 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
570 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
571 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
572 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
573 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
574 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
575 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
576 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
577 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
578 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
579 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
580 }
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
581 }
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
582 } 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
583 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
584 }
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
585 }
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
586 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
587 }
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
588
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
589 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
590 {
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
591 //reset default values
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
592 #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
593 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
594 #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
595 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
596 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
597 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
598 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
599 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
600 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
601 //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
602 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
603 }
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
604 #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
605 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
606 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
607 {
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
608 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
609 vertex_data[i*2] *= 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
610 } 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
611 vertex_data[i*2+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
612 }
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
613 }
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
614 } 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
615 #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
616 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
617 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
618 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
619 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
620 #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
621 }
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
622 #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
623 }
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
624 }
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
625
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
626 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
627 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
628 {
a051d8ee4528 Only save config file if 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 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
630 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
631 }
a051d8ee4528 Only save config file if 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
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
633 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
634 {
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
635 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
636 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
637
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
638 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
639 [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
640 [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
641 [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
642 [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
643 [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
644 [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
645 [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
646 [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
647 [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
648 [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
649 [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
650 [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
651 [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
652 [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
653 [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
654 [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
655 [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
656 [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
657 [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
658 [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
659 [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
660 [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
661 [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
662 [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
663 [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
664 [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
665 [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
666 [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
667 [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
668 [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
669 [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
670 [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
671 [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
672 [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
673 [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
674 [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
675 [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
676 [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
677 [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
678 [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
679 [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
680 [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
681 [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
682 [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
683 [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
684 [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
685 [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
686 [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
687 [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
688 [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
689 [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
690 [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
691 [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
692 [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
693 [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
694 [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
695 [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
696 [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
697 [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
698 [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
699 [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
700 [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
701 [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
702 [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
703 [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
704 [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
705 [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
706 [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
707 [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
708 [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
709 [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
710 [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
711 [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
712 [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
713 [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
714 [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
715 [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
716 [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
717 [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
718 [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
719 [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
720 [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
721 [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
722 [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
723 [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
724 [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
725 [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
726 [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
727 [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
728 [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
729 [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
730 [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
731 [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
732 [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
733 [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
734 [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
735 [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
736 [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
737 [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
738 [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
739 [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
740 };
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
741
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
742 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
743 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
744 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
745 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
746 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
747
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
748 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
749 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
750 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
751 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
752 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
753
2318
1c7329ac7f3f Make UI respect stick deadzone
Michael Pavone <pavone@retrodev.com>
parents: 2315
diff changeset
754 int render_find_joystick_index(SDL_JoystickID instanceID)
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
755 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
756 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
757 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
758 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
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 }
a051d8ee4528 Only save config file if 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 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
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
a051d8ee4528 Only save config file if 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 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
765 {
a051d8ee4528 Only save config file if 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 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
767 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
768 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
769 }
a051d8ee4528 Only save config file if 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 }
a051d8ee4528 Only save config file if 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 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
772 }
a051d8ee4528 Only save config file if 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
1860
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
774 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
775 {
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
776 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
777 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
778 return i;
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
779 }
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
780 }
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
781 return -1;
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
782 }
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
783
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
784 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
785 {
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
786 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
787 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
788 }
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
789 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
790 }
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
791
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
792 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
793 {
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
794 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
795 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
796 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
797 }
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
798 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
799 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
800 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
801 }
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
802
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
803 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
804 {
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
805 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
806 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
807 }
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
808 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
809 }
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
810
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
811 static uint8_t gc_events_enabled;
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
812 static SDL_GameController *controllers[MAX_JOYSTICKS];
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
813 void render_enable_gamepad_events(uint8_t enabled)
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
814 {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
815 if (enabled != gc_events_enabled) {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
816 gc_events_enabled = enabled;
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
817 for (int i = 0; i < MAX_JOYSTICKS; i++) {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
818 if (enabled) {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
819 controllers[i] = render_get_controller(i);
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
820 } else if (controllers[i]) {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
821 SDL_GameControllerClose(controllers[i]);
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
822 controllers[i] = NULL;
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
823 }
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
824 }
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
825 }
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
826 }
2315
b67e4e930fa4 Workaround for SDL2 being unreliable in updating mapping for already "open" game controller
Michael Pavone <pavone@retrodev.com>
parents: 2308
diff changeset
827 uint8_t render_are_gamepad_events_enabled(void)
b67e4e930fa4 Workaround for SDL2 being unreliable in updating mapping for already "open" game controller
Michael Pavone <pavone@retrodev.com>
parents: 2308
diff changeset
828 {
b67e4e930fa4 Workaround for SDL2 being unreliable in updating mapping for already "open" game controller
Michael Pavone <pavone@retrodev.com>
parents: 2308
diff changeset
829 return gc_events_enabled;
b67e4e930fa4 Workaround for SDL2 being unreliable in updating mapping for already "open" game controller
Michael Pavone <pavone@retrodev.com>
parents: 2308
diff changeset
830 }
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
831
2200
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
832 static uint32_t overscan_top[NUM_VID_STD] = {2, 21, 51};
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
833 static uint32_t overscan_bot[NUM_VID_STD] = {1, 17, 48};
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
834 static uint32_t overscan_left[NUM_VID_STD] = {13, 13, 61};
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
835 static uint32_t overscan_right[NUM_VID_STD] = {14, 14, 62};
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
836 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
837 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
838
1860
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
839 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
840 {
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
841 if (desired_index < 0) {
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
842 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
843 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
844 return joystick;
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
845 }
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
846 }
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
847 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
848 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
849 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
850 joystick_sdl_index[joystick] = joystick_sdl_index[desired_index];
2239
b2f788f08a31 Fix bug in controller reordering implementation
Michael Pavone <pavone@retrodev.com>
parents: 2200
diff changeset
851 joystick_index_locked[joystick] = joystick_index_locked[desired_index];
1860
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
852 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
853 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
854 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
855 //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
856 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
857 if (joysticks[joystick]) {
fc05f49075c2 Reprocess bindings when SDL2 mappings, controller types or controller order change
Michael Pavone <pavone@retrodev.com>
parents: 1860
diff changeset
858 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
859 }
1860
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
860 return desired_index;
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
861 }
bdca98187c9f Reorder controllers based on which one receives player input first
Michael Pavone <pavone@retrodev.com>
parents: 1851
diff changeset
862
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
863 static float ui_scale_x = 1.0f, ui_scale_y = 1.0f;
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
864 int render_ui_to_pixels_x(int ui)
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
865 {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
866 return ui * ui_scale_x + 0.5f;
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
867 }
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
868
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
869 int render_ui_to_pixels_y(int ui)
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
870 {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
871 return ui * ui_scale_y + 0.5f;
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
872 }
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
873
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
874 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
875 {
a051d8ee4528 Only save config file if 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 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
877 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
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 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
880 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
881 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
882 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
883 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
884 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
885 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
886 case SDL_JOYBUTTONDOWN:
2318
1c7329ac7f3f Make UI respect stick deadzone
Michael Pavone <pavone@retrodev.com>
parents: 2315
diff changeset
887 handle_joydown(render_find_joystick_index(event->jbutton.which), 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
888 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
889 case SDL_JOYBUTTONUP:
2318
1c7329ac7f3f Make UI respect stick deadzone
Michael Pavone <pavone@retrodev.com>
parents: 2315
diff changeset
890 handle_joyup(lock_joystick_index(render_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
891 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
892 case SDL_JOYHATMOTION:
2318
1c7329ac7f3f Make UI respect stick deadzone
Michael Pavone <pavone@retrodev.com>
parents: 2315
diff changeset
893 handle_joy_dpad(lock_joystick_index(render_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
894 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
895 case SDL_JOYAXISMOTION:
2318
1c7329ac7f3f Make UI respect stick deadzone
Michael Pavone <pavone@retrodev.com>
parents: 2315
diff changeset
896 handle_joy_axis(lock_joystick_index(render_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
897 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
898 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
899 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
900 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
901 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
902 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
903 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
904 joystick_index_locked[index] = 0;
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
905 if (gc_events_enabled) {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
906 controllers[index] = SDL_GameControllerOpen(event->jdevice.which);
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
907 }
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 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
909 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
910 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
911 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
912 }
a051d8ee4528 Only save config file if 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 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
914 }
a051d8ee4528 Only save config file if 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 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
916 case SDL_JOYDEVICEREMOVED: {
2318
1c7329ac7f3f Make UI respect stick deadzone
Michael Pavone <pavone@retrodev.com>
parents: 2315
diff changeset
917 int index = render_find_joystick_index(event->jdevice.which);
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
918 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
919 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
920 joysticks[index] = NULL;
1862
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
921 if (controllers[index]) {
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
922 SDL_GameControllerClose(controllers[index]);
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
923 controllers[index] = NULL;
e07fc3d473b2 Basic UI navigation with controller
Michael Pavone <pavone@retrodev.com>
parents: 1861
diff changeset
924 }
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
925 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
926 } 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
927 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
928 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
929 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
930 }
a051d8ee4528 Only save config file if 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 case SDL_MOUSEMOTION:
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
932 handle_mouse_moved(event->motion.which, event->motion.x * ui_scale_x + 0.5f, event->motion.y * ui_scale_y + 0.5f + overscan_top[video_standard], event->motion.xrel, event->motion.yrel);
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 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
934 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
935 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
936 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
937 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
938 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
939 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
940 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
941 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
942 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
943 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
944 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
945 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
946 }
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
947 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
948 #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
949 if (render_gl) {
2387
ff2f18dac84b Fix issue that broke debug views when toggling fullscreen
Michael Pavone <pavone@retrodev.com>
parents: 2376
diff changeset
950 SDL_GL_MakeCurrent(main_window, main_context);
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
951 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
952 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
953 }
1593
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1591
diff changeset
954 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
955 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
956 main_context = SDL_GL_CreateContext(main_window);
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
957 SDL_GL_GetDrawableSize(main_window, &main_width, &main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
958 update_aspect();
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
959 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
960 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
961 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
962 }
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
963 } else {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
964 #endif
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
965 SDL_GetRendererOutputSize(main_renderer, &main_width, &main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
966 update_aspect();
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
967 #ifndef DISABLE_OPENGL
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
968 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
969 #endif
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
970 if (main_width != event->window.data1 || main_height != event->window.data2) {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
971 debug_message("Window resized - UI units %dx%d, pixels %dx%d\n", event->window.data1, event->window.data2, main_width, main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
972 } else {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
973 debug_message("Window resized: %dx%d\n", main_width, main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
974 }
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
975 ui_scale_x = (float)main_width / (float)event->window.data1;
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
976 ui_scale_y = (float)main_height / (float)event->window.data2;
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
977 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
978 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
979 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
980 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
981 } else {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
982 for (int i = 0; i < num_extras; i++)
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
983 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
984 if (SDL_GetWindowID(extras[i].win) == event->window.windowID) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
985 if (extras[i].on_close) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
986 extras[i].on_close(i + FRAMEBUFFER_USER_START);
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
987 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar
Michael Pavone <pavone@retrodev.com>
parents: 1642
diff changeset
988 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
989 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar
Michael Pavone <pavone@retrodev.com>
parents: 1642
diff changeset
990 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar
Michael Pavone <pavone@retrodev.com>
parents: 1642
diff changeset
991 }
b500e971da75 Allow closing VDP debug windows with the close button in the window title bar
Michael Pavone <pavone@retrodev.com>
parents: 1642
diff changeset
992 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
993 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
994 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
995 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
996 if (drag_drop_handler) {
2404
6f8400ce7a0f Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents: 2392
diff changeset
997 drag_drop_handler(strdup(event->drop.file));
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
998 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
999 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
1000 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
1001 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
1002 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
1003 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
1004 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1005 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
1006 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1007
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1008 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
1009 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1010 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
1011 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
1012 {
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1013 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
1014 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1015 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1016
2200
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
1017 static char *vid_std_names[NUM_VID_STD] = {"ntsc", "pal", "gamegear"};
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1018 static int display_hz;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1019 static int source_hz;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1020 static int source_frame;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1021 static int source_frame_count;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1022 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
1023
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
1024 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
1025 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
1026 {
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
1027 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
1028 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
1029 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
1030 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
1031 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
1032 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1033 desired.freq = rate;
1933
16a795cababd Make requested sample format configurable
Michael Pavone <pavone@retrodev.com>
parents: 1932
diff changeset
1034 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
1035 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
1036 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
1037 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
1038 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
1039 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
1040 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
1041 }
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
1042 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
1043 desired.samples = samples*2;
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1044 switch (sync_src)
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1045 {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1046 case SYNC_AUDIO:
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1047 desired.callback = audio_callback;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1048 break;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1049 case SYNC_AUDIO_THREAD:
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1050 desired.callback = audio_callback_run_on_audio;
1978
33d5b9b77aef Fix regression in run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1977
diff changeset
1051 break;
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1052 default:
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1053 desired.callback = audio_callback_drc;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1054 }
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
1055 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
1056
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1057 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
1058 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
1059 }
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
1060 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
1061 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
1062 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
1063 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
1064 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
1065 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
1066 } 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
1067 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
1068 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
1069 } 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
1070 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
1071 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
1072 }
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
1073 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
1074 }
a051d8ee4528 Only save config file if 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
2392
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1076 static void update_cursor(void)
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1077 {
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1078 SDL_ShowCursor((is_fullscreen && !force_cursor) ? SDL_DISABLE : SDL_ENABLE);
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1079 }
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1080
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1081 void render_force_cursor(uint8_t force)
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1082 {
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1083 if (force != force_cursor) {
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1084 force_cursor = force;
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1085 update_cursor();
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1086 }
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1087 }
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1088
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1089 static void window_setup(void)
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
1090 {
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1091 uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
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
1092 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
1093 flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
1094 }
2392
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
1095 update_cursor();
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1096
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
1097 tern_val def = {.ptrval = "audio"};
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1098 if (external_sync) {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1099 sync_src = SYNC_EXTERNAL;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1100 } else {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1101 char *sync_src_str = tern_find_path_default(config, "system\0sync_source\0", def, TVAL_PTR).ptrval;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1102 if (!strcmp(sync_src_str, "audio")) {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1103 sync_src = SYNC_AUDIO;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1104 } else if (!strcmp(sync_src_str, "audio_thread")) {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1105 sync_src = SYNC_AUDIO_THREAD;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1106 } else {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1107 sync_src = SYNC_VIDEO;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1108 }
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1109 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1110
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1111 if (!num_buffers && (sync_src == SYNC_AUDIO_THREAD || sync_src == SYNC_EXTERNAL)) {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1112 frame_mutex = SDL_CreateMutex();
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1113 free_buffer_mutex = SDL_CreateMutex();
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1114 frame_ready = SDL_CreateCond();
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1115 buffer_storage = 4;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1116 frame_buffers = calloc(buffer_storage, sizeof(uint32_t*));
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1117 frame_buffers[0] = texture_buf;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1118 num_buffers = 1;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1119 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
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 const char *vsync;
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1122 if (sync_src == SYNC_AUDIO) {
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1123 def.ptrval = "off";
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1124 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
1125 } else {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1126 vsync = "on";
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1127 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1128
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
1129 tern_node *video = tern_find_node(config, "video");
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1130 if (video)
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1131 {
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1132 for (int i = 0; i < NUM_VID_STD; i++)
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1133 {
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
1134 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
1135 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
1136 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
1137 if (val) {
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1138 overscan_top[i] = atoi(val);
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1139 }
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
1140 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
1141 if (val) {
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1142 overscan_bot[i] = atoi(val);
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1143 }
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
1144 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
1145 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
1146 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
1147 }
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
1148 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
1149 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
1150 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
1151 }
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1152 }
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1153 }
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1154 }
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
1155 render_gl = 0;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1156
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
1157 #ifndef DISABLE_OPENGL
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1158 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
1159 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
1160 if (gl_enabled)
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1161 {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1162 flags |= SDL_WINDOW_OPENGL;
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1163 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
1164 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
1165 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
1166 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
1167 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
1168 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
1169 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
1170 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
1171 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
1172 #endif
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1173 }
1074
3a0f684891ae Fix NOGL compile option
Michael Pavone <pavone@retrodev.com>
parents: 1068
diff changeset
1174 #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
1175 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
1176 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
1177 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
1178 }
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1179 SDL_GetWindowSize(main_window, &main_width, &main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1180 debug_message("Window created with size: %d x %d\n", main_width, main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1181 int orig_width = main_width, orig_height = main_height;
1074
3a0f684891ae Fix NOGL compile option
Michael Pavone <pavone@retrodev.com>
parents: 1068
diff changeset
1182 #ifndef DISABLE_OPENGL
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1183 if (gl_enabled)
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1184 {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1185 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
1186 #ifdef USE_GLES
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
1187 int major_version;
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
1188 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
1189 #else
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1190 GLenum res = glewInit();
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1191 if (res != GLEW_OK) {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1192 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
1193 }
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
1194
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1195 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
1196 #endif
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1197 render_gl = 1;
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
1198 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
1199 if (!strcmp("tear", vsync)) {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1200 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
1201 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
1202 vsync = "on";
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1203 } else {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1204 vsync = NULL;
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1205 }
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
1206 }
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1207 if (vsync) {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1208 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
1209 #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
1210 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
1211 #else
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1212 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
1213 #endif
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1214 }
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1215 }
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1216 SDL_GL_GetDrawableSize(main_window, &main_width, &main_height);
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1217 } else {
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1218 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
1219 }
1328
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1220 }
70faad89d491 Add config file option to disable Open GL rendering
Michael Pavone <pavone@retrodev.com>
parents: 1326
diff changeset
1221 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
1222 #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
1223 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
1224 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
1225 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
1226 }
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
1227 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
1228
1074
3a0f684891ae Fix NOGL compile option
Michael Pavone <pavone@retrodev.com>
parents: 1068
diff changeset
1229 if (!main_renderer) {
3a0f684891ae Fix NOGL compile option
Michael Pavone <pavone@retrodev.com>
parents: 1068
diff changeset
1230 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
1231 }
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1232 SDL_GetRendererOutputSize(main_renderer, &main_width, &main_height);
1658
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
1233 SDL_RendererInfo rinfo;
fa9ae059e4d3 Added support for GLES in addition to desktop GL
Mike Pavone <pavone@retrodev.com>
parents: 1649
diff changeset
1234 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
1235 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
1236 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
1237 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
1238 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
1239 #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
1240 }
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
1241 #endif
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
1242
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1243 if (main_width != orig_width || main_height != orig_height) {
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1244 debug_message("True window resolution %d x %d\n", main_width, main_height);
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1245 }
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1246 ui_scale_x = (float)main_width / (float)orig_width;
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1247 ui_scale_y = (float)main_height / (float)orig_height;
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1248
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1249
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
1250 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
1251 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
1252 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
1253 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
1254 }
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
1255
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
1256 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
1257 {
2308
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1258 #ifdef SDL_HINT_WINDOWS_DPI_SCALING
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1259 //In some ways, the other DPI scaling option for SDL2 on Windows is better for BlastEm's needs,
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1260 //but setting this makes it more consistent with how high DPI support works on other platforms
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1261 SDL_SetHint(SDL_HINT_WINDOWS_DPI_SCALING, "1");
b7768c58f0da Initial stab at DPI scaling support
Michael Pavone <pavone@retrodev.com>
parents: 2303
diff changeset
1262 #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
1263 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
1264 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
1265 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1266 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
1267 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
1268 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
1269 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
1270 }
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
1271 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
1272 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
1273 windowed_height = height;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1274
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
1275 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
1276 //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
1277 SDL_GetCurrentDisplayMode(0, &mode);
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1278 #ifdef __EMSCRIPTEN__
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1279 display_hz = 60; //TODO: FIXME
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1280 #else
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
1281 display_hz = mode.refresh_rate;
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1282 #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
1283
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1284 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
1285 //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
1286 //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
1287 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
1288 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
1289 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1290 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
1291 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
1292 is_fullscreen = fullscreen;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1293
486
db5880d8ea03 Add an FPS counter to the title bar
Mike Pavone <pavone@retrodev.com>
parents: 467
diff changeset
1294 caption = title;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1295
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
1296 window_setup();
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
1297
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
1298 audio_mutex = SDL_CreateMutex();
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
1299 audio_ready = SDL_CreateCond();
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1300
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
1301 init_audio();
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1302
1355
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt
Michael Pavone <pavone@retrodev.com>
parents: 1336
diff changeset
1303 uint32_t db_size;
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt
Michael Pavone <pavone@retrodev.com>
parents: 1336
diff changeset
1304 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
1305 if (db_data) {
03cb4dd2499f Load extra controller mappings from gamecontrollerdb.txt
Michael Pavone <pavone@retrodev.com>
parents: 1336
diff changeset
1306 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
1307 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
1308 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
1309 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1310
1603
c0727712d529 Read extral SDL2 mappings on startup from controller_types.cfg
Michael Pavone <pavone@retrodev.com>
parents: 1600
diff changeset
1311 controller_add_mappings();
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1312
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
1313 SDL_JoystickEventState(SDL_ENABLE);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1314
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1315 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
1316
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
1317 atexit(render_quit);
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
1318 }
2018
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1319
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1320 void render_reset_mappings(void)
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1321 {
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1322 SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1323 SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1324 uint32_t db_size;
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1325 char *db_data = read_bundled_file("gamecontrollerdb.txt", &db_size);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1326 if (db_data) {
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1327 int added = SDL_GameControllerAddMappingsFromRW(SDL_RWFromMem(db_data, db_size), 1);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1328 free(db_data);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1329 debug_message("Added %d game controller mappings from gamecontrollerdb.txt\n", added);
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1330 }
193b804c9845 Add a UI button to reset config to defaults
Michael Pavone <pavone@retrodev.com>
parents: 2004
diff changeset
1331 }
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
1332 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
1333
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
1334 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
1335 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1336 for (int i = 0; i <= FRAMEBUFFER_UI; i++)
2388
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1337 {
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1338 if (sdl_textures[i]) {
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1339 SDL_DestroyTexture(sdl_textures[i]);
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1340 sdl_textures[i] = NULL;
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1341 }
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1342 }
a8c069d847a0 Fix issue that would break debug windows when config update causes window to be recreated
Michael Pavone <pavone@retrodev.com>
parents: 2387
diff changeset
1343 texture_init = 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
1344 #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
1345 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
1346 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
1347 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
1348 }
1593
24508cb54f87 Fix a number of other memory errors (mostly leaks again) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents: 1591
diff changeset
1349 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
1350 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
1351 } 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
1352 #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
1353 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
1354 #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
1355 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1356 #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
1357 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
1358 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
1359 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
1360 drain_events();
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1361
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
1362 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
1363 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
1364 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
1365 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1366 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
1367 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
1368 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
1369 } 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
1370 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
1371 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
1372 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1373 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
1374 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
1375 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
1376 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
1377 //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
1378 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
1379 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
1380 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
1381 } 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
1382 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
1383 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
1384 }
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
1385 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
1386 on_ui_fb_resized();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
1387 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1388
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
1389 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
1390 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
1391 #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
1392 //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
1393 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
1394 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
1395 }
a051d8ee4528 Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents: 1567
diff changeset
1396 #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
1397
1580
ea7d5ced2415 Fix deadlock when changing settings before loading first ROM
Michael Pavone <pavone@retrodev.com>
parents: 1574
diff changeset
1398 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
1399 render_close_audio();
ea7d5ced2415 Fix deadlock when changing settings before loading first ROM
Michael Pavone <pavone@retrodev.com>
parents: 1574
diff changeset
1400 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
1401 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
1402 render_set_video_standard(video_standard);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1403
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
1404 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
1405 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
1406 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
1407 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
1408 }
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
1409 }
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
1410
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1411 SDL_Window *render_get_window(void)
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1412 {
2493
b62336ceb626 Kinda hacky fix to make sure Nuklear has the right GL context
Michael Pavone <pavone@retrodev.com>
parents: 2492
diff changeset
1413 #ifndef DISABLE_OPENGL
b62336ceb626 Kinda hacky fix to make sure Nuklear has the right GL context
Michael Pavone <pavone@retrodev.com>
parents: 2492
diff changeset
1414 if (render_gl) {
b62336ceb626 Kinda hacky fix to make sure Nuklear has the right GL context
Michael Pavone <pavone@retrodev.com>
parents: 2492
diff changeset
1415 SDL_GL_MakeCurrent(main_window, main_context);
b62336ceb626 Kinda hacky fix to make sure Nuklear has the right GL context
Michael Pavone <pavone@retrodev.com>
parents: 2492
diff changeset
1416 }
b62336ceb626 Kinda hacky fix to make sure Nuklear has the right GL context
Michael Pavone <pavone@retrodev.com>
parents: 2492
diff changeset
1417 #endif
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1418 return main_window;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1419 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1420
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
1421 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
1422 {
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
1423 //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
1424 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
1425 }
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
1426
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1427 void render_set_video_standard(vid_std std)
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1428 {
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1429 video_standard = std;
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1430 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
1431 return;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1432 }
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1433 source_hz = std == VID_PAL ? 50 : 60;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1434 uint32_t max_repeat = 0;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1435 if (abs(source_hz - display_hz) < 2) {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1436 memset(frame_repeat, 0, sizeof(int)*display_hz);
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1437 } else {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1438 int inc = display_hz * 100000 / source_hz;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1439 int accum = 0;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1440 int dst_frames = 0;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1441 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
1442 {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1443 frame_repeat[src_frame] = -1;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1444 accum += inc;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1445 while (accum > 100000)
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1446 {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1447 accum -= 100000;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1448 frame_repeat[src_frame]++;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1449 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
1450 dst_frames++;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1451 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1452 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1453 if (dst_frames != display_hz) {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1454 frame_repeat[source_hz-1] += display_hz - dst_frames;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1455 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1456 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1457 source_frame = 0;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1458 source_frame_count = frame_repeat[0];
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1459 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
1460 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
1461 //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
1462 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
1463 max_adjust = BASE_MAX_ADJUST / source_hz;
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1464 }
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1465
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
1466 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
1467 {
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
1468 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
1469 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
1470 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
1471 }
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
1472
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1473 static char *screenshot_path;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1474 void render_save_screenshot(char *path)
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1475 {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1476 if (screenshot_path) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1477 free(screenshot_path);
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1478 }
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1479 screenshot_path = path;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1480 }
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1481
2295
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1482 #ifndef DISABLE_ZLIB
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1483 static apng_state *apng;
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1484 static FILE *apng_file;
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1485 #endif
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1486 uint8_t render_saving_video(void)
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1487 {
2553
35f765c2bc87 Fix a couple of bugs with AV recording
Michael Pavone <pavone@retrodev.com>
parents: 2532
diff changeset
1488 #ifndef DISABLE_ZLIB
2295
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1489 return apng_file != NULL;
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1490 #else
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1491 return 0;
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1492 #endif
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1493 }
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1494
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1495 void render_end_video(void)
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1496 {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1497 #ifndef DISABLE_ZLIB
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1498 if (apng) {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1499 puts("Ending recording");
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1500 end_apng(apng_file, apng);
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1501 apng = NULL;
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1502 apng_file = NULL;
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1503 }
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1504 #endif
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1505 }
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1506 void render_save_video(char *path)
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1507 {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1508 render_end_video();
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1509 #ifndef DISABLE_ZLIB
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1510 apng_file = fopen(path, "wb");
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1511 if (apng_file) {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1512 printf("Saving video to %s\n", path);
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1513 } else {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1514 warning("Failed to open %s for writing\n", path);
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1515 }
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1516 #endif
2303
c79896ff1a2d Fix leak in render_save_video
Michael Pavone <pavone@retrodev.com>
parents: 2295
diff changeset
1517 free(path);
2295
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1518 }
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
1519
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1520 #ifndef __EMSCRIPTEN__
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1521 void GLAPIENTRY gl_message_callback(GLenum source, GLenum type, GLenum id, GLenum severity, GLsizei length, const GLchar *message, const void *user)
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1522 {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1523 fprintf(stderr, "GL Message: %d, %d, %d - %s\n", source, type, severity, message);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1524 }
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1525 #endif
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1526
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
1527 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
1528 {
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1529 uint8_t win_idx = 0xFF;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1530 for (int i = 0; i < num_extras; i++)
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1531 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1532 if (!extras[i].win) {
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1533 win_idx = i;
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1534 break;
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1535 }
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1536 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1537
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1538 if (win_idx == 0xFF) {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1539 num_extras++;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1540 extras = realloc(extras, num_extras * sizeof(*extras));
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1541 win_idx = num_extras - 1;
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1542 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1543 memset(&extras[win_idx], 0, sizeof(extra_window));
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1544 uint32_t flags = 0;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1545 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1546 if (render_gl) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1547 flags |= SDL_WINDOW_OPENGL;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1548 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1549 #endif
2458
09c9d2c6bac0 Avoid spawning secondary windows right on top of the main one
Michael Pavone <pavone@retrodev.com>
parents: 2438
diff changeset
1550 int x = SDL_WINDOWPOS_UNDEFINED;
09c9d2c6bac0 Avoid spawning secondary windows right on top of the main one
Michael Pavone <pavone@retrodev.com>
parents: 2438
diff changeset
1551 int y = SDL_WINDOWPOS_UNDEFINED;
09c9d2c6bac0 Avoid spawning secondary windows right on top of the main one
Michael Pavone <pavone@retrodev.com>
parents: 2438
diff changeset
1552 SDL_GetWindowPosition(main_window, &x, &y);
09c9d2c6bac0 Avoid spawning secondary windows right on top of the main one
Michael Pavone <pavone@retrodev.com>
parents: 2438
diff changeset
1553 if (x != SDL_WINDOWPOS_UNDEFINED) {
09c9d2c6bac0 Avoid spawning secondary windows right on top of the main one
Michael Pavone <pavone@retrodev.com>
parents: 2438
diff changeset
1554 x += main_width;
09c9d2c6bac0 Avoid spawning secondary windows right on top of the main one
Michael Pavone <pavone@retrodev.com>
parents: 2438
diff changeset
1555 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1556 extras[win_idx].win = SDL_CreateWindow(caption, x, y, width, height, flags);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1557 if (!extras[win_idx].win) {
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
1558 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
1559 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1560 extras[win_idx].width = width;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1561 extras[win_idx].height = height;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1562 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1563 if (render_gl) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1564 extras[win_idx].gl_context = SDL_GL_CreateContext(extras[win_idx].win);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1565 SDL_GL_MakeCurrent(extras[win_idx].win, extras[win_idx].gl_context);
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1566 #ifndef __EMSCRIPTEN__
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1567 glEnable(GL_DEBUG_OUTPUT);
2523
573da2a2e6bb Fix debug window crash on Mac OS
Michael Pavone <pavone@retrodev.com>
parents: 2514
diff changeset
1568 if (glDebugMessageCallback) {
573da2a2e6bb Fix debug window crash on Mac OS
Michael Pavone <pavone@retrodev.com>
parents: 2514
diff changeset
1569 glDebugMessageCallback(gl_message_callback, NULL);
573da2a2e6bb Fix debug window crash on Mac OS
Michael Pavone <pavone@retrodev.com>
parents: 2514
diff changeset
1570 }
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
1571 #endif
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1572 glGenTextures(2, extras[win_idx].gl_texture);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1573 for (int i = 0; i < 2; i++)
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1574 {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1575 glBindTexture(GL_TEXTURE_2D, extras[win_idx].gl_texture[i]);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1576 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1577 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1578 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1579 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1580 if (i) {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1581 glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT, 1, 1, 0, SRC_FORMAT, GL_UNSIGNED_BYTE, extras[win_idx].color);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1582 } else {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1583 extras[win_idx].tex_width = width;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1584 extras[win_idx].tex_height = height;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1585 char *npot_textures = tern_find_path_default(config, "video\0npot_textures\0", (tern_val){.ptrval = "off"}, TVAL_PTR).ptrval;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1586 if (strcmp(npot_textures, "on")) {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1587 extras[win_idx].tex_width = nearest_pow2(width);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1588 extras[win_idx].tex_height = nearest_pow2(height);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1589 }
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1590 extras[win_idx].texture_buf = calloc(extras[win_idx].tex_width * extras[win_idx].tex_height, sizeof(uint32_t));
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1591 glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT, extras[win_idx].tex_width, extras[win_idx].tex_height, 0, SRC_FORMAT, GL_UNSIGNED_BYTE, extras[win_idx].texture_buf);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1592 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1593 }
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1594 glGenBuffers(3, extras[win_idx].gl_buffers);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1595 glBindBuffer(GL_ARRAY_BUFFER, extras[win_idx].gl_buffers[0]);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1596 glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data_default), vertex_data_default, GL_STATIC_DRAW);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1597 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, extras[win_idx].gl_buffers[1]);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1598 glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(element_data), element_data, GL_STATIC_DRAW);
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1599 glBindBuffer(GL_ARRAY_BUFFER, extras[win_idx].gl_buffers[2]);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1600 glBufferData(GL_ARRAY_BUFFER, sizeof(uvs), uvs, GL_STATIC_DRAW);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1601 extras[win_idx].vshader = load_shader("extra_window.v.glsl", GL_VERTEX_SHADER);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1602 extras[win_idx].fshader = load_shader("extra_window.f.glsl", GL_FRAGMENT_SHADER);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1603 extras[win_idx].program = glCreateProgram();
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1604 glAttachShader(program, extras[win_idx].vshader);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1605 glAttachShader(program, extras[win_idx].fshader);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1606 glLinkProgram(extras[win_idx].program);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1607 GLint link_status;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1608 glGetProgramiv(program, GL_LINK_STATUS, &link_status);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1609 if (!link_status) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1610 fputs("Failed to link shader program\n", stderr);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1611 //TODO: cleanup
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1612 goto sdl_renderer;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1613 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1614 extras[win_idx].un_texture = glGetUniformLocation(program, "texture");
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1615 extras[win_idx].un_width = glGetUniformLocation(program, "width");
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1616 extras[win_idx].un_height = glGetUniformLocation(program, "height");
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1617 extras[win_idx].at_pos = glGetAttribLocation(program, "pos");
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1618 extras[win_idx].at_uv = glGetAttribLocation(program, "uv");
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1619 extras[win_idx].color[3] = 255;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1620 } else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1621 sdl_renderer:
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1622 #endif
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1623 extras[win_idx].renderer = SDL_CreateRenderer(extras[win_idx].win, -1, SDL_RENDERER_ACCELERATED);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1624 if (!extras[win_idx].renderer) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1625 goto fail_renderer;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1626 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1627 extras[win_idx].sdl_texture = SDL_CreateTexture(extras[win_idx].renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, width, height);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1628 if (!extras[win_idx].sdl_texture) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1629 goto fail_texture;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1630 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1631 #ifndef DISABLE_OPENGL
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
1632 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1633 #endif
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1634 extras[win_idx].on_close = close_handler;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1635 return win_idx + FRAMEBUFFER_USER_START;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1636
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
1637 fail_texture:
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1638 SDL_DestroyRenderer(extras[win_idx].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
1639 fail_renderer:
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1640 SDL_DestroyWindow(extras[win_idx].win);
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
1641 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
1642 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
1643 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally
Michael Pavone <pavone@retrodev.com>
parents: 1623
diff changeset
1644
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1645 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
1646 {
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1647 uint8_t win_idx = which - FRAMEBUFFER_USER_START;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1648 if (extras[win_idx].renderer) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1649 //Destroying the renderers also frees the textures
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1650 SDL_DestroyRenderer(extras[win_idx].renderer);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1651 extras[win_idx].renderer = NULL;
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1652 free (extras[win_idx].static_images);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1653 extras[win_idx].static_images = NULL;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1654 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1655 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1656 else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1657 SDL_GL_MakeCurrent(extras[win_idx].win, extras[win_idx].gl_context);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1658 glDeleteProgram(extras[win_idx].program);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1659 glDeleteShader(extras[win_idx].vshader);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1660 glDeleteShader(extras[win_idx].fshader);
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1661 glDeleteBuffers(3, extras[win_idx].gl_buffers);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1662 glDeleteTextures(2, extras[win_idx].gl_texture);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1663 for (uint8_t i = 0; i < extras[win_idx].num_static; i++)
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1664 {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1665 if (extras[win_idx].gl_static_images[i]) {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1666 glDeleteTextures(1, extras[win_idx].gl_static_images + i);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1667 }
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1668 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1669 SDL_GL_DeleteContext(extras[win_idx].gl_context);
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1670 free(extras[win_idx].image_vertices);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1671 extras[win_idx].image_vertices = NULL;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1672 free(extras[win_idx].gl_static_images);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1673 extras[win_idx].gl_static_images = NULL;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1674 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1675 #endif
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1676 SDL_DestroyWindow(extras[win_idx].win);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1677
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1678 extras[win_idx].win = NULL;
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1679 extras[win_idx].num_static = 0;
1642
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1680 }
c6b2c0f8cc61 Implemented support for toggling off a debug view
Michael Pavone <pavone@retrodev.com>
parents: 1635
diff changeset
1681
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1682 #ifndef DISABLE_OPENGL
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1683 static void extra_draw_quad(extra_window *extra, GLuint texture, float width, float height)
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1684 {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1685 glUseProgram(extra->program);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1686 glActiveTexture(GL_TEXTURE0);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1687 glBindTexture(GL_TEXTURE_2D, texture);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1688 glUniform1i(extra->un_texture, 0);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1689
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1690 glUniform1f(extra->un_width, width);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1691 glUniform1f(extra->un_height, height);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1692
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1693 glVertexAttribPointer(extra->at_pos, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat[2]), (void *)0);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1694 glEnableVertexAttribArray(extra->at_pos);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1695
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1696 glBindBuffer(GL_ARRAY_BUFFER, extra->gl_buffers[2]);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1697 glVertexAttribPointer(extra->at_uv, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat[2]), (void *)0);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1698 glEnableVertexAttribArray(extra->at_uv);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1699
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1700 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, extra->gl_buffers[1]);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1701 glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, (void *)0);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1702 }
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1703 #endif
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1704
2438
bed4d3db8a3f More flexible loading of Pico storyware assets
Michael Pavone <pavone@retrodev.com>
parents: 2429
diff changeset
1705 uint8_t render_static_image(uint8_t window, uint8_t *buffer, uint32_t size)
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1706 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1707 window -= FRAMEBUFFER_USER_START;
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1708 extra_window *extra = extras + window;
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1709 uint32_t width, height;
2438
bed4d3db8a3f More flexible loading of Pico storyware assets
Michael Pavone <pavone@retrodev.com>
parents: 2429
diff changeset
1710 uint32_t *pixels = load_png(buffer, size, &width, &height);
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1711 if (!pixels) {
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1712 return 0xFF;
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1713 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1714 uint8_t img_index = 0;
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1715 if (!extra->num_static) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1716 extra->num_static = 8;
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1717 #ifndef DISABLE_OPENGL
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1718 if (render_gl) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1719 extra->gl_static_images = calloc(extra->num_static, sizeof(GLuint));
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1720 extra->image_vertices = malloc(sizeof(vertex_data_default));
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1721 memcpy(extra->image_vertices, vertex_data_default, sizeof(vertex_data_default));
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1722 SDL_GL_MakeCurrent(extra->win, extra->gl_context);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1723 glGenBuffers(1, &extra->image_buffer);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1724 glBindBuffer(GL_ARRAY_BUFFER, extra->image_buffer);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1725 glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data_default), extra->image_vertices, GL_DYNAMIC_DRAW);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1726 } else
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1727 #endif
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1728 {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1729 extra->static_images = calloc(extra->num_static, sizeof(SDL_Texture*));
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1730 }
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1731 }
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1732 for (; img_index < extra->num_static; img_index++)
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1733 {
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1734 #ifndef DISABLE_OPENGL
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1735 if (render_gl) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1736 if (!extra->gl_static_images[img_index]) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1737 break;
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1738 }
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1739 } else
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1740 #endif
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1741 if (!extra->static_images[img_index]) {
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1742 break;
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1743 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1744 }
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1745 if (img_index == extra->num_static) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1746 extra->num_static *= 2;
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1747 #ifndef DISABLE_OPENGL
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1748 if (render_gl) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1749 extra->gl_static_images = realloc(extra->static_images, extra->num_static * sizeof(GLuint));
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1750 } else
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1751 #endif
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1752 {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1753 extra->static_images = realloc(extra->static_images, extra->num_static * sizeof(SDL_Texture*));
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1754 }
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1755 }
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1756 #ifndef DISABLE_OPENGL
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1757 if (render_gl) {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1758 SDL_GL_MakeCurrent(extra->win, extra->gl_context);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1759
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1760 glGenTextures(1, extra->gl_static_images + img_index);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1761 glBindTexture(GL_TEXTURE_2D, extra->gl_static_images[img_index]);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1762 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1763 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1764 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1765 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1766 //TODO: maybe make this respect the npot texture setting?
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1767 glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT, width, height, 0, SRC_FORMAT, GL_UNSIGNED_BYTE, pixels);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1768 } else
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1769 #endif
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1770 {
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1771 extra->static_images[img_index] = SDL_CreateTexture(extra->renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, width, height);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1772 SDL_UpdateTexture(extra->static_images[img_index], NULL, pixels, sizeof(uint32_t) * width);
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1773 }
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1774 free(pixels);
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1775 return img_index;
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1776 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1777
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1778 #ifndef DISABLE_OPENGL
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1779 static void extra_update_verts(extra_window *extra, int x, int y, int width, int height)
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1780 {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1781 memcpy(extra->image_vertices, vertex_data_default, sizeof(vertex_data_default));
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1782 extra->image_vertices[0] = extra->image_vertices[4] = 2.0f * x / (float)extra->width - 1.0f;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1783 extra->image_vertices[2] = extra->image_vertices[6] = 2.0f * (x + width) / (float)extra->width - 1.0f;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1784 extra->image_vertices[1] = extra->image_vertices[3] = -2.0f * (y + height) / (float)extra->height + 1.0f;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1785 extra->image_vertices[5] = extra->image_vertices[7] = -2.0f * y / (float)extra->height + 1.0f;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1786
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1787 SDL_GL_MakeCurrent(extra->win, extra->gl_context);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1788 glBindBuffer(GL_ARRAY_BUFFER, extra->image_buffer);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1789 glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data_default), extra->image_vertices, GL_DYNAMIC_DRAW);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1790 }
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1791 #endif
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1792
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1793 void render_draw_image(uint8_t window, uint8_t image, int x, int y, int width, int height)
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1794 {
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1795 extra_window *extra = extras + window - FRAMEBUFFER_USER_START;
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1796 if (extra->renderer) {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1797 SDL_Rect dst = {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1798 .x = x,
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1799 .y = y,
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1800 .w = width,
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1801 .h = height
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1802 };
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1803 SDL_RenderCopy(extra->renderer, extra->static_images[image], NULL, &dst);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1804 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1805 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1806 else {
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1807 extra_update_verts(extra, x, y, width, height);
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
1808 extra_draw_quad(extra, extra->gl_static_images[image], 1.0f, 1.0f);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1809 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1810 #endif
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1811 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1812
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1813 void render_clear_window(uint8_t window, uint8_t r, uint8_t g, uint8_t b)
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1814 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1815 uint8_t win_idx = window - FRAMEBUFFER_USER_START;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1816 if (extras[win_idx].renderer) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1817 SDL_SetRenderDrawColor(extras[win_idx].renderer, r, g, b, 255);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1818 SDL_RenderClear(extras[win_idx].renderer);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1819 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1820 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1821 else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1822 SDL_GL_MakeCurrent(extras[win_idx].win, extras[win_idx].gl_context);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1823 glClearColor(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1824 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1825 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1826 #endif
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1827 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1828
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1829 void render_fill_rect(uint8_t window, uint8_t r, uint8_t g, uint8_t b, int x, int y, int width, int height)
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1830 {
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1831 extra_window *extra = extras + window - FRAMEBUFFER_USER_START;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1832 if (extra->renderer) {
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1833 SDL_SetRenderDrawColor(extra->renderer, r, g, b, 255);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1834 SDL_Rect dst = {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1835 .x = x,
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1836 .y = y,
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1837 .w = width,
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1838 .h = height
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1839 };
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1840 SDL_RenderFillRect(extra->renderer, &dst);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1841 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1842 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1843 else {
2514
50cff4c9286e Fix crash in render_fill_rect in GL mode with no static images
Michael Pavone <pavone@retrodev.com>
parents: 2493
diff changeset
1844 if (!extra->image_vertices) {
50cff4c9286e Fix crash in render_fill_rect in GL mode with no static images
Michael Pavone <pavone@retrodev.com>
parents: 2493
diff changeset
1845 extra->image_vertices = malloc(sizeof(vertex_data_default));
50cff4c9286e Fix crash in render_fill_rect in GL mode with no static images
Michael Pavone <pavone@retrodev.com>
parents: 2493
diff changeset
1846 SDL_GL_MakeCurrent(extra->win, extra->gl_context);
50cff4c9286e Fix crash in render_fill_rect in GL mode with no static images
Michael Pavone <pavone@retrodev.com>
parents: 2493
diff changeset
1847 glGenBuffers(1, &extra->image_buffer);
50cff4c9286e Fix crash in render_fill_rect in GL mode with no static images
Michael Pavone <pavone@retrodev.com>
parents: 2493
diff changeset
1848 }
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1849 extra_update_verts(extra, x, y, width, height);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1850 extra->color[0] = b;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1851 extra->color[1] = g;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1852 extra->color[2] = r;
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1853 glBindTexture(GL_TEXTURE_2D, extra->gl_texture[1]);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1854 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, SRC_FORMAT, GL_UNSIGNED_BYTE, extra->color);
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
1855 extra_draw_quad(extra, extra->gl_texture[1], 1.0f, 1.0f);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1856 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1857 #endif
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1858 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1859
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1860 void render_window_refresh(uint8_t window)
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1861 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1862 uint8_t win_idx = window - FRAMEBUFFER_USER_START;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1863 if (extras[win_idx].renderer) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1864 SDL_RenderPresent(extras[win_idx].renderer);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1865 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1866 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1867 else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1868 SDL_GL_SwapWindow(extras[win_idx].win);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1869 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1870 #endif
2429
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1871 }
da3dc881d3f0 Initial implementation of storbook artwork display
Michael Pavone <pavone@retrodev.com>
parents: 2405
diff changeset
1872
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
1873 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
1874 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
1875 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
1876 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1877 if (sync_src == SYNC_AUDIO_THREAD || sync_src == SYNC_EXTERNAL) {
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1878 *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
1879 uint32_t *buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1880 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
1881 if (num_buffers) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1882 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
1883 } else {
1977
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
1884 buffer = calloc(tex_width*(tex_height + 1), sizeof(uint32_t));
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1885 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1886 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
1887 locked_pixels = buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1888 return buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1889 }
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
1890 #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
1891 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
1892 *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
1893 return texture_buf;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1894 } else if (render_gl && which >= FRAMEBUFFER_USER_START) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1895 uint8_t win_idx = which - FRAMEBUFFER_USER_START;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1896 *pitch = extras[win_idx].width * sizeof(uint32_t);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1897 return extras[win_idx].texture_buf;
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
1898 } 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
1899 #endif
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
1900 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
1901 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
1902 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1903 SDL_Texture *tex;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1904 if (which >= FRAMEBUFFER_USER_START) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1905 uint8_t win_idx = which - FRAMEBUFFER_USER_START;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1906 if (win_idx >= num_extras || !extras[win_idx].renderer) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1907 warning("Request for invalid framebuffer number %d\n", which);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1908 return NULL;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1909 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1910 tex = extras[win_idx].sdl_texture;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1911 } else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1912 tex = sdl_textures[which];
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
1913 }
1952
42c12d141f6e Remove usage of GCC pointer arithmetic on void * extension
Michael Pavone <pavone@retrodev.com>
parents: 1949
diff changeset
1914 uint8_t *pixels;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1915 if (SDL_LockTexture(tex, NULL, (void **)&pixels, pitch) < 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
1916 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
1917 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
1918 }
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
1919 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
1920 if (which <= FRAMEBUFFER_EVEN) {
1952
42c12d141f6e Remove usage of GCC pointer arithmetic on void * extension
Michael Pavone <pavone@retrodev.com>
parents: 1949
diff changeset
1921 locked_pixels = (uint32_t *)pixels;
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
1922 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
1923 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
1924 }
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
1925 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
1926 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
1927 *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
1928 }
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
1929 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
1930 }
1952
42c12d141f6e Remove usage of GCC pointer arithmetic on void * extension
Michael Pavone <pavone@retrodev.com>
parents: 1949
diff changeset
1931 return (uint32_t *)pixels;
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
1932 #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
1933 }
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
1934 #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
1935 }
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
1936
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1937 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
1938 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1939 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
1940 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
1941 buffer_storage *= 2;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1942 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
1943 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1944 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
1945 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
1946 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1947
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
1948 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
1949 #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
1950 #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
1951 #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
1952 #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
1953 #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
1954
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1955 static uint32_t last_width, last_height;
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
1956 static uint8_t interlaced, last_field;
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
1957 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
1958 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
1959 if (sync_src == SYNC_VIDEO && which <= FRAMEBUFFER_EVEN && source_frame_count < 0) {
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1960 source_frame++;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1961 if (source_frame >= source_hz) {
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1962 source_frame = 0;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1963 }
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1964 source_frame_count = frame_repeat[source_frame];
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1965 //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
1966 return;
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
1967 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1968
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1969 uint32_t height = which <= FRAMEBUFFER_EVEN
2200
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
1970 ? (video_standard == VID_PAL ? 294 : 243) - (overscan_top[video_standard] + overscan_bot[video_standard])
1184
b1147418254a Overscan is now configurable
Michael Pavone <pavone@retrodev.com>
parents: 1167
diff changeset
1971 : 240;
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1972 FILE *screenshot_file = NULL;
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1973 char *ext;
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1974 if (which < FRAMEBUFFER_UI) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1975 last_width = width;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1976 width -= overscan_left[video_standard] + overscan_right[video_standard];
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1977 if (screenshot_path && which == FRAMEBUFFER_ODD) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1978 screenshot_file = fopen(screenshot_path, "wb");
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1979 if (screenshot_file) {
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1980 #ifndef DISABLE_ZLIB
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1981 ext = path_extension(screenshot_path);
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
1982 #endif
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1983 debug_message("Saving screenshot to %s\n", screenshot_path);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1984 } else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1985 warning("Failed to open screenshot file %s for writing\n", screenshot_path);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1986 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1987 free(screenshot_path);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1988 screenshot_path = NULL;
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1989 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1990 interlaced = last_field != which;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
1991 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
1992 }
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
1993 #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
1994 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
1995 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
1996 glBindTexture(GL_TEXTURE_2D, textures[which]);
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
1997 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LINEBUF_SIZE, height, SRC_FORMAT, GL_UNSIGNED_BYTE, buffer);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
1998
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
1999 if (screenshot_file) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2000 //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
2001 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2002 if (!strcasecmp(ext, "png")) {
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2003 free(ext);
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
2004 save_png(screenshot_file, buffer, width, height, LINEBUF_SIZE*sizeof(uint32_t));
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2005 } else {
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2006 free(ext);
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2007 #endif
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
2008 save_ppm(screenshot_file, buffer, width, height, LINEBUF_SIZE*sizeof(uint32_t));
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2009 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2010 }
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2011 #endif
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2012 }
2295
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2013 #ifndef DISABLE_ZLIB
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2014 if (apng_file) {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2015 if (!apng) {
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2016 //TODO: more precise frame rate
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2017 apng = start_apng(apng_file, width, height, video_standard == VID_PAL ? 50.0 : 60.0);
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2018 }
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
2019 save_png24_frame(apng_file, buffer, apng, width, height, LINEBUF_SIZE*sizeof(uint32_t));
2295
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2020 }
eb45ad9d8a3f WIP "video" recording in APNG format
Michael Pavone <pavone@retrodev.com>
parents: 2239
diff changeset
2021 #endif
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2022 } else if (render_gl && which >= FRAMEBUFFER_USER_START) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2023 uint8_t win_idx = which - FRAMEBUFFER_USER_START;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2024 SDL_GL_MakeCurrent(extras[win_idx].win, extras[win_idx].gl_context);
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
2025 glBindTexture(GL_TEXTURE_2D, extras[win_idx].gl_texture[0]);
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2026 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, extras[win_idx].width, extras[win_idx].height, SRC_FORMAT, GL_UNSIGNED_BYTE, buffer);
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
2027 } else {
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
2028 #endif
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
2029 uint32_t shot_height = height;
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2030 //TODO: Support SYNC_AUDIO_THREAD/SYNC_EXTERNAL for render API framebuffers
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2031 if (which <= FRAMEBUFFER_EVEN && last_field != which) {
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
2032 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
2033 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
2034 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
2035 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
2036 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
2037 {
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
2038 //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
2039 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
2040 //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
2041 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
2042 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
2043 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
2044 }
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
2045 height = 480;
798
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
2046 }
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2047 if (screenshot_file) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2048 uint32_t shot_pitch = locked_pitch;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2049 if (which == FRAMEBUFFER_EVEN) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2050 shot_height *= 2;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2051 } else {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2052 shot_pitch *= 2;
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2053 }
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2054 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2055 if (!strcasecmp(ext, "png")) {
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2056 free(ext);
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
2057 save_png(screenshot_file, locked_pixels, width, shot_height, shot_pitch);
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2058 } else {
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2059 free(ext);
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2060 #endif
2368
d6a207861cc8 Fix handling of overscan in internal screenshots
Michael Pavone <pavone@retrodev.com>
parents: 2346
diff changeset
2061 save_ppm(screenshot_file, locked_pixels, width, shot_height, shot_pitch);
1532
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2062 #ifndef DISABLE_ZLIB
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2063 }
b505083dcd87 Added png screenshot support
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2064 #endif
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2065 }
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
2066 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
2067 #ifndef DISABLE_OPENGL
062a2199daf6 Use SDL2 renderer as a fallback
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 797
diff changeset
2068 }
797
65181c3ee560 Add pure SDL2 renderer
=?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
parents: 766
diff changeset
2069 #endif
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
2070 if (which <= FRAMEBUFFER_EVEN) {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2071 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
2072 render_update_display();
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
2073 } 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
2074 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
2075 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
2076 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
2077 sdl_textures[which] = NULL;
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
2078 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
2079 on_ui_fb_resized();
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
2080 }
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
2081 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
2082 }
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
2083 } else {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2084 uint8_t win_idx = which - FRAMEBUFFER_USER_START;
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2085 if (extras[win_idx].renderer) {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2086 SDL_RenderCopy(extras[win_idx].renderer, extras[win_idx].sdl_texture, NULL, NULL);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2087 SDL_RenderPresent(extras[win_idx].renderer);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2088 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2089 #ifndef DISABLE_OPENGL
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2090 else {
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2091 glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2092 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2093
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2094 glBindBuffer(GL_ARRAY_BUFFER, extras[win_idx].gl_buffers[0]);
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
2095 extra_draw_quad(
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
2096 extras + win_idx,
2492
88210caedc53 Get rect fills for Pico pad working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2490
diff changeset
2097 extras[win_idx].gl_texture[0],
2490
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
2098 (float)extras[win_idx].width / (float)extras[win_idx].tex_width,
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
2099 (float)extras[win_idx].height / (float)extras[win_idx].tex_height
a0837ea61fda Get static images working in GL mode
Michael Pavone <pavone@retrodev.com>
parents: 2484
diff changeset
2100 );
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2101
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2102 SDL_GL_SwapWindow(extras[win_idx].win);
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2103 }
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2104 #endif
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
2105 }
1263
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2106 if (screenshot_file) {
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2107 fclose(screenshot_file);
5f65a16c23ff Implement raw screenshot functionality requested in ticket:10
Michael Pavone <pavone@retrodev.com>
parents: 1258
diff changeset
2108 }
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
2109 if (which <= FRAMEBUFFER_EVEN) {
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2110 last_field = which;
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
2111 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
2112 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
2113 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
2114 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
2115 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
2116 #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
2117 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
2118 #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
2119 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
2120 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
2121 }
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
2122 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
2123 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
2124 #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
2125 }
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
2126 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
2127 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
2128 }
449
7696d824489d Started work on OpenGL support in new branch
Mike Pavone <pavone@retrodev.com>
parents: 426
diff changeset
2129 }
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2130 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
2131 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
2132 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
2133 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
2134 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
2135 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
2136 }
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
2137 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
2138 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
2139 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
2140 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
2141 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
2142 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
2143 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
2144 } 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
2145 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
2146 }
1567
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs
Michael Pavone <pavone@retrodev.com>
parents: 1566
diff changeset
2147 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
2148 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
2149 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
2150 || (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
2151 || (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
2152 || 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
2153 ) {
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2154
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
2155 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
2156 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
2157 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
2158 last_buffered = NO_LAST_BUFFERED;
1589
780604a036e4 Limit underflow warning spam
Michael Pavone <pavone@retrodev.com>
parents: 1588
diff changeset
2159 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
2160 } else {
1567
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs
Michael Pavone <pavone@retrodev.com>
parents: 1566
diff changeset
2161 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
2162 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
2163 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
2164 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
2165 }
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
2166 }
1567
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs
Michael Pavone <pavone@retrodev.com>
parents: 1566
diff changeset
2167 } 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
2168 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
2169 }
66387b1645e4 Audio DRC seems to be working pretty well now. Removed debug printfs
Michael Pavone <pavone@retrodev.com>
parents: 1566
diff changeset
2170 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
2171 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
2172 render_audio_adjust_speed(adjust_ratio);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2173
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
2174 }
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
2175 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
2176 {
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
2177 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
2178 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
2179 }
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
2180 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
2181 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
2182 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
2183 }
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
2184 source_frame_count = frame_repeat[source_frame];
1563
6a62434d6bb1 WIP dynamic rate control
Michael Pavone <pavone@retrodev.com>
parents: 1562
diff changeset
2185 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2186 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2187
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2188 typedef struct {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2189 uint32_t *buffer;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2190 int width;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2191 uint8_t which;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2192 } frame;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2193 frame frame_queue[4];
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2194 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
2195
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2196 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
2197 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2198 if (sync_src == SYNC_AUDIO_THREAD || sync_src == SYNC_EXTERNAL) {
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2199 SDL_LockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2200 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
2201 SDL_CondSignal(frame_ready);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2202 SDL_UnlockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2203 SDL_Delay(1);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2204 SDL_LockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2205 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2206 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
2207 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
2208 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
2209 frame_queue_len--;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2210 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
2211 if (last != cur) {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2212 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
2213 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2214 frame_queue_write = last;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2215 break;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2216 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2217 cur = (cur + 1) & 3;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2218 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2219 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
2220 .buffer = locked_pixels,
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2221 .width = width,
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2222 .which = which
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2223 };
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2224 frame_queue_write &= 0x3;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2225 frame_queue_len++;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2226 SDL_CondSignal(frame_ready);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2227 SDL_UnlockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2228 return;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2229 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2230 //TODO: Maybe fixme for render API
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2231 process_framebuffer(which < FRAMEBUFFER_USER_START ? texture_buf : extras[which - FRAMEBUFFER_USER_START].texture_buf, which, width);
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2232 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2233
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2234 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
2235 {
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2236 if (sync_src != SYNC_AUDIO_THREAD && sync_src != SYNC_EXTERNAL) {
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2237 return;
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2238 }
1981
3537514ea206 Go back to unpausing audio in render_video_loop to ensure the core is no longer running on the main thread when audio callbacks start when using run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1980
diff changeset
2239 SDL_PauseAudio(0);
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2240 SDL_LockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2241 for(;;)
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2242 {
2370
6bcc2ab01ac6 Fix netplay crash
Michael Pavone <pavone@retrodev.com>
parents: 2368
diff changeset
2243 while (!frame_queue_len && audio_active)
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2244 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2245 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
2246 }
1979
06c25babe464 Don't hold frame queue mutex while rendering
Michael Pavone <pavone@retrodev.com>
parents: 1978
diff changeset
2247 while (frame_queue_len)
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2248 {
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2249 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
2250 frame_queue_read &= 0x3;
1979
06c25babe464 Don't hold frame queue mutex while rendering
Michael Pavone <pavone@retrodev.com>
parents: 1978
diff changeset
2251 frame_queue_len--;
06c25babe464 Don't hold frame queue mutex while rendering
Michael Pavone <pavone@retrodev.com>
parents: 1978
diff changeset
2252 SDL_UnlockMutex(frame_mutex);
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2253 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
2254 release_buffer(f.buffer);
1979
06c25babe464 Don't hold frame queue mutex while rendering
Michael Pavone <pavone@retrodev.com>
parents: 1978
diff changeset
2255 SDL_LockMutex(frame_mutex);
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2256 }
2370
6bcc2ab01ac6 Fix netplay crash
Michael Pavone <pavone@retrodev.com>
parents: 2368
diff changeset
2257 if (!audio_active) {
1980
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
2258 break;
81df9aa2de9b Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents: 1979
diff changeset
2259 }
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2260 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2261
1932
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2262 SDL_UnlockMutex(frame_mutex);
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2263 }
b387f1c5a1d0 WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents: 1895
diff changeset
2264
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2265 static ui_render_fun render_ui;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2266 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
2267 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2268 render_ui = fun;
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2269 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2270
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2271 static ui_render_fun frame_presented;
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2272 void render_set_frame_presented_fun(ui_render_fun fun)
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2273 {
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2274 frame_presented = fun;
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2275 }
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2276
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2277 void render_update_display()
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2278 {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2279 #ifndef DISABLE_OPENGL
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2280 if (render_gl) {
2376
1c09f5be285b Very basic UI for media player
Michael Pavone <pavone@retrodev.com>
parents: 2370
diff changeset
2281 SDL_GL_MakeCurrent(main_window, main_context);
1528
855210dca5b9 Set glClearColor back to black
Michael Pavone <pavone@retrodev.com>
parents: 1483
diff changeset
2282 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
2283 glClear(GL_COLOR_BUFFER_BIT);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2284
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2285 glUseProgram(program);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2286 glActiveTexture(GL_TEXTURE0);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2287 glBindTexture(GL_TEXTURE_2D, textures[0]);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2288 glUniform1i(un_textures[0], 0);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2289
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2290 glActiveTexture(GL_TEXTURE1);
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2291 int bot_texture = 2; //black texture
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2292 if (interlaced) {
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2293 bot_texture = 1;
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2294 } else if (!scanlines && un_scanlines == -1) {
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2295 bot_texture = 0;
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2296 }
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2297 glBindTexture(GL_TEXTURE_2D, textures[bot_texture]);
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2298 glUniform1i(un_textures[1], 1);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2299
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2300 glUniform1f(un_width, render_emulated_width());
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2301 glUniform1f(un_height, last_height);
1977
f3cca4b3f17a Allow use of NPOT textures as a config option. Useful for some mobile GPUs
Michael Pavone <pavone@retrodev.com>
parents: 1975
diff changeset
2302 glUniform2f(un_texsize, tex_width, tex_height);
2390
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2303 if (un_curfield != -1) {
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2304 glUniform1i(un_curfield, last_field);
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2305 }
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2306 if (un_interlaced != -1) {
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2307 glUniform1i(un_interlaced, interlaced);
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2308 }
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2309 if (un_scanlines != -1) {
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2310 glUniform1i(un_scanlines, scanlines);
9264c847ceb7 Add some uniforms to allow more sophisticated interlace and scanline handling in shaders
Michael Pavone <pavone@retrodev.com>
parents: 2388
diff changeset
2311 }
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2312
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2313 glBindBuffer(GL_ARRAY_BUFFER, buffers[0]);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2314 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
2315 glEnableVertexAttribArray(at_pos);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2316
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2317 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffers[1]);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2318 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
2319
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2320 glDisableVertexAttribArray(at_pos);
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2321
1474
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2322 if (render_ui) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2323 render_ui();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2324 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2325
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2326 SDL_GL_SwapWindow(main_window);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2327 } else {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2328 #endif
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2329 SDL_Rect src_clip = {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2330 .x = overscan_left[video_standard],
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2331 .y = overscan_top[video_standard],
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2332 .w = render_emulated_width(),
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2333 .h = last_height
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2334 };
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2335 SDL_SetRenderDrawColor(main_renderer, 0, 0, 0, 255);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2336 SDL_RenderClear(main_renderer);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2337 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
2338 if (render_ui) {
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2339 render_ui();
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2340 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2341 SDL_RenderPresent(main_renderer);
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2342 #ifndef DISABLE_OPENGL
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2343 }
c5c022c7aa54 Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents: 1441
diff changeset
2344 #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
2345 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
2346 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
2347 }
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
2348 events_processed = 0;
2600
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2349 if (frame_presented) {
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2350 frame_presented();
251cc75574af Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents: 2553
diff changeset
2351 }
20
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2352 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2353
1398
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2354 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
2355 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2356 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
2357 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2358
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2359 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
2360 {
2200
f11f4399d64b Crop display in game gear mode
Michael Pavone <pavone@retrodev.com>
parents: 2093
diff changeset
2361 return (video_standard == VID_PAL ? 294 : 243) - overscan_top[video_standard] - overscan_bot[video_standard];
1398
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2362 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2363
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2364 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
2365 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2366 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
2367 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2368
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2369 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
2370 {
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2371 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
2372 }
08116cb5ffaa Fix absolute mouse mode when non-default overscan settings are used
Michael Pavone <pavone@retrodev.com>
parents: 1397
diff changeset
2373
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
2374 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
2375 {
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
2376 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
2377 }
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
2378
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
2379 void render_wait_quit(void)
20
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2380 {
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2381 SDL_Event event;
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2382 while(SDL_WaitEvent(&event)) {
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2383 switch (event.type) {
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2384 case SDL_QUIT:
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2385 return;
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2386 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2387 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2388 }
f664eeb55cb4 Mostly broken VDP core and savestate viewer
Mike Pavone <pavone@retrodev.com>
parents:
diff changeset
2389
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
2390 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
2391 {
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
2392 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
2393 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
2394 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
2395 {
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
2396 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
2397 }
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
2398 //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
2399 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
2400 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
2401 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
2402 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
2403 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
2404 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
2405 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
2406 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
2407 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
2408 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
2409 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
2410 }
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
2411 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
2412 }
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
2413
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
2414 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
2415 {
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
2416 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
2417 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
2418 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
2419 {
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
2420 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
2421 }
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
2422 //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
2423 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
2424 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
2425 }
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
2426 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
2427 }
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
2428
1207
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2429 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
2430 {
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
2431 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
2432 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
2433 return RENDER_NOT_PLUGGED_IN;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2434 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2435
1187
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2436 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
2437 return RENDER_NOT_MAPPED;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2438 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2439 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
2440 if (!control) {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2441 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
2442 return RENDER_NOT_PLUGGED_IN;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2443 }
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2444
1207
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2445 SDL_GameControllerButtonBind cbind;
1804
34370330eaf3 Support controllers that have their dpad mapped to an axis
Michael Pavone <pavone@retrodev.com>
parents: 1799
diff changeset
2446 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
2447 if (is_axis) {
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2448
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
2449 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
2450 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
2451 SDL_GameControllerClose(control);
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2452 return RENDER_INVALID_NAME;
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2453 }
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2454 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
2455 } 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
2456 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
2457 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
2458 SDL_GameControllerClose(control);
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2459 return RENDER_INVALID_NAME;
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2460 }
1804
34370330eaf3 Support controllers that have their dpad mapped to an axis
Michael Pavone <pavone@retrodev.com>
parents: 1799
diff changeset
2461 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
2462 //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
2463 is_positive = 0;
34370330eaf3 Support controllers that have their dpad mapped to an axis
Michael Pavone <pavone@retrodev.com>
parents: 1799
diff changeset
2464 }
1207
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2465 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
2466 }
1187
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2467 SDL_GameControllerClose(control);
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2468 switch (cbind.bindType)
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2469 {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2470 case SDL_CONTROLLER_BINDTYPE_BUTTON:
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2471 return cbind.value.button;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2472 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
2473 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
2474 case SDL_CONTROLLER_BINDTYPE_HAT:
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2475 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
2476 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2477 return RENDER_NOT_MAPPED;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2478 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2479
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2480 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
2481 {
1207
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2482 return input >> 4 & 0xFFFFFF;
1187
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2483 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2484
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2485 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
2486 {
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2487 return input & 0xF;
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2488 }
6a4503fad67e Initial support for using SDL2 game controller mapping functionality
Michael Pavone <pavone@retrodev.com>
parents: 1184
diff changeset
2489
1207
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2490 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
2491 {
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2492 return input & 0xFFFFFFF;
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2493 }
9d6f155732ed Basic support for mapping an analog axis to functionality
Michael Pavone <pavone@retrodev.com>
parents: 1205
diff changeset
2494
409
c1bddeadc566 Process events in vgm player so that quitting works
Mike Pavone <pavone@retrodev.com>
parents: 398
diff changeset
2495 void process_events()
c1bddeadc566 Process events in vgm player so that quitting works
Mike Pavone <pavone@retrodev.com>
parents: 398
diff changeset
2496 {
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
2497 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
2498 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
2499 }
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
2500 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
2501 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
2502 }
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
2503
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
2504 #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
2505 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
2506 {
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
2507 //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
2508 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
2509 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
2510 }
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
2511 in_toggle = 1;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2512
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
2513 //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
2514 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
2515 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
2516 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
2517 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
2518 return;
409
c1bddeadc566 Process events in vgm player so that quitting works
Mike Pavone <pavone@retrodev.com>
parents: 398
diff changeset
2519 }
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
2520 last_toggle = cur;
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2521
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
2522 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
2523 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
2524 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
2525 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
2526 //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
2527 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
2528 //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
2529 //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
2530 //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
2531 //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
2532 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
2533 }
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
2534 SDL_SetWindowFullscreen(main_window, is_fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
2392
a71176b9903d Hide cursor in fullscreen when UI is not active
Michael Pavone <pavone@retrodev.com>
parents: 2390
diff changeset
2535 update_cursor();
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
2536 //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
2537 //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
2538 //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
2539 //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
2540 //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
2541 //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
2542 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
2543 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
2544 in_toggle = 0;
1825
56a1171e29b9 Allow Nuklear UI to be used when OpenGL is disabled
Michael Pavone <pavone@retrodev.com>
parents: 1820
diff changeset
2545 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
2546 }
c1bddeadc566 Process events in vgm player so that quitting works
Mike Pavone <pavone@retrodev.com>
parents: 398
diff changeset
2547
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
2548 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
2549 {
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
2550 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
2551 }
354
15dd6418fe67 Initial PSG support. Mostly works, noise channel is borked though.
Mike Pavone <pavone@retrodev.com>
parents: 342
diff changeset
2552
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
2553 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
2554 {
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
2555 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
2556 }
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
2557
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
2558 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
2559 {
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
2560 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
2561 }
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
2562
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
2563 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
2564 {
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
2565 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
2566 }
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
2567
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
2568 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
2569 {
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
2570 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
2571 }
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
2572
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
2573 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
2574 {
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
2575 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
2576 }
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
2577
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally
Michael Pavone <pavone@retrodev.com>
parents: 1623
diff changeset
2578 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
2579 {
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally
Michael Pavone <pavone@retrodev.com>
parents: 1623
diff changeset
2580 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
2581 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
2582 }
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2583 for (int i = 0; i < num_extras; i++)
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
2584 {
2484
ccee8dccd9cc Add support for rendering debug windows with OpenGL in perparation for allowing Nuklear UI in them
Michael Pavone <pavone@retrodev.com>
parents: 2458
diff changeset
2585 if (extras[i].win && (SDL_GetWindowFlags(extras[i].win) & SDL_WINDOW_INPUT_FOCUS)) {
2093
46ee354f29bd Hack fix for audio deadlock issue
Michael Pavone <pavone@retrodev.com>
parents: 2031
diff changeset
2586 return FRAMEBUFFER_USER_START + i;
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
2587 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally
Michael Pavone <pavone@retrodev.com>
parents: 1623
diff changeset
2588 }
c4ba3177b72d WIP new VDP plane debug view and support for detached VDP debug views generally
Michael Pavone <pavone@retrodev.com>
parents: 1623
diff changeset
2589 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
2590 }
1967
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2591
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2592 uint8_t render_create_thread(render_thread *thread, const char *name, render_thread_fun fun, void *data)
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2593 {
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2594 *thread = SDL_CreateThread(fun, name, data);
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2595 return *thread != 0;
bd70f1e15684 Make netplay remote sync to network rather than audio or video so it doesn't drift out of sync with the host
Michael Pavone <pavone@retrodev.com>
parents: 1952
diff changeset
2596 }
2532
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2597
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2598 char *render_read_clipboard(void)
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2599 {
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2600 char *tmp = SDL_GetClipboardText();
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2601 char *ret = strdup(tmp);
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2602 SDL_free(tmp);
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2603 return ret;
f4a471730ba4 Implement clipboard paste for SC-3000
Michael Pavone <pavone@retrodev.com>
parents: 2523
diff changeset
2604 }