diff options
| author | 2019-03-28 17:54:51 -0400 | |
|---|---|---|
| committer | 2019-03-28 17:54:51 -0400 | |
| commit | 76f024865d2788d975bda82464ed9f90e655b9c5 (patch) | |
| tree | 2659fd0ffbca59991b32291f7efa063011854e27 | |
| parent | Merge pull request #2295 from lioncash/typo (diff) | |
| parent | video_core: Add missing override specifiers (diff) | |
| download | yuzu-76f024865d2788d975bda82464ed9f90e655b9c5.tar.gz yuzu-76f024865d2788d975bda82464ed9f90e655b9c5.tar.xz yuzu-76f024865d2788d975bda82464ed9f90e655b9c5.zip | |
Merge pull request #2296 from lioncash/override
video_core: Add missing override specifiers
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_resource_manager.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_resource_manager.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index c644271d0..e8073579f 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h | |||
| @@ -538,12 +538,12 @@ private: | |||
| 538 | return nullptr; | 538 | return nullptr; |
| 539 | } | 539 | } |
| 540 | 540 | ||
| 541 | void Register(const Surface& object) { | 541 | void Register(const Surface& object) override { |
| 542 | RasterizerCache<Surface>::Register(object); | 542 | RasterizerCache<Surface>::Register(object); |
| 543 | } | 543 | } |
| 544 | 544 | ||
| 545 | /// Unregisters an object from the cache | 545 | /// Unregisters an object from the cache |
| 546 | void Unregister(const Surface& object) { | 546 | void Unregister(const Surface& object) override { |
| 547 | if (object->IsReinterpreted()) { | 547 | if (object->IsReinterpreted()) { |
| 548 | auto interval = GetReinterpretInterval(object); | 548 | auto interval = GetReinterpretInterval(object); |
| 549 | reinterpreted_surfaces.erase(interval); | 549 | reinterpreted_surfaces.erase(interval); |
diff --git a/src/video_core/renderer_vulkan/vk_resource_manager.cpp b/src/video_core/renderer_vulkan/vk_resource_manager.cpp index a1e117443..13c46e5b8 100644 --- a/src/video_core/renderer_vulkan/vk_resource_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_resource_manager.cpp | |||
| @@ -21,7 +21,7 @@ public: | |||
| 21 | CommandBufferPool(const VKDevice& device) | 21 | CommandBufferPool(const VKDevice& device) |
| 22 | : VKFencedPool(COMMAND_BUFFER_POOL_SIZE), device{device} {} | 22 | : VKFencedPool(COMMAND_BUFFER_POOL_SIZE), device{device} {} |
| 23 | 23 | ||
| 24 | void Allocate(std::size_t begin, std::size_t end) { | 24 | void Allocate(std::size_t begin, std::size_t end) override { |
| 25 | const auto dev = device.GetLogical(); | 25 | const auto dev = device.GetLogical(); |
| 26 | const auto& dld = device.GetDispatchLoader(); | 26 | const auto& dld = device.GetDispatchLoader(); |
| 27 | const u32 graphics_family = device.GetGraphicsFamily(); | 27 | const u32 graphics_family = device.GetGraphicsFamily(); |
diff --git a/src/video_core/renderer_vulkan/vk_resource_manager.h b/src/video_core/renderer_vulkan/vk_resource_manager.h index 5bfe4cead..08ee86fa6 100644 --- a/src/video_core/renderer_vulkan/vk_resource_manager.h +++ b/src/video_core/renderer_vulkan/vk_resource_manager.h | |||
| @@ -97,7 +97,7 @@ private: | |||
| 97 | class VKFenceWatch final : public VKResource { | 97 | class VKFenceWatch final : public VKResource { |
| 98 | public: | 98 | public: |
| 99 | explicit VKFenceWatch(); | 99 | explicit VKFenceWatch(); |
| 100 | ~VKFenceWatch(); | 100 | ~VKFenceWatch() override; |
| 101 | 101 | ||
| 102 | /// Waits for the fence to be released. | 102 | /// Waits for the fence to be released. |
| 103 | void Wait(); | 103 | void Wait(); |