mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2024-11-23 21:13:34 +00:00
Merge pull request #2691 from lioncash/override
video_core: Add missing override specifiers
This commit is contained in:
commit
206ec29f17
2 changed files with 4 additions and 7 deletions
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue