diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-06-25 13:57:32 +0200 |
|---|---|---|
| committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-07-09 14:14:37 +0200 |
| commit | 459fce3a8f26241ff2a68c323e75fb70e7e1ba79 (patch) | |
| tree | 4b653d7dd8fd7e6d325ca69cdd1384187cbd73ac /src/video_core/renderer_opengl/gl_shader_cache.cpp | |
| parent | shader_ir: Implement BRX & BRA.CC (diff) | |
| download | yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.tar yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.tar.gz yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.tar.bz2 yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.tar.lz yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.tar.xz yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.tar.zst yuzu-459fce3a8f26241ff2a68c323e75fb70e7e1ba79.zip | |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_cache.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 22 |
1 files changed, 15 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 f9b2b03a0..5d76ee12d 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -129,9 +129,11 @@ std::size_t CalculateProgramSize(const GLShader::ProgramCode& program) { /// Hashes one (or two) program streams u64 GetUniqueIdentifier(Maxwell::ShaderProgram program_type, const ProgramCode& code, - const ProgramCode& code_b) { - u64 unique_identifier = - Common::CityHash64(reinterpret_cast<const char*>(code.data()), CalculateProgramSize(code)); + const ProgramCode& code_b, std::size_t size_a = 0, std::size_t size_b = 0) { + if (size_a == 0) { + size_a = CalculateProgramSize(code); + } + u64 unique_identifier = Common::CityHash64(reinterpret_cast<const char*>(code.data()), size_a); if (program_type != Maxwell::ShaderProgram::VertexA) { return unique_identifier; } @@ -140,8 +142,11 @@ u64 GetUniqueIdentifier(Maxwell::ShaderProgram program_type, const ProgramCode& std::size_t seed = 0; boost::hash_combine(seed, unique_identifier); - const u64 identifier_b = Common::CityHash64(reinterpret_cast<const char*>(code_b.data()), - CalculateProgramSize(code_b)); + if (size_b == 0) { + size_b = CalculateProgramSize(code_b); + } + const u64 identifier_b = + Common::CityHash64(reinterpret_cast<const char*>(code_b.data()), size_b); boost::hash_combine(seed, identifier_b); return static_cast<u64>(seed); } @@ -150,14 +155,17 @@ u64 GetUniqueIdentifier(Maxwell::ShaderProgram program_type, const ProgramCode& GLShader::ProgramResult CreateProgram(const Device& device, Maxwell::ShaderProgram program_type, ProgramCode program_code, ProgramCode program_code_b) { GLShader::ShaderSetup setup(program_code); + setup.program.size_a = CalculateProgramSize(program_code); + setup.program.size_b = 0; if (program_type == Maxwell::ShaderProgram::VertexA) { // VertexB is always enabled, so when VertexA is enabled, we have two vertex shaders. // Conventional HW does not support this, so we combine VertexA and VertexB into one // stage here. setup.SetProgramB(program_code_b); + setup.program.size_b = CalculateProgramSize(program_code_b); } - setup.program.unique_identifier = - GetUniqueIdentifier(program_type, program_code, program_code_b); + setup.program.unique_identifier = GetUniqueIdentifier( + program_type, program_code, program_code_b, setup.program.size_a, setup.program.size_b); switch (program_type) { case Maxwell::ShaderProgram::VertexA: |