camerin
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Potential fix for PR 321

This commit is contained in:
MaranBr 2025-09-08 09:07:14 -04:00 committed by crueter
parent 13ecc1e481
commit 428915fd88
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Test_patch_for_potential_321_fix.patch Normal file
View File

@ -0,0 +1,34 @@
Subject: [PATCH] Test patch for potential 321 fix
---
Index: src/video_core/renderer_vulkan/vk_texture_cache.cpp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp (revision 428249cb01f60668a1842d184e95fb68b68970c1)
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp (date 1756628527793)
@@ -2165,20 +2165,9 @@
storage_views = std::make_unique<StorageViews>();
}
- // Storage images MUST use identity component mapping.
- // Typeless: use the underlying image's native format.
- if (image_format == Shader::ImageFormat::Typeless) {
- auto& view = storage_views->unsigneds[static_cast<size_t>(texture_type)];
- if (view) {
- return *view;
- }
- const auto fmt_info =
- MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, /*is_image=*/true, format);
- const VkFormat vk_format = fmt_info.format;
- // Storage images are color-aspect only
- view = MakeView(vk_format, VK_IMAGE_ASPECT_COLOR_BIT); // identity components inside
- return *view;
- }
+ // For typeless, reuse the sampling view to preserve game expectations(just to test if it fixes the issue)
+ if (image_format == Shader::ImageFormat::Typeless)
+ return Handle(texture_type);
const bool is_signed = (image_format == Shader::ImageFormat::R8_SINT ||image_format == Shader::ImageFormat::R16_SINT);
auto& views = is_signed ? storage_views->signeds : storage_views->unsigneds;
auto& view = views[static_cast<size_t>(texture_type)];

17
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@ -2165,20 +2165,9 @@ VkImageView ImageView::StorageView(Shader::TextureType texture_type,
storage_views = std::make_unique<StorageViews>();
}
// Storage images MUST use identity component mapping.
// Typeless: use the underlying image's native format.
if (image_format == Shader::ImageFormat::Typeless) {
auto& view = storage_views->unsigneds[static_cast<size_t>(texture_type)];
if (view) {
return *view;
}
const auto fmt_info =
MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, /*is_image=*/true, format);
const VkFormat vk_format = fmt_info.format;
// Storage images are color-aspect only
view = MakeView(vk_format, VK_IMAGE_ASPECT_COLOR_BIT); // identity components inside
return *view;
}
// For typeless, reuse the sampling view to preserve game expectations(just to test if it fixes the issue)
if (image_format == Shader::ImageFormat::Typeless)
return Handle(texture_type);
const bool is_signed = (image_format == Shader::ImageFormat::R8_SINT ||image_format == Shader::ImageFormat::R16_SINT);
auto& views = is_signed ? storage_views->signeds : storage_views->unsigneds;
auto& view = views[static_cast<size_t>(texture_type)];