summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-06-18 05:12:41 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:38 +0200
commitfcff19e0fa3d21130bc7b6cd50a10db102b5d4d7 (patch)
tree9d80a256e72c2f51d86e2e5ecc2e64315553f12e
parenttexture_pass: Fix is_read image qualification (diff)
downloadyuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.tar
yuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.tar.gz
yuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.tar.bz2
yuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.tar.lz
yuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.tar.xz
yuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.tar.zst
yuzu-fcff19e0fa3d21130bc7b6cd50a10db102b5d4d7.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp8
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp12
2 files changed, 9 insertions, 11 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index b8b24dd3d..8aaadccc4 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -430,10 +430,10 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
previous_program = &program;
}
auto* const thread_worker{build_in_parallel ? workers.get() : nullptr};
- VideoCore::ShaderNotify* const notify{build_in_parallel ? &shader_notify : nullptr};
- return std::make_unique<GraphicsPipeline>(
- device, texture_cache, buffer_cache, gpu_memory, maxwell3d, program_manager, state_tracker,
- thread_worker, notify, sources, infos, key.xfb_enabled != 0 ? &key.xfb_state : nullptr);
+ return std::make_unique<GraphicsPipeline>(device, texture_cache, buffer_cache, gpu_memory,
+ maxwell3d, program_manager, state_tracker,
+ thread_worker, &shader_notify, sources, infos,
+ key.xfb_enabled != 0 ? &key.xfb_state : nullptr);
} catch (Shader::Exception& exception) {
LOG_ERROR(Render_OpenGL, "{}", exception.what());
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index dc028306a..e83628c13 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -529,11 +529,10 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
previous_stage = &program;
}
Common::ThreadWorker* const thread_worker{build_in_parallel ? &workers : nullptr};
- VideoCore::ShaderNotify* const notify{build_in_parallel ? &shader_notify : nullptr};
- return std::make_unique<GraphicsPipeline>(maxwell3d, gpu_memory, scheduler, buffer_cache,
- texture_cache, notify, device, descriptor_pool,
- update_descriptor_queue, thread_worker,
- render_pass_cache, key, std::move(modules), infos);
+ return std::make_unique<GraphicsPipeline>(
+ maxwell3d, gpu_memory, scheduler, buffer_cache, texture_cache, &shader_notify, device,
+ descriptor_pool, update_descriptor_queue, thread_worker, render_pass_cache, key,
+ std::move(modules), infos);
} catch (const Shader::Exception& exception) {
LOG_ERROR(Render_Vulkan, "{}", exception.what());
@@ -596,9 +595,8 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
spv_module.SetObjectNameEXT(name.c_str());
}
Common::ThreadWorker* const thread_worker{build_in_parallel ? &workers : nullptr};
- VideoCore::ShaderNotify* const notify{build_in_parallel ? &shader_notify : nullptr};
return std::make_unique<ComputePipeline>(device, descriptor_pool, update_descriptor_queue,
- thread_worker, notify, program.info,
+ thread_worker, &shader_notify, program.info,
std::move(spv_module));
} catch (const Shader::Exception& exception) {