octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rasterizer_cache: Add morton conversion for D24 <-> D32 (#19)

Browse Source
This commit is contained in:
Steveice10
2023-01-12 03:33:12 -08:00
committed by GitHub
parent a3a8964d46
commit 8fcc3d2121
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/video_core/rasterizer_cache/morton_swizzle.h
View File

@@ -63,6 +63,9 @@ constexpr void DecodePixel(const std::byte* source, std::byte* dest) {
const u8 ia4 = static_cast<const u8>(source[0]); const u8 ia4 = static_cast<const u8>(source[0]);
std::memset(dest, Common::Color::Convert4To8(ia4 >> 4), 3); std::memset(dest, Common::Color::Convert4To8(ia4 >> 4), 3);
dest[3] = std::byte{Common::Color::Convert4To8(ia4 & 0xF)}; dest[3] = std::byte{Common::Color::Convert4To8(ia4 & 0xF)};
} else if constexpr (format == PixelFormat::D24 && converted) {
const auto d32 = Common::Color::DecodeD24(reinterpret_cast<const u8*>(source)) / 16777215.f;
std::memcpy(dest, &d32, sizeof(d32));
} else { } else {
std::memcpy(dest, source, bytes_per_pixel); std::memcpy(dest, source, bytes_per_pixel);
} }
@@ -140,6 +143,10 @@ constexpr void EncodePixel(const std::byte* source, std::byte* dest) {
Common::Vec4<u8> rgba; Common::Vec4<u8> rgba;
std::memcpy(rgba.AsArray(), source, 4); std::memcpy(rgba.AsArray(), source, 4);
Common::Color::EncodeRGBA4(rgba, reinterpret_cast<u8*>(dest)); Common::Color::EncodeRGBA4(rgba, reinterpret_cast<u8*>(dest));
} else if constexpr (format == PixelFormat::D24 && converted) {
float d32;
std::memcpy(&d32, source, sizeof(d32));
Common::Color::EncodeD24(d32 * 0xFFFFFF, reinterpret_cast<u8*>(dest));
} else { } else {
std::memcpy(dest, source, bytes_per_pixel); std::memcpy(dest, source, bytes_per_pixel);
} }
@@ -299,7 +306,20 @@ static constexpr std::array<MortonFunc, 18> UNSWIZZLE_TABLE_CONVERTED = {
MortonCopy<true, PixelFormat::RGB8, true>, // 1 MortonCopy<true, PixelFormat::RGB8, true>, // 1
MortonCopy<true, PixelFormat::RGB5A1, true>, // 2 MortonCopy<true, PixelFormat::RGB5A1, true>, // 2
MortonCopy<true, PixelFormat::RGB565, true>, // 3 MortonCopy<true, PixelFormat::RGB565, true>, // 3
MortonCopy<true, PixelFormat::RGBA4, true> // 4 MortonCopy<true, PixelFormat::RGBA4, true>, // 4
nullptr, // 5
nullptr, // 6
nullptr, // 7
nullptr, // 8
nullptr, // 9
nullptr, // 10
nullptr, // 11
nullptr, // 12
nullptr, // 13
nullptr, // 14
nullptr, // 15
MortonCopy<true, PixelFormat::D24, true>, // 16
nullptr, // 17
}; };
static constexpr std::array<MortonFunc, 18> SWIZZLE_TABLE = { static constexpr std::array<MortonFunc, 18> SWIZZLE_TABLE = {

3
src/video_core/renderer_vulkan/vk_instance.cpp
View File

@@ -295,8 +295,7 @@ vk::ImageAspectFlags MakeAspect(VideoCore::SurfaceType type) {
} }
FormatTraits Instance::DetermineTraits(VideoCore::PixelFormat pixel_format, vk::Format format) { FormatTraits Instance::DetermineTraits(VideoCore::PixelFormat pixel_format, vk::Format format) {
const vk::ImageAspectFlags format_aspect = const vk::ImageAspectFlags format_aspect = MakeAspect(VideoCore::GetFormatType(pixel_format));
MakeAspect(VideoCore::GetFormatType(pixel_format));
const vk::FormatProperties format_properties = physical_device.getFormatProperties(format); const vk::FormatProperties format_properties = physical_device.getFormatProperties(format);
const vk::FormatFeatureFlagBits attachment_usage = const vk::FormatFeatureFlagBits attachment_usage =