RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 12:42:41 +01:00
Code Issues Releases Wiki Activity

fix compiler warning "-Winconsistent-missing-override"

Browse Source
This commit is contained in:
scribam 2018-06-13 18:41:28 +02:00
parent 968f3995ff
commit 6f3a63df94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/RSX/VK/VKHelpers.h
View File

@ -247,7 +247,7 @@ namespace vk
vmaUnmapMemory(m_allocator, static_cast<VmaAllocation>(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];
}

2
rpcs3/Emu/RSX/VK/VKOverlays.h
View File

@ -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;