Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MakeCurrent and shader issues with AMD 22.7 driver

Browse source
This commit is contained in:
pawelniegowski 2022-07-29 12:26:18 +02:00
parent 6764264488
commit ff81fb04b4
6 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/video_core/renderer_opengl/gl_shader_manager.cpp
View file

@ -706,6 +706,8 @@ void ShaderProgramManager::LoadDiskCache(const std::atomic_bool& stop_loading,
const std::size_t bucket_size{load_raws_size / num_workers};
std::vector<std::unique_ptr<Frontend::GraphicsContext>> contexts(num_workers);
std::vector<std::thread> threads(num_workers);
emu_window.SaveContext();
for (std::size_t i = 0; i < num_workers; ++i) {
const bool is_last_worker = i + 1 == num_workers;
const std::size_t start{bucket_size * i};
@ -713,11 +715,14 @@ void ShaderProgramManager::LoadDiskCache(const std::atomic_bool& stop_loading,
// On some platforms the shared context has to be created from the GUI thread
contexts[i] = emu_window.CreateSharedContext();
// Release the context, so it can be immediately used by the spawned thread
contexts[i]->DoneCurrent();
threads[i] = std::thread(LoadRawSepareble, contexts[i].get(), start, end);
}
for (auto& thread : threads) {
thread.join();
}
emu_window.RestoreContext();
if (compilation_failed) {
disk_cache.InvalidateAll();

2
src/video_core/renderer_opengl/gl_shader_util.cpp
View file

@ -26,7 +26,7 @@ GLuint LoadShader(const char* source, GLenum type) {
#extension GL_EXT_clip_cull_distance : enable
#endif // defined(GL_EXT_clip_cull_distance)
)"
: "#version 330\n";
: "#version 430\n";
const char* debug_type;
switch (type) {