Merge branch 'master' into feature/savestates-2

This commit is contained in:
Hamish Milne
2020-04-12 11:24:06 +01:00
76 changed files with 3507 additions and 1369 deletions

View File

@ -28,6 +28,7 @@ std::atomic<bool> g_use_disk_shader_cache;
std::atomic<bool> g_renderer_bg_color_update_requested;
std::atomic<bool> g_renderer_sampler_update_requested;
std::atomic<bool> g_renderer_shader_update_requested;
std::atomic<bool> g_texture_filter_update_requested;
// Screenshot
std::atomic<bool> g_renderer_screenshot_requested;
void* g_screenshot_bits;