From 3b3fffa9624aa2ffd9cbefb67bdba3ec5ed62309 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Tue, 15 Mar 2016 18:33:58 +0100 Subject: [PATCH] vulkan: Remove redundant texture::create/init overloads --- rpcs3/Emu/RSX/VK/VKHelpers.h | 7 ++----- rpcs3/Emu/RSX/VK/VKTexture.cpp | 15 --------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index b0afb0051e..2629d7eb2c 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -368,13 +368,10 @@ namespace vk void create(vk::render_device &device, VkFormat format, VkImageType image_type, VkImageViewType view_type, VkImageCreateFlags image_flags, VkImageUsageFlags usage, VkImageTiling tiling, u32 width, u32 height, u32 mipmaps, bool gpu_only, VkComponentMapping swizzle); void create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, VkImageTiling tiling, u32 width, u32 height, u32 mipmaps, bool gpu_only, VkComponentMapping swizzle); - void create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, u32 width, u32 height, u32 mipmaps, bool gpu_only, VkComponentMapping swizzle); - void create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, u32 width, u32 height, u32 mipmaps, bool gpu_only); - void create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, u32 width, u32 height); + void create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, u32 width, u32 height, u32 mipmaps = 1, bool gpu_only = false, VkComponentMapping swizzle = default_component_map()); void destroy(); - void init(rsx::texture &tex, vk::command_buffer &cmd, bool ignore_checks); - void init(rsx::texture &tex, vk::command_buffer &cmd); + void init(rsx::texture &tex, vk::command_buffer &cmd, bool ignore_checks = false); void flush(vk::command_buffer & cmd); //Fill with debug color 0xFF diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp index c51dcdf551..7a919a18e5 100644 --- a/rpcs3/Emu/RSX/VK/VKTexture.cpp +++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp @@ -268,16 +268,6 @@ namespace vk create(device, format, usage, tiling, width, height, mipmaps, gpu_only, swizzle); } - void texture::create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, u32 width, u32 height, u32 mipmaps, bool gpu_only) - { - create(device, format, usage, width, height, mipmaps, gpu_only, default_component_map()); - } - - void texture::create(vk::render_device &device, VkFormat format, VkImageUsageFlags usage, u32 width, u32 height) - { - create(device, format, usage, width, height, 1, false); - } - VkSamplerAddressMode texture::vk_wrap_mode(u32 gcm_wrap) { switch (gcm_wrap) @@ -489,11 +479,6 @@ namespace vk } } - void texture::init(rsx::texture &tex, vk::command_buffer &cmd) - { - init(tex, cmd, false); - } - void texture::flush(vk::command_buffer &cmd) { if (!ready)