diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-15 06:42:25 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-02-07 02:23:40 +0100 |
commit | 750abcc23d0b9584b716ab93110383209b0971f8 (patch) | |
tree | f8299f57d6354c8e2020f3b34e3a50c5c9883fea /src/video_core/renderer_opengl/gl_shader_cache.cpp | |
parent | gl_shader_disk_cache: Pass return values returning instead of by parameters (diff) | |
download | yuzu-750abcc23d0b9584b716ab93110383209b0971f8.tar yuzu-750abcc23d0b9584b716ab93110383209b0971f8.tar.gz yuzu-750abcc23d0b9584b716ab93110383209b0971f8.tar.bz2 yuzu-750abcc23d0b9584b716ab93110383209b0971f8.tar.lz yuzu-750abcc23d0b9584b716ab93110383209b0971f8.tar.xz yuzu-750abcc23d0b9584b716ab93110383209b0971f8.tar.zst yuzu-750abcc23d0b9584b716ab93110383209b0971f8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 49b872c44..6acfd1649 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -181,7 +181,8 @@ CachedProgram SpecializeShader(const std::string& code, const GLShader::ShaderEn } if (program_type == Maxwell::ShaderProgram::Geometry) { - const auto [glsl_topology, _, max_vertices] = GetPrimitiveDescription(primitive_mode); + const auto [glsl_topology, debug_name, max_vertices] = + GetPrimitiveDescription(primitive_mode); source += "layout (" + std::string(glsl_topology) + ") in;\n"; source += "#define MAX_VERTEX_INPUT " + std::to_string(max_vertices) + '\n'; @@ -314,7 +315,7 @@ GLuint CachedShader::LazyGeometryProgram(CachedProgram& target_program, BaseBind if (target_program) { return target_program->handle; } - const auto [_, debug_name, __] = GetPrimitiveDescription(primitive_mode); + const auto [glsl_name, debug_name, vertices] = GetPrimitiveDescription(primitive_mode); target_program = TryLoadProgram(primitive_mode, base_bindings); if (!target_program) { target_program = @@ -419,7 +420,6 @@ CachedProgram ShaderCacheOpenGL::GeneratePrecompiledProgram( std::map<u64, UnspecializedShader> ShaderCacheOpenGL::GenerateUnspecializedShaders( const std::vector<ShaderDiskCacheRaw>& raws, const std::map<u64, ShaderDiskCacheDecompiled>& decompiled) { - std::map<u64, UnspecializedShader> unspecialized; for (const auto& raw : raws) { |