mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-14 06:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting fixes

Browse Source 
- Non-functional stuff, move along
This commit is contained in:
kd-11 2021-07-14 20:16:57 +03:00 committed by kd-11
parent 2524c35638
commit 369f1132f3
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
View File

@ -483,6 +483,7 @@ namespace vk
break; break;
default: default:
element_size = get_format_texel_width(fmt); element_size = get_format_texel_width(fmt);
break;
} }
vk::image* src = nullptr; vk::image* src = nullptr;

10
rpcs3/Emu/RSX/VK/VKTextureCache.cpp
View File

@ -383,7 +383,7 @@ namespace vk
case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT: case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
case CELL_GCM_TEXTURE_DEPTH16: case CELL_GCM_TEXTURE_DEPTH16:
case CELL_GCM_TEXTURE_DEPTH16_FLOAT: case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
//Dont bother letting this propagate // Dont bother letting this propagate
return{ VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R }; return{ VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R };
default: default:
break; break;
@ -509,8 +509,8 @@ namespace vk
VMM_ALLOCATION_POOL_TEXTURE_CACHE, rsx::classify_format(gcm_format)); VMM_ALLOCATION_POOL_TEXTURE_CACHE, rsx::classify_format(gcm_format));
} }
//This method is almost exclusively used to work on framebuffer resources // This method is almost exclusively used to work on framebuffer resources
//Keep the original swizzle layout unless there is data format conversion // Keep the original swizzle layout unless there is data format conversion
VkComponentMapping view_swizzle; VkComponentMapping view_swizzle;
if (!source || dst_format != source->info.format) if (!source || dst_format != source->info.format)
{ {
@ -831,7 +831,7 @@ namespace vk
break; break;
case rsx::texture_upload_context::dma: case rsx::texture_upload_context::dma:
case rsx::texture_upload_context::framebuffer_storage: case rsx::texture_upload_context::framebuffer_storage:
// Should not initialized with this method // Should not be initialized with this method
default: default:
fmt::throw_exception("Unexpected upload context 0x%x", u32(context)); fmt::throw_exception("Unexpected upload context 0x%x", u32(context));
} }
@ -1197,7 +1197,7 @@ namespace vk
auto src = vm::_ptr<const char>(address); auto src = vm::_ptr<const char>(address);
auto dst = static_cast<char*>(mem); auto dst = static_cast<char*>(mem);
//TODO: SSE optimization // TODO: SSE optimization
for (u32 row = 0; row < height; ++row) for (u32 row = 0; row < height; ++row)
{ {
auto casted_src = reinterpret_cast<const be_t<u32>*>(src); auto casted_src = reinterpret_cast<const be_t<u32>*>(src);

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

@ -471,7 +471,7 @@ namespace vk
cached_texture_section* create_new_texture(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, cached_texture_section* create_new_texture(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch,
u32 gcm_format, rsx::texture_upload_context context, rsx::texture_dimension_extended type, bool swizzled, rsx::component_order swizzle_flags, rsx::flags32_t flags) override; u32 gcm_format, rsx::texture_upload_context context, rsx::texture_dimension_extended type, bool swizzled, rsx::component_order swizzle_flags, rsx::flags32_t flags) override;
cached_texture_section* create_nul_section(vk::command_buffer& /*cmd*/, const utils::address_range& rsx_range, bool memory_load) override; cached_texture_section* create_nul_section(vk::command_buffer& cmd, const utils::address_range& rsx_range, bool memory_load) override;
cached_texture_section* upload_image_from_cpu(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format, cached_texture_section* upload_image_from_cpu(vk::command_buffer& cmd, const utils::address_range& rsx_range, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, u32 gcm_format,
rsx::texture_upload_context context, const std::vector<rsx::subresource_layout>& subresource_layout, rsx::texture_dimension_extended type, bool swizzled) override; rsx::texture_upload_context context, const std::vector<rsx::subresource_layout>& subresource_layout, rsx::texture_dimension_extended type, bool swizzled) override;

4
rpcs3/Emu/RSX/VK/vkutils/image.cpp
View File

@ -107,8 +107,8 @@ namespace vk
if (!(memory_req.memoryTypeBits & (1 << memory_type_index))) if (!(memory_req.memoryTypeBits & (1 << memory_type_index)))
{ {
//Suggested memory type is incompatible with this memory type. // Suggested memory type is incompatible with this memory type.
//Go through the bitset and test for requested props. // Go through the bitset and test for requested props.
if (!dev.get_compatible_memory_type(memory_req.memoryTypeBits, access_flags, &memory_type_index)) if (!dev.get_compatible_memory_type(memory_req.memoryTypeBits, access_flags, &memory_type_index))
fmt::throw_exception("No compatible memory type was found!"); fmt::throw_exception("No compatible memory type was found!");
} }