diff options
| author | bunnei <bunneidev@gmail.com> | 2019-07-10 22:25:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-10 22:25:43 +0200 |
| commit | 206ec29f17d693a86295f2a97191f0434b8e1d11 (patch) | |
| tree | 44b5771c928480fd29a2dd506ea1bbb16ce74ca6 /src/video_core | |
| parent | Merge pull request #2706 from DarkLordZach/azure-1 (diff) | |
| parent | vk_sampler_cache: Remove unused includes (diff) | |
| download | yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.tar yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.tar.gz yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.tar.bz2 yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.tar.lz yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.tar.xz yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.tar.zst yuzu-206ec29f17d693a86295f2a97191f0434b8e1d11.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_sampler_cache.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_sampler_cache.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/video_core/renderer_opengl/gl_sampler_cache.h b/src/video_core/renderer_opengl/gl_sampler_cache.h index defbc2d81..34ee37f00 100644 --- a/src/video_core/renderer_opengl/gl_sampler_cache.h +++ b/src/video_core/renderer_opengl/gl_sampler_cache.h @@ -17,9 +17,9 @@ public: ~SamplerCacheOpenGL(); protected: - OGLSampler CreateSampler(const Tegra::Texture::TSCEntry& tsc) const; + OGLSampler CreateSampler(const Tegra::Texture::TSCEntry& tsc) const override; - GLuint ToSamplerType(const OGLSampler& sampler) const; + GLuint ToSamplerType(const OGLSampler& sampler) const override; }; } // namespace OpenGL diff --git a/src/video_core/renderer_vulkan/vk_sampler_cache.h b/src/video_core/renderer_vulkan/vk_sampler_cache.h index 771b05c73..1f73b716b 100644 --- a/src/video_core/renderer_vulkan/vk_sampler_cache.h +++ b/src/video_core/renderer_vulkan/vk_sampler_cache.h @@ -4,9 +4,6 @@ #pragma once -#include <unordered_map> - -#include "common/common_types.h" #include "video_core/renderer_vulkan/declarations.h" #include "video_core/sampler_cache.h" #include "video_core/textures/texture.h" @@ -21,9 +18,9 @@ public: ~VKSamplerCache(); protected: - UniqueSampler CreateSampler(const Tegra::Texture::TSCEntry& tsc) const; + UniqueSampler CreateSampler(const Tegra::Texture::TSCEntry& tsc) const override; - vk::Sampler ToSamplerType(const UniqueSampler& sampler) const; + vk::Sampler ToSamplerType(const UniqueSampler& sampler) const override; private: const VKDevice& device; |