CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2691 from lioncash/override 

video_core: Add missing override specifiers
master
bunnei 2019-07-10 16:25:43 +07:00 committed by GitHub
parent 55245b6183 cbdd6cd1c0
commit 206ec29f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/renderer_opengl/gl_sampler_cache.h
Unescape Escape View File

@ -17,9 +17,9 @@ public:
~SamplerCacheOpenGL(); ~SamplerCacheOpenGL();
protected: 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 } // namespace OpenGL

7
src/video_core/renderer_vulkan/vk_sampler_cache.h
Unescape Escape View File

@ -4,9 +4,6 @@
#pragma once #pragma once
#include <unordered_map>
#include "common/common_types.h"
#include "video_core/renderer_vulkan/declarations.h" #include "video_core/renderer_vulkan/declarations.h"
#include "video_core/sampler_cache.h" #include "video_core/sampler_cache.h"
#include "video_core/textures/texture.h" #include "video_core/textures/texture.h"
@ -21,9 +18,9 @@ public:
~VKSamplerCache(); ~VKSamplerCache();
protected: 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: private:
const VKDevice& device; const VKDevice& device;