80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2449 from Cacodemon345/atomic_screenshots

Browse Source 
Make screenshots thread-safe
This commit is contained in:
Miran Grča
2022-07-11 17:44:35 +02:00
committed by GitHub
parent ef96ee8a3b a2c9dc5dbb
commit 8253e04705
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/86box/video.h
View File

@@ -25,6 +25,7 @@
#ifdef __cplusplus
#include <atomic>
using atomic_bool = std::atomic_bool;
using atomic_int = std::atomic_int;
#else
#include <stdatomic.h>
#endif
@@ -112,7 +113,7 @@ typedef struct monitor_t
int mon_force_resize;
int mon_fullchange;
int mon_changeframecount;
int mon_screenshots;
atomic_int mon_screenshots;
uint32_t* mon_pal_lookup;
int* mon_cga_palette;
int mon_pal_lookup_static; /* Whether it should not be freed by the API. */

3
src/video/video.c
View File

@@ -442,7 +442,7 @@ video_screenshot_monitor(uint32_t *buf, int start_x, int start_y, int row_len, i
video_take_screenshot_monitor((const char *) path, buf, start_x, start_y, row_len, monitor_index);
png_destroy_write_struct(&png_ptr[monitor_index], &info_ptr[monitor_index]);
monitors[monitor_index].mon_screenshots--;
atomic_fetch_sub(&monitors[monitor_index].mon_screenshots, 1);
}
void
@@ -942,6 +942,7 @@ video_monitor_init(int index)
monitors[index].mon_force_resize = 1;
monitors[index].mon_vid_type = VIDEO_FLAG_TYPE_NONE;
atomic_init(&doresize_monitors[index], 0);
atomic_init(&monitors[index].mon_screenshots, 0);
if (index >= 1) ui_init_monitor(index);
monitors[index].mon_blit_data_ptr->blit_thread = thread_create(blit_thread, monitors[index].mon_blit_data_ptr);
}