eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

[TEST] Format swap

lsfg-android
CamilleLaVey 4 weeks ago
parent
8cc658e5be
commit
dbb48c4e4e
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/video_core/host_shaders/astc_decoder.comp
  2. 10
      src/video_core/renderer_vulkan/vk_texture_cache.cpp

2
src/video_core/host_shaders/astc_decoder.comp
View File

@ -45,7 +45,7 @@ layout(binding = BINDING_INPUT_BUFFER, std430) readonly restrict buffer InputBuf
}; };
#ifdef VULKAN #ifdef VULKAN
layout(binding = BINDING_OUTPUT_IMAGE, rgba16f) uniform writeonly restrict image2DArray dest_image;
layout(binding = BINDING_OUTPUT_IMAGE, rgba32f) uniform writeonly restrict image2DArray dest_image;
#else #else
layout(binding = BINDING_OUTPUT_IMAGE, rgba8) uniform writeonly restrict image2DArray dest_image; layout(binding = BINDING_OUTPUT_IMAGE, rgba8) uniform writeonly restrict image2DArray dest_image;
#endif #endif

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

@ -1590,7 +1590,7 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
? std::span<const VkFormat>{} ? std::span<const VkFormat>{}
: runtime->ViewFormats(info.format), : runtime->ViewFormats(info.format),
WillUseAcceleratedAstcDecode(runtime_.device, info) WillUseAcceleratedAstcDecode(runtime_.device, info)
? std::make_optional(VK_FORMAT_R16G16B16A16_SFLOAT)
? std::make_optional(VK_FORMAT_R32G32B32A32_SFLOAT)
: std::nullopt)), : std::nullopt)),
aspect_mask(ImageAspectMask(info.format)) { aspect_mask(ImageAspectMask(info.format)) {
if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) { if (IsPixelFormatASTC(info.format) && !runtime->device.IsOptimalAstcSupported()) {
@ -1623,7 +1623,7 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
Settings::AstcRecompression::Uncompressed) { Settings::AstcRecompression::Uncompressed) {
const auto& device = runtime->device.GetLogical(); const auto& device = runtime->device.GetLogical();
const VkFormat storage_format = WillUseAcceleratedAstcDecode(runtime->device, info) const VkFormat storage_format = WillUseAcceleratedAstcDecode(runtime->device, info)
? VK_FORMAT_R16G16B16A16_SFLOAT
? VK_FORMAT_R32G32B32A32_SFLOAT
: VK_FORMAT_A8B8G8R8_UNORM_PACK32; : VK_FORMAT_A8B8G8R8_UNORM_PACK32;
for (s32 level = 0; level < info.resources.levels; ++level) { for (s32 level = 0; level < info.resources.levels; ++level) {
storage_image_views[level] = storage_image_views[level] =
@ -1979,7 +1979,7 @@ VkImageView Image::StorageImageView(s32 level) noexcept {
auto format_info = auto format_info =
MaxwellToVK::SurfaceFormat(runtime->device, FormatType::Optimal, true, info.format); MaxwellToVK::SurfaceFormat(runtime->device, FormatType::Optimal, true, info.format);
if (WillUseAcceleratedAstcDecode(runtime->device, info)) { if (WillUseAcceleratedAstcDecode(runtime->device, info)) {
format_info.format = VK_FORMAT_R16G16B16A16_SFLOAT;
format_info.format = VK_FORMAT_R32G32B32A32_SFLOAT;
} }
view = MakeStorageView(runtime->device.GetLogical(), level, *(this->*current_image), view = MakeStorageView(runtime->device.GetLogical(), level, *(this->*current_image),
format_info.format); format_info.format);
@ -2150,7 +2150,7 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI
uses_accelerated_astc_decode = WillUseAcceleratedAstcDecode(*device, image.info); uses_accelerated_astc_decode = WillUseAcceleratedAstcDecode(*device, image.info);
auto format_info = MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, true, format); auto format_info = MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, true, format);
if (uses_accelerated_astc_decode) { if (uses_accelerated_astc_decode) {
format_info.format = VK_FORMAT_R16G16B16A16_SFLOAT;
format_info.format = VK_FORMAT_R32G32B32A32_SFLOAT;
} }
const VkImageUsageFlags requested_view_usage = ImageUsageFlags(format_info, format); const VkImageUsageFlags requested_view_usage = ImageUsageFlags(format_info, format);
const VkImageUsageFlags image_usage = image.UsageFlags(); const VkImageUsageFlags image_usage = image.UsageFlags();
@ -2288,7 +2288,7 @@ VkImageView ImageView::StorageView(Shader::TextureType texture_type,
if (!typeless_storage_view) { if (!typeless_storage_view) {
auto info = MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, true, format); auto info = MaxwellToVK::SurfaceFormat(*device, FormatType::Optimal, true, format);
if (uses_accelerated_astc_decode) { if (uses_accelerated_astc_decode) {
info.format = VK_FORMAT_R16G16B16A16_SFLOAT;
info.format = VK_FORMAT_R32G32B32A32_SFLOAT;
} }
typeless_storage_view = MakeView(info.format, VK_IMAGE_ASPECT_COLOR_BIT); typeless_storage_view = MakeView(info.format, VK_IMAGE_ASPECT_COLOR_BIT);
} }

Write Preview
Loading…
Cancel
Save