mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

Fix ASTC formats

Browse source
This commit is contained in:
FernandoS27 2018-10-29 21:34:44 -04:00
parent 31930a3334
commit aee93f98f9
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
View file

@ -366,15 +366,18 @@ void MortonCopy(u32 stride, u32 block_height, u32 height, u32 block_depth, u32 d
// With the BCn formats (DXT and DXN), each 4x4 tile is swizzled instead of just individual // With the BCn formats (DXT and DXN), each 4x4 tile is swizzled instead of just individual
// pixel values. // pixel values.
const u32 tile_size{IsFormatBCn(format) ? 4U : 1U}; const u32 tile_size_x{SurfaceParams::GetDefaultBlockWidth(format)};
const u32 tile_size_y{SurfaceParams::GetDefaultBlockHeight(format)};
if (morton_to_gl) { if (morton_to_gl) {
const std::vector<u8> data = Tegra::Texture::UnswizzleTexture( const std::vector<u8> data =
addr, tile_size, bytes_per_pixel, stride, height, depth, block_height, block_depth); Tegra::Texture::UnswizzleTexture(addr, tile_size_x, tile_size_y, bytes_per_pixel,
stride, height, depth, block_height, block_depth);
const std::size_t size_to_copy{std::min(gl_buffer_size, data.size())}; const std::size_t size_to_copy{std::min(gl_buffer_size, data.size())};
memcpy(gl_buffer, data.data(), size_to_copy); memcpy(gl_buffer, data.data(), size_to_copy);
} else { } else {
Tegra::Texture::CopySwizzledData(stride / tile_size, height / tile_size, depth, Tegra::Texture::CopySwizzledData((stride + tile_size_x - 1) / tile_size_x,
(height + tile_size_y - 1) / tile_size_y, depth,
bytes_per_pixel, bytes_per_pixel, Memory::GetPointer(addr), bytes_per_pixel, bytes_per_pixel, Memory::GetPointer(addr),
gl_buffer, false, block_height, block_depth); gl_buffer, false, block_height, block_depth);
} }
@ -442,6 +445,8 @@ static constexpr GLConversionArray morton_to_gl_fns = {
MortonCopy<true, PixelFormat::ASTC_2D_8X8_SRGB>, MortonCopy<true, PixelFormat::ASTC_2D_8X8_SRGB>,
MortonCopy<true, PixelFormat::ASTC_2D_8X5_SRGB>, MortonCopy<true, PixelFormat::ASTC_2D_8X5_SRGB>,
MortonCopy<true, PixelFormat::ASTC_2D_5X4_SRGB>, MortonCopy<true, PixelFormat::ASTC_2D_5X4_SRGB>,
MortonCopy<true, PixelFormat::ASTC_2D_5X5>,
MortonCopy<true, PixelFormat::ASTC_2D_5X5_SRGB>,
MortonCopy<true, PixelFormat::Z32F>, MortonCopy<true, PixelFormat::Z32F>,
MortonCopy<true, PixelFormat::Z16>, MortonCopy<true, PixelFormat::Z16>,
MortonCopy<true, PixelFormat::Z24S8>, MortonCopy<true, PixelFormat::Z24S8>,
@ -510,6 +515,8 @@ static constexpr GLConversionArray gl_to_morton_fns = {
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
nullptr,
nullptr,
MortonCopy<false, PixelFormat::Z32F>, MortonCopy<false, PixelFormat::Z32F>,
MortonCopy<false, PixelFormat::Z16>, MortonCopy<false, PixelFormat::Z16>,
MortonCopy<false, PixelFormat::Z24S8>, MortonCopy<false, PixelFormat::Z24S8>,

12
src/video_core/textures/decoders.cpp
View file

@ -227,12 +227,14 @@ u32 BytesPerPixel(TextureFormat format) {
} }
} }
std::vector<u8> UnswizzleTexture(VAddr address, u32 tile_size, u32 bytes_per_pixel, u32 width, std::vector<u8> UnswizzleTexture(VAddr address, u32 tile_size_x, u32 tile_size_y,
u32 height, u32 depth, u32 block_height, u32 block_depth) { u32 bytes_per_pixel, u32 width, u32 height, u32 depth,
u32 block_height, u32 block_depth) {
std::vector<u8> unswizzled_data(width * height * depth * bytes_per_pixel); std::vector<u8> unswizzled_data(width * height * depth * bytes_per_pixel);
CopySwizzledData(width / tile_size, height / tile_size, depth, bytes_per_pixel, bytes_per_pixel, CopySwizzledData((width + tile_size_x - 1) / tile_size_x,
Memory::GetPointer(address), unswizzled_data.data(), true, block_height, (height + tile_size_y - 1) / tile_size_y, depth, bytes_per_pixel,
block_depth); bytes_per_pixel, Memory::GetPointer(address), unswizzled_data.data(), true,
block_height, block_depth);
return unswizzled_data; return unswizzled_data;
} }

4
src/video_core/textures/decoders.h
View file

@ -19,8 +19,8 @@ inline std::size_t GetGOBSize() {
/** /**
* Unswizzles a swizzled texture without changing its format. * Unswizzles a swizzled texture without changing its format.
*/ */
std::vector<u8> UnswizzleTexture(VAddr address, u32 tile_size, u32 bytes_per_pixel, u32 width, std::vector<u8> UnswizzleTexture(VAddr address, u32 tile_size_x, u32 tile_size_y,
u32 height, u32 depth, u32 bytes_per_pixel, u32 width, u32 height, u32 depth,
u32 block_height = TICEntry::DefaultBlockHeight, u32 block_height = TICEntry::DefaultBlockHeight,
u32 block_depth = TICEntry::DefaultBlockHeight); u32 block_depth = TICEntry::DefaultBlockHeight);

2
src/yuzu/debugger/graphics/graphics_surface.cpp
View file

@ -387,7 +387,7 @@ void GraphicsSurfaceWidget::OnUpdate() {
// TODO(bunnei): Will not work with BCn formats that swizzle 4x4 tiles. // TODO(bunnei): Will not work with BCn formats that swizzle 4x4 tiles.
// Needs to be fixed if we plan to use this feature more, otherwise we may remove it. // Needs to be fixed if we plan to use this feature more, otherwise we may remove it.
auto unswizzled_data = auto unswizzled_data =
Tegra::Texture::UnswizzleTexture(*address, 1, Tegra::Texture::BytesPerPixel(surface_format), Tegra::Texture::UnswizzleTexture(*address, 1, 1, Tegra::Texture::BytesPerPixel(surface_format),
surface_width, surface_height, 1U); surface_width, surface_height, 1U);
auto texture_data = Tegra::Texture::DecodeTexture(unswizzled_data, surface_format, auto texture_data = Tegra::Texture::DecodeTexture(unswizzled_data, surface_format,