diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-01-14 20:14:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-14 20:14:47 +0100 |
commit | 81e9e229fa46edf227bbb65011e21da5fa76e347 (patch) | |
tree | 12b5e92d73c87bac2aed335f0ddda4957368b682 | |
parent | Merge pull request #3296 from Simek/hotkeys_resize (diff) | |
parent | gl_shader_cache: Remove unused STAGE_RESERVED_UBOS constant (diff) | |
download | yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.tar yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.tar.gz yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.tar.bz2 yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.tar.lz yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.tar.xz yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.tar.zst yuzu-81e9e229fa46edf227bbb65011e21da5fa76e347.zip |
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index de742d11c..a4acb3796 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -34,9 +34,6 @@ using VideoCommon::Shader::ShaderIR; namespace { -// One UBO is always reserved for emulation values on staged shaders -constexpr u32 STAGE_RESERVED_UBOS = 1; - constexpr u32 STAGE_MAIN_OFFSET = 10; constexpr u32 KERNEL_MAIN_OFFSET = 0; @@ -243,7 +240,6 @@ CachedProgram BuildShader(const Device& device, u64 unique_identifier, ShaderTyp if (!code_b.empty()) { ir_b.emplace(code_b, main_offset, COMPILER_SETTINGS, locker); } - const auto entries = GLShader::GetEntries(ir); std::string source = fmt::format(R"(// {} #version 430 core @@ -314,9 +310,10 @@ std::unordered_set<GLenum> GetSupportedFormats() { CachedShader::CachedShader(const ShaderParameters& params, ShaderType shader_type, GLShader::ShaderEntries entries, ProgramCode code, ProgramCode code_b) - : RasterizerCacheObject{params.host_ptr}, system{params.system}, disk_cache{params.disk_cache}, - device{params.device}, cpu_addr{params.cpu_addr}, unique_identifier{params.unique_identifier}, - shader_type{shader_type}, entries{entries}, code{std::move(code)}, code_b{std::move(code_b)} { + : RasterizerCacheObject{params.host_ptr}, system{params.system}, + disk_cache{params.disk_cache}, device{params.device}, cpu_addr{params.cpu_addr}, + unique_identifier{params.unique_identifier}, shader_type{shader_type}, + entries{std::move(entries)}, code{std::move(code)}, code_b{std::move(code_b)} { if (!params.precompiled_variants) { return; } |