Browse Source

gl_shader_cache: Remove const from pipeline source arguments

nce_cpp
ameerj 5 years ago
parent
commit
18aae22ad2
  1. 2
      src/video_core/renderer_opengl/gl_compute_pipeline.cpp
  2. 2
      src/video_core/renderer_opengl/gl_compute_pipeline.h
  3. 4
      src/video_core/renderer_opengl/gl_graphics_pipeline.cpp
  4. 4
      src/video_core/renderer_opengl/gl_graphics_pipeline.h

2
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()) {

2
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();

4
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_},

4
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);

Loading…
Cancel
Save