diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp b/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp index 95ee510dc2..f3175d0439 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp @@ -483,6 +483,7 @@ namespace vk break; default: element_size = get_format_texel_width(fmt); + break; } vk::image* src = nullptr; diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp index 0dff66410a..c1ded3e246 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.cpp @@ -383,7 +383,7 @@ namespace vk case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT: case CELL_GCM_TEXTURE_DEPTH16: 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 }; default: break; @@ -509,8 +509,8 @@ namespace vk VMM_ALLOCATION_POOL_TEXTURE_CACHE, rsx::classify_format(gcm_format)); } - //This method is almost exclusively used to work on framebuffer resources - //Keep the original swizzle layout unless there is data format conversion + // This method is almost exclusively used to work on framebuffer resources + // Keep the original swizzle layout unless there is data format conversion VkComponentMapping view_swizzle; if (!source || dst_format != source->info.format) { @@ -831,7 +831,7 @@ namespace vk break; case rsx::texture_upload_context::dma: case rsx::texture_upload_context::framebuffer_storage: - // Should not initialized with this method + // Should not be initialized with this method default: fmt::throw_exception("Unexpected upload context 0x%x", u32(context)); } @@ -1197,7 +1197,7 @@ namespace vk auto src = vm::_ptr(address); auto dst = static_cast(mem); - //TODO: SSE optimization + // TODO: SSE optimization for (u32 row = 0; row < height; ++row) { auto casted_src = reinterpret_cast*>(src); diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 1a35a7d065..217b50ed42 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -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, 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, rsx::texture_upload_context context, const std::vector& subresource_layout, rsx::texture_dimension_extended type, bool swizzled) override; diff --git a/rpcs3/Emu/RSX/VK/vkutils/image.cpp b/rpcs3/Emu/RSX/VK/vkutils/image.cpp index 6bcccdfcaa..54cd7853ea 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/image.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/image.cpp @@ -107,8 +107,8 @@ namespace vk if (!(memory_req.memoryTypeBits & (1 << memory_type_index))) { - //Suggested memory type is incompatible with this memory type. - //Go through the bitset and test for requested props. + // Suggested memory type is incompatible with this memory type. + // Go through the bitset and test for requested props. if (!dev.get_compatible_memory_type(memory_req.memoryTypeBits, access_flags, &memory_type_index)) fmt::throw_exception("No compatible memory type was found!"); }