diff options
| author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-06-12 08:11:13 +0200 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-07-23 03:51:38 +0200 |
| commit | ff3de0fb6bb46bcb59421cef203ca8e8daaec85c (patch) | |
| tree | 12b91055efde18b401d2c5464bae01a2554d42b0 | |
| parent | gl_shader_cache: Move OGL shader compilation to the respective Pipeline constructor (diff) | |
| download | yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.tar yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.tar.gz yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.tar.bz2 yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.tar.lz yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.tar.xz yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.tar.zst yuzu-ff3de0fb6bb46bcb59421cef203ca8e8daaec85c.zip | |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp index f984b635c..2d6442d74 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp @@ -40,7 +40,7 @@ ComputePipeline::ComputePipeline(const Device& device, TextureCache& texture_cac BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, Tegra::Engines::KeplerCompute& kepler_compute_, ProgramManager& program_manager_, const Shader::Info& info_, - const std::string code) + std::string code) : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, gpu_memory{gpu_memory_}, kepler_compute{kepler_compute_}, program_manager{program_manager_}, info{info_} { if (device.UseAssemblyShaders()) { diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.h b/src/video_core/renderer_opengl/gl_compute_pipeline.h index a93166eb6..b5fc45f26 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.h +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.h @@ -54,7 +54,7 @@ public: BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, Tegra::Engines::KeplerCompute& kepler_compute_, ProgramManager& program_manager_, const Shader::Info& info_, - const std::string code); + std::string code); void Configure(); diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp index 4d62d7062..d64723d6b 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp @@ -117,8 +117,8 @@ GraphicsPipeline::GraphicsPipeline(const Device& device, TextureCache& texture_c BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, Tegra::Engines::Maxwell3D& maxwell3d_, ProgramManager& program_manager_, StateTracker& state_tracker_, - const std::array<std::string, 5> assembly_sources, - const std::array<std::string, 5> glsl_sources, + std::array<std::string, 5> assembly_sources, + std::array<std::string, 5> glsl_sources, const std::array<const Shader::Info*, 5>& infos, const VideoCommon::TransformFeedbackState* xfb_state) : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, gpu_memory{gpu_memory_}, diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.h b/src/video_core/renderer_opengl/gl_graphics_pipeline.h index 984bf994f..dc791be53 100644 --- a/src/video_core/renderer_opengl/gl_graphics_pipeline.h +++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.h @@ -65,8 +65,8 @@ public: BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, Tegra::Engines::Maxwell3D& maxwell3d_, ProgramManager& program_manager_, StateTracker& state_tracker_, - const std::array<std::string, 5> assembly_sources, - const std::array<std::string, 5> glsl_sources, + std::array<std::string, 5> assembly_sources, + std::array<std::string, 5> glsl_sources, const std::array<const Shader::Info*, 5>& infos, const VideoCommon::TransformFeedbackState* xfb_state); |