Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Virtual destructors for base types #5094

Merged
merged 2 commits into from
Sep 7, 2018
Merged

Virtual destructors for base types #5094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78b2c5b
virtual desctructors for base types
kvark Sep 7, 2018
32ad48a
Merge branch 'master' into virtual-desc
Nekotekina Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions rpcs3/Emu/RSX/Common/TextureUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ namespace rsx
f32 scale_x = 1.f;
f32 scale_y = 1.f;

virtual ~sampled_image_descriptor_base() {}
virtual u32 encoded_component_map() const = 0;
};
}
Expand Down
1 change: 1 addition & 0 deletions rpcs3/Emu/RSX/GSRender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class GSFrameBase
public:
GSFrameBase() = default;
GSFrameBase(const GSFrameBase&) = delete;
virtual ~GSFrameBase() {}

virtual void close() = 0;
virtual bool shown() = 0;
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/Emu/RSX/VK/VKHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ namespace vk
public:
using mem_handle_t = void *;

mem_allocator_base(VkDevice dev, VkPhysicalDevice /*pdev*/) : m_device(dev) {};
~mem_allocator_base() {};
mem_allocator_base(VkDevice dev, VkPhysicalDevice /*pdev*/) : m_device(dev) {}
virtual ~mem_allocator_base() {}

virtual void destroy() = 0;

Expand Down Expand Up @@ -1396,7 +1396,7 @@ namespace vk
m_surface_format = format;
}

~swapchain_base(){}
virtual ~swapchain_base() {}

virtual void create(display_handle_t& handle) = 0;
virtual void destroy(bool full = true) = 0;
Expand Down