Browse Source
Merge pull request #2691 from lioncash/override
video_core: Add missing override specifiers
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
7 deletions
-
src/video_core/renderer_opengl/gl_sampler_cache.h
-
src/video_core/renderer_vulkan/vk_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 |
|
|
|
@ -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; |
|
|
|
|