summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/renderer_opengl/gl_compute_pipeline.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_compute_pipeline.h2
-rw-r--r--src/video_core/renderer_opengl/gl_graphics_pipeline.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_graphics_pipeline.h4
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
40 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, 40 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_,
41 Tegra::Engines::KeplerCompute& kepler_compute_, 41 Tegra::Engines::KeplerCompute& kepler_compute_,
42 ProgramManager& program_manager_, const Shader::Info& info_, 42 ProgramManager& program_manager_, const Shader::Info& info_,
43 const std::string code) 43 std::string code)
44 : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, gpu_memory{gpu_memory_}, 44 : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, gpu_memory{gpu_memory_},
45 kepler_compute{kepler_compute_}, program_manager{program_manager_}, info{info_} { 45 kepler_compute{kepler_compute_}, program_manager{program_manager_}, info{info_} {
46 if (device.UseAssemblyShaders()) { 46 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:
54 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, 54 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_,
55 Tegra::Engines::KeplerCompute& kepler_compute_, 55 Tegra::Engines::KeplerCompute& kepler_compute_,
56 ProgramManager& program_manager_, const Shader::Info& info_, 56 ProgramManager& program_manager_, const Shader::Info& info_,
57 const std::string code); 57 std::string code);
58 58
59 void Configure(); 59 void Configure();
60 60
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
117 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, 117 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_,
118 Tegra::Engines::Maxwell3D& maxwell3d_, 118 Tegra::Engines::Maxwell3D& maxwell3d_,
119 ProgramManager& program_manager_, StateTracker& state_tracker_, 119 ProgramManager& program_manager_, StateTracker& state_tracker_,
120 const std::array<std::string, 5> assembly_sources, 120 std::array<std::string, 5> assembly_sources,
121 const std::array<std::string, 5> glsl_sources, 121 std::array<std::string, 5> glsl_sources,
122 const std::array<const Shader::Info*, 5>& infos, 122 const std::array<const Shader::Info*, 5>& infos,
123 const VideoCommon::TransformFeedbackState* xfb_state) 123 const VideoCommon::TransformFeedbackState* xfb_state)
124 : texture_cache{texture_cache_}, buffer_cache{buffer_cache_}, gpu_memory{gpu_memory_}, 124 : 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:
65 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_, 65 BufferCache& buffer_cache_, Tegra::MemoryManager& gpu_memory_,
66 Tegra::Engines::Maxwell3D& maxwell3d_, 66 Tegra::Engines::Maxwell3D& maxwell3d_,
67 ProgramManager& program_manager_, StateTracker& state_tracker_, 67 ProgramManager& program_manager_, StateTracker& state_tracker_,
68 const std::array<std::string, 5> assembly_sources, 68 std::array<std::string, 5> assembly_sources,
69 const std::array<std::string, 5> glsl_sources, 69 std::array<std::string, 5> glsl_sources,
70 const std::array<const Shader::Info*, 5>& infos, 70 const std::array<const Shader::Info*, 5>& infos,
71 const VideoCommon::TransformFeedbackState* xfb_state); 71 const VideoCommon::TransformFeedbackState* xfb_state);
72 72