From 6f3a63df944b4d92418ba18bd307cf074b4375a5 Mon Sep 17 00:00:00 2001 From: scribam Date: Wed, 13 Jun 2018 18:41:28 +0200 Subject: [PATCH] fix compiler warning "-Winconsistent-missing-override" --- rpcs3/Emu/RSX/VK/VKHelpers.h | 10 +++++----- rpcs3/Emu/RSX/VK/VKOverlays.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 10dbe23bee..8619477f4b 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -247,7 +247,7 @@ namespace vk vmaUnmapMemory(m_allocator, static_cast(mem_handle)); } - VkDeviceMemory get_vk_device_memory(mem_handle_t mem_handle) + VkDeviceMemory get_vk_device_memory(mem_handle_t mem_handle) override { VmaAllocationInfo alloc_info; @@ -255,7 +255,7 @@ namespace vk return alloc_info.deviceMemory; } - u64 get_vk_device_memory_offset(mem_handle_t mem_handle) + u64 get_vk_device_memory_offset(mem_handle_t mem_handle) override { VmaAllocationInfo alloc_info; @@ -311,7 +311,7 @@ namespace vk return (VkDeviceMemory)mem_handle; } - u64 get_vk_device_memory_offset(mem_handle_t /*mem_handle*/) + u64 get_vk_device_memory_offset(mem_handle_t /*mem_handle*/) override { return 0; } @@ -1476,7 +1476,7 @@ public: swapchain_images[index].second->do_dma_transfer(cmd); } - VkImage& get_image(u32 index) + VkImage& get_image(u32 index) override { return (VkImage&)(*swapchain_images[index].second.get()); } @@ -1720,7 +1720,7 @@ public: return queuePresentKHR(vk_present_queue, &present); } - VkImage& get_image(u32 index) + VkImage& get_image(u32 index) override { return (VkImage&)swapchain_images[index]; } diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h index 5f32519be8..3c05fa3501 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.h +++ b/rpcs3/Emu/RSX/VK/VKOverlays.h @@ -677,7 +677,7 @@ namespace vk m_ubo.unmap(); } - void emit_geometry(vk::command_buffer &cmd) + void emit_geometry(vk::command_buffer &cmd) override { //Split into groups of 4 u32 first = 0;