archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

vulkan: Remove redundant texture::create/init overloads

Browse source
This commit is contained in:
Vincent Lejeune 2016-03-15 18:33:58 +01:00
parent 63ad2cce72
commit 3b3fffa962
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -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, 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, 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 = 1, bool gpu_only = false, VkComponentMapping swizzle = default_component_map());
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 destroy(); void destroy();
void init(rsx::texture &tex, vk::command_buffer &cmd, bool ignore_checks); void init(rsx::texture &tex, vk::command_buffer &cmd, bool ignore_checks = false);
void init(rsx::texture &tex, vk::command_buffer &cmd);
void flush(vk::command_buffer & cmd); void flush(vk::command_buffer & cmd);
//Fill with debug color 0xFF //Fill with debug color 0xFF

15
rpcs3/Emu/RSX/VK/VKTexture.cpp
View file

@ -268,16 +268,6 @@ namespace vk
create(device, format, usage, tiling, width, height, mipmaps, gpu_only, swizzle); 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) VkSamplerAddressMode texture::vk_wrap_mode(u32 gcm_wrap)
{ {
switch (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) void texture::flush(vk::command_buffer &cmd)
{ {
if (!ready) if (!ready)