diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-06 08:32:43 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-23 01:28:47 +0100 |
commit | 32c1bc6a67820f9df21c8f64f4df078b015aa7da (patch) | |
tree | 141df885726a01fbd7d999d6ee314b4d11c8ce56 /src/video_core/renderer_opengl/gl_shader_disk_cache.h | |
parent | Merge pull request #3142 from ReinUsesLisp/depbar-log (diff) | |
download | yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.tar yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.tar.gz yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.tar.bz2 yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.tar.lz yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.tar.xz yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.tar.zst yuzu-32c1bc6a67820f9df21c8f64f4df078b015aa7da.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_disk_cache.h')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_disk_cache.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.h b/src/video_core/renderer_opengl/gl_shader_disk_cache.h index db23ada93..55311dc6d 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.h @@ -4,7 +4,6 @@ #pragma once -#include <bitset> #include <optional> #include <string> #include <tuple> @@ -37,7 +36,6 @@ struct ShaderDiskCacheDump; using ProgramCode = std::vector<u64>; using ShaderDumpsMap = std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump>; -using TextureBufferUsage = std::bitset<64>; /// Allocated bindings used by an OpenGL shader program struct BaseBindings { @@ -61,11 +59,10 @@ static_assert(std::is_trivially_copyable_v<BaseBindings>); struct ProgramVariant { BaseBindings base_bindings; GLenum primitive_mode{}; - TextureBufferUsage texture_buffer_usage{}; bool operator==(const ProgramVariant& rhs) const { - return std::tie(base_bindings, primitive_mode, texture_buffer_usage) == - std::tie(rhs.base_bindings, rhs.primitive_mode, rhs.texture_buffer_usage); + return std::tie(base_bindings, primitive_mode) == + std::tie(rhs.base_bindings, rhs.primitive_mode); } bool operator!=(const ProgramVariant& rhs) const { @@ -112,7 +109,6 @@ template <> struct hash<OpenGL::ProgramVariant> { std::size_t operator()(const OpenGL::ProgramVariant& variant) const noexcept { return std::hash<OpenGL::BaseBindings>()(variant.base_bindings) ^ - std::hash<OpenGL::TextureBufferUsage>()(variant.texture_buffer_usage) ^ (static_cast<std::size_t>(variant.primitive_mode) << 6); } }; |