mirror of
				https://git.tardis.systems/mirrors/yuzu
				synced 2025-11-04 04:34:07 +01:00 
			
		
		
		
	Merge pull request #7078 from ameerj/vc-jthread-fixes
video_core: Fix jthread related hangs when stopping emulation
This commit is contained in:
		
						commit
						5114819b6b
					
				@ -305,7 +305,6 @@ struct System::Impl {
 | 
			
		||||
        is_powered_on = false;
 | 
			
		||||
        exit_lock = false;
 | 
			
		||||
 | 
			
		||||
        gpu_core.reset();
 | 
			
		||||
        services.reset();
 | 
			
		||||
        service_manager.reset();
 | 
			
		||||
        cheat_engine.reset();
 | 
			
		||||
@ -315,6 +314,7 @@ struct System::Impl {
 | 
			
		||||
        core_timing.Shutdown();
 | 
			
		||||
        app_loader.reset();
 | 
			
		||||
        perf_stats.reset();
 | 
			
		||||
        gpu_core.reset();
 | 
			
		||||
        kernel.Shutdown();
 | 
			
		||||
        memory.Reset();
 | 
			
		||||
        applet_manager.ClearAll();
 | 
			
		||||
 | 
			
		||||
@ -212,7 +212,6 @@ private:
 | 
			
		||||
    vk::CommandBuffer current_cmdbuf;
 | 
			
		||||
 | 
			
		||||
    std::unique_ptr<CommandChunk> chunk;
 | 
			
		||||
    std::jthread worker_thread;
 | 
			
		||||
 | 
			
		||||
    State state;
 | 
			
		||||
 | 
			
		||||
@ -226,6 +225,7 @@ private:
 | 
			
		||||
    std::mutex work_mutex;
 | 
			
		||||
    std::condition_variable_any work_cv;
 | 
			
		||||
    std::condition_variable wait_cv;
 | 
			
		||||
    std::jthread worker_thread;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
} // namespace Vulkan
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user