mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-11-16 05:10:35 +01:00
Blit corrections within the image initialization
This commit is contained in:
parent
f29a23738a
commit
0c7d068112
2 changed files with 14 additions and 4 deletions
|
|
@ -2091,7 +2091,7 @@ void Image::UploadMemory(VkBuffer buffer, VkDeviceSize offset,
|
||||||
temp_vk_image, info.format, info.num_samples,
|
temp_vk_image, info.format, info.num_samples,
|
||||||
{image_copies.data(), image_copies.size()}, false);
|
{image_copies.data(), image_copies.size()}, false);
|
||||||
}
|
}
|
||||||
initialized = true;
|
InitializationFor(current_image) = true;
|
||||||
runtime->ReleaseMsaaScratchImage(temp_vk_image);
|
runtime->ReleaseMsaaScratchImage(temp_vk_image);
|
||||||
|
|
||||||
if (is_rescaled) {
|
if (is_rescaled) {
|
||||||
|
|
@ -2112,7 +2112,7 @@ void Image::UploadMemory(VkBuffer buffer, VkDeviceSize offset,
|
||||||
const VkBuffer src_buffer = buffer;
|
const VkBuffer src_buffer = buffer;
|
||||||
const VkImage vk_image = *original_image;
|
const VkImage vk_image = *original_image;
|
||||||
const VkImageAspectFlags vk_aspect_mask = aspect_mask;
|
const VkImageAspectFlags vk_aspect_mask = aspect_mask;
|
||||||
const bool was_initialized = std::exchange(initialized, true);
|
const bool was_initialized = std::exchange(InitializationFor(&Image::original_image), true);
|
||||||
|
|
||||||
scheduler->Record([src_buffer, vk_image, vk_aspect_mask, was_initialized,
|
scheduler->Record([src_buffer, vk_image, vk_aspect_mask, was_initialized,
|
||||||
vk_copies](vk::CommandBuffer cmdbuf) {
|
vk_copies](vk::CommandBuffer cmdbuf) {
|
||||||
|
|
@ -2387,6 +2387,13 @@ std::vector<vk::ImageView>& Image::StorageViewsFor(vk::Image Image::*image) {
|
||||||
return storage_image_views;
|
return storage_image_views;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool& Image::InitializationFor(vk::Image Image::*image) noexcept {
|
||||||
|
if (image == &Image::scaled_image) {
|
||||||
|
return scaled_initialized;
|
||||||
|
}
|
||||||
|
return original_initialized;
|
||||||
|
}
|
||||||
|
|
||||||
VkImageView Image::StorageImageView(s32 level) noexcept {
|
VkImageView Image::StorageImageView(s32 level) noexcept {
|
||||||
const bool astc_decode = WillUseAcceleratedAstcDecode(runtime->device, info);
|
const bool astc_decode = WillUseAcceleratedAstcDecode(runtime->device, info);
|
||||||
const bool unswizzle_upload =
|
const bool unswizzle_upload =
|
||||||
|
|
|
||||||
|
|
@ -353,7 +353,7 @@ public:
|
||||||
|
|
||||||
/// Returns true when the image is already initialized and mark it as initialized
|
/// Returns true when the image is already initialized and mark it as initialized
|
||||||
[[nodiscard]] bool ExchangeInitialization() noexcept {
|
[[nodiscard]] bool ExchangeInitialization() noexcept {
|
||||||
return std::exchange(initialized, true);
|
return std::exchange(InitializationFor(current_image), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
VkImageView StorageImageView(s32 level) noexcept;
|
VkImageView StorageImageView(s32 level) noexcept;
|
||||||
|
|
@ -375,6 +375,8 @@ private:
|
||||||
|
|
||||||
std::vector<vk::ImageView>& StorageViewsFor(vk::Image Image::*image);
|
std::vector<vk::ImageView>& StorageViewsFor(vk::Image Image::*image);
|
||||||
|
|
||||||
|
bool& InitializationFor(vk::Image Image::*image) noexcept;
|
||||||
|
|
||||||
Scheduler* scheduler{};
|
Scheduler* scheduler{};
|
||||||
TextureCacheRuntime* runtime{};
|
TextureCacheRuntime* runtime{};
|
||||||
|
|
||||||
|
|
@ -394,7 +396,8 @@ private:
|
||||||
std::vector<vk::ImageView> storage_image_views;
|
std::vector<vk::ImageView> storage_image_views;
|
||||||
std::vector<vk::ImageView> scaled_storage_image_views;
|
std::vector<vk::ImageView> scaled_storage_image_views;
|
||||||
VkImageAspectFlags aspect_mask = 0;
|
VkImageAspectFlags aspect_mask = 0;
|
||||||
bool initialized = false;
|
bool original_initialized = false;
|
||||||
|
bool scaled_initialized = false;
|
||||||
|
|
||||||
std::optional<Framebuffer> scale_framebuffer;
|
std::optional<Framebuffer> scale_framebuffer;
|
||||||
std::optional<Framebuffer> normal_framebuffer;
|
std::optional<Framebuffer> normal_framebuffer;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue