diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp index f5a2ec761..822a2e745 100644 --- a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp @@ -20,24 +20,43 @@ #include "video_core/debug_utils/debug_utils.h" #include "video_core/pica.h" #include "video_core/pica_state.h" +#include "video_core/texture/codec.h" +#include "video_core/texture/formats.h" namespace { -QImage LoadTexture(const u8* src, const Pica::DebugUtils::TextureInfo& info) { +QImage LoadTexture(const u8* src, const Pica::Texture::Info& info) { + auto format = Pica::Texture::Format::FromTextureFormat(info.format); + auto tmp = Pica::Texture::CodecFactory::build( + // clang-format off + format, const_cast(src), info.width, info.height + // clang-format on + ); + Pica::Texture::Codec* codec = tmp.get(); + codec->configTiling(true, 8); // change 8 for 32 in case the image is tiled + // on blocks of 32x32 + codec->configRGBATransform(true); + codec->validate(); + std::unique_ptr texture; + if (!codec->invalid()) { + codec->decode(); + texture = codec->transferInternalBuffer(); + } QImage decoded_image(info.width, info.height, QImage::Format_ARGB32); + u8* tex_ptr = texture.get(); for (int y = 0; y < info.height; ++y) { for (int x = 0; x < info.width; ++x) { - Math::Vec4 color = Pica::DebugUtils::LookupTexture(src, x, y, info, true); - decoded_image.setPixel(x, y, qRgba(color.r(), color.g(), color.b(), color.a())); + u32 texel; + std::memcpy(&texel, &tex_ptr[(x + y * info.width) * 4], 4); + texel = (texel >> 8) | (texel << 24); + decoded_image.setPixel(x, y, texel); } } - return decoded_image; } class TextureInfoWidget : public QWidget { public: - TextureInfoWidget(const u8* src, const Pica::DebugUtils::TextureInfo& info, - QWidget* parent = nullptr) + TextureInfoWidget(const u8* src, const Pica::Texture::Info& info, QWidget* parent = nullptr) : QWidget(parent) { QLabel* image_widget = new QLabel; QPixmap image_pixmap = QPixmap::fromImage(LoadTexture(src, info)); @@ -160,7 +179,7 @@ void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) { const auto config = texture.config; const auto format = texture.format; - const auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(config, format); + const auto info = Pica::Texture::Info::FromPicaRegister(config, format); const u8* src = Memory::GetPhysicalPointer(config.GetPhysicalAddress()); new_info_widget = new TextureInfoWidget(src, info); } diff --git a/src/citra_qt/debugger/graphics/graphics_surface.cpp b/src/citra_qt/debugger/graphics/graphics_surface.cpp index 4efd95d3c..60c2c900c 100644 --- a/src/citra_qt/debugger/graphics/graphics_surface.cpp +++ b/src/citra_qt/debugger/graphics/graphics_surface.cpp @@ -18,6 +18,8 @@ #include "core/memory.h" #include "video_core/pica.h" #include "video_core/pica_state.h" +#include "video_core/texture/codec.h" +#include "video_core/texture/formats.h" #include "video_core/utils.h" SurfacePicture::SurfacePicture(QWidget* parent, GraphicsSurfaceWidget* surface_widget_) @@ -512,7 +514,7 @@ void GraphicsSurfaceWidget::OnUpdate() { } const auto texture = Pica::g_state.regs.GetTextures()[texture_index]; - auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(texture.config, texture.format); + auto info = Pica::Texture::Info::FromPicaRegister(texture.config, texture.format); surface_address = info.physical_address; surface_width = info.width; @@ -570,70 +572,38 @@ void GraphicsSurfaceWidget::OnUpdate() { unsigned nibbles_per_pixel = GraphicsSurfaceWidget::NibblesPerPixel(surface_format); unsigned stride = nibbles_per_pixel * surface_width / 2; - // We handle depth formats here because DebugUtils only supports TextureFormats - if (surface_format <= Format::MaxTextureFormat) { + // Generate a virtual texture + Pica::Texture::Info info; + info.physical_address = surface_address; + info.width = surface_width; + info.height = surface_height; + info.format = static_cast(surface_format); + info.stride = stride; - // Generate a virtual texture - Pica::DebugUtils::TextureInfo info; - info.physical_address = surface_address; - info.width = surface_width; - info.height = surface_height; - info.format = static_cast(surface_format); - info.stride = stride; + auto format = Pica::Texture::Format::FromTextureFormat(info.format); + auto tmp = Pica::Texture::CodecFactory::build( + // clang-format off + format, buffer, info.width, info.height + // clang-format on + ); + Pica::Texture::Codec* codec = tmp.get(); + codec->configTiling(true, 8); // change 8 for 32 in case the image is tiled + // on blocks of 32x32 + codec->configRGBATransform(true); + codec->validate(); + std::unique_ptr texture; + if (!codec->invalid()) { + codec->decode(); + texture = codec->transferInternalBuffer(); + } - for (unsigned int y = 0; y < surface_height; ++y) { - for (unsigned int x = 0; x < surface_width; ++x) { - Math::Vec4 color = Pica::DebugUtils::LookupTexture(buffer, x, y, info, true); - decoded_image.setPixel(x, y, qRgba(color.r(), color.g(), color.b(), color.a())); - } - } - - } else { - - ASSERT_MSG(nibbles_per_pixel >= 2, - "Depth decoder only supports formats with at least one byte per pixel"); - unsigned bytes_per_pixel = nibbles_per_pixel / 2; - - for (unsigned int y = 0; y < surface_height; ++y) { - for (unsigned int x = 0; x < surface_width; ++x) { - const u32 coarse_y = y & ~7; - u32 offset = VideoCore::GetMortonOffset(x, y, bytes_per_pixel) + coarse_y * stride; - const u8* pixel = buffer + offset; - Math::Vec4 color = {0, 0, 0, 0}; - - switch (surface_format) { - case Format::D16: { - u32 data = Color::DecodeD16(pixel); - color.r() = data & 0xFF; - color.g() = (data >> 8) & 0xFF; - break; - } - case Format::D24: { - u32 data = Color::DecodeD24(pixel); - color.r() = data & 0xFF; - color.g() = (data >> 8) & 0xFF; - color.b() = (data >> 16) & 0xFF; - break; - } - case Format::D24X8: { - Math::Vec2 data = Color::DecodeD24S8(pixel); - color.r() = data.x & 0xFF; - color.g() = (data.x >> 8) & 0xFF; - color.b() = (data.x >> 16) & 0xFF; - break; - } - case Format::X24S8: { - Math::Vec2 data = Color::DecodeD24S8(pixel); - color.r() = color.g() = color.b() = data.y; - break; - } - default: - qDebug() << "Unknown surface format " << static_cast(surface_format); - break; - } - - decoded_image.setPixel(x, y, qRgba(color.r(), color.g(), color.b(), 255)); - } + u8* tex_ptr = texture.get(); + for (int y = 0; y < info.height; ++y) { + for (int x = 0; x < info.width; ++x) { + u32 texel; + std::memcpy(&texel, &tex_ptr[(x + y * info.width) * 4], 4); + texel = (texel >> 8) | (texel << 24); + decoded_image.setPixel(x, y, texel); } } diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index c44b3d95a..b476c2571 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -35,6 +35,8 @@ #include "video_core/rasterizer_interface.h" #include "video_core/renderer_base.h" #include "video_core/shader/shader.h" +#include "video_core/texture/codec.h" +#include "video_core/texture/formats.h" #include "video_core/utils.h" #include "video_core/video_core.h" @@ -315,257 +317,6 @@ std::unique_ptr FinishPicaTracing() { return ret; } -const Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& info, - bool disable_alpha) { - const unsigned int coarse_x = x & ~7; - const unsigned int coarse_y = y & ~7; - - if (info.format != Regs::TextureFormat::ETC1 && info.format != Regs::TextureFormat::ETC1A4) { - // TODO(neobrain): Fix code design to unify vertical block offsets! - source += coarse_y * info.stride; - } - - // TODO: Assert that width/height are multiples of block dimensions - - switch (info.format) { - case Regs::TextureFormat::RGBA8: { - auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); - return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; - } - - case Regs::TextureFormat::RGB8: { - auto res = Color::DecodeRGB8(source + VideoCore::GetMortonOffset(x, y, 3)); - return {res.r(), res.g(), res.b(), 255}; - } - - case Regs::TextureFormat::RGB5A1: { - auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); - return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; - } - - case Regs::TextureFormat::RGB565: { - auto res = Color::DecodeRGB565(source + VideoCore::GetMortonOffset(x, y, 2)); - return {res.r(), res.g(), res.b(), 255}; - } - - case Regs::TextureFormat::RGBA4: { - auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); - return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; - } - - case Regs::TextureFormat::IA8: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 2); - - if (disable_alpha) { - // Show intensity as red, alpha as green - return {source_ptr[1], source_ptr[0], 0, 255}; - } else { - return {source_ptr[1], source_ptr[1], source_ptr[1], source_ptr[0]}; - } - } - - case Regs::TextureFormat::RG8: { - auto res = Color::DecodeRG8(source + VideoCore::GetMortonOffset(x, y, 2)); - return {res.r(), res.g(), 0, 255}; - } - - case Regs::TextureFormat::I8: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); - return {*source_ptr, *source_ptr, *source_ptr, 255}; - } - - case Regs::TextureFormat::A8: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); - - if (disable_alpha) { - return {*source_ptr, *source_ptr, *source_ptr, 255}; - } else { - return {0, 0, 0, *source_ptr}; - } - } - - case Regs::TextureFormat::IA4: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); - - u8 i = Color::Convert4To8(((*source_ptr) & 0xF0) >> 4); - u8 a = Color::Convert4To8((*source_ptr) & 0xF); - - if (disable_alpha) { - // Show intensity as red, alpha as green - return {i, a, 0, 255}; - } else { - return {i, i, i, a}; - } - } - - case Regs::TextureFormat::I4: { - u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); - const u8* source_ptr = source + morton_offset / 2; - - u8 i = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); - i = Color::Convert4To8(i); - - return {i, i, i, 255}; - } - - case Regs::TextureFormat::A4: { - u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); - const u8* source_ptr = source + morton_offset / 2; - - u8 a = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); - a = Color::Convert4To8(a); - - if (disable_alpha) { - return {a, a, a, 255}; - } else { - return {0, 0, 0, a}; - } - } - - case Regs::TextureFormat::ETC1: - case Regs::TextureFormat::ETC1A4: { - bool has_alpha = (info.format == Regs::TextureFormat::ETC1A4); - - // ETC1 further subdivides each 8x8 tile into four 4x4 subtiles - const int subtile_width = 4; - const int subtile_height = 4; - - int subtile_index = ((x / subtile_width) & 1) + 2 * ((y / subtile_height) & 1); - unsigned subtile_bytes = has_alpha ? 2 : 1; // TODO: Name... - - const u64* source_ptr = (const u64*)(source + coarse_x * subtile_bytes * 4 + - coarse_y * subtile_bytes * 4 * (info.width / 8) + - subtile_index * subtile_bytes * 8); - u64 alpha = 0xFFFFFFFFFFFFFFFF; - if (has_alpha) { - alpha = *source_ptr; - source_ptr++; - } - - union ETC1Tile { - // Each of these two is a collection of 16 bits (one per lookup value) - BitField<0, 16, u64> table_subindexes; - BitField<16, 16, u64> negation_flags; - - unsigned GetTableSubIndex(unsigned index) const { - return (table_subindexes >> index) & 1; - } - - bool GetNegationFlag(unsigned index) const { - return ((negation_flags >> index) & 1) == 1; - } - - BitField<32, 1, u64> flip; - BitField<33, 1, u64> differential_mode; - - BitField<34, 3, u64> table_index_2; - BitField<37, 3, u64> table_index_1; - - union { - // delta value + base value - BitField<40, 3, s64> db; - BitField<43, 5, u64> b; - - BitField<48, 3, s64> dg; - BitField<51, 5, u64> g; - - BitField<56, 3, s64> dr; - BitField<59, 5, u64> r; - } differential; - - union { - BitField<40, 4, u64> b2; - BitField<44, 4, u64> b1; - - BitField<48, 4, u64> g2; - BitField<52, 4, u64> g1; - - BitField<56, 4, u64> r2; - BitField<60, 4, u64> r1; - } separate; - - const Math::Vec3 GetRGB(int x, int y) const { - int texel = 4 * x + y; - - if (flip) - std::swap(x, y); - - // Lookup base value - Math::Vec3 ret; - if (differential_mode) { - ret.r() = static_cast(differential.r); - ret.g() = static_cast(differential.g); - ret.b() = static_cast(differential.b); - if (x >= 2) { - ret.r() += static_cast(differential.dr); - ret.g() += static_cast(differential.dg); - ret.b() += static_cast(differential.db); - } - ret.r() = Color::Convert5To8(ret.r()); - ret.g() = Color::Convert5To8(ret.g()); - ret.b() = Color::Convert5To8(ret.b()); - } else { - if (x < 2) { - ret.r() = Color::Convert4To8(static_cast(separate.r1)); - ret.g() = Color::Convert4To8(static_cast(separate.g1)); - ret.b() = Color::Convert4To8(static_cast(separate.b1)); - } else { - ret.r() = Color::Convert4To8(static_cast(separate.r2)); - ret.g() = Color::Convert4To8(static_cast(separate.g2)); - ret.b() = Color::Convert4To8(static_cast(separate.b2)); - } - } - - // Add modifier - unsigned table_index = - static_cast((x < 2) ? table_index_1.Value() : table_index_2.Value()); - - static const std::array, 8> etc1_modifier_table = {{ - {{2, 8}}, - {{5, 17}}, - {{9, 29}}, - {{13, 42}}, - {{18, 60}}, - {{24, 80}}, - {{33, 106}}, - {{47, 183}}, - }}; - - int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel)); - if (GetNegationFlag(texel)) - modifier *= -1; - - ret.r() = MathUtil::Clamp(ret.r() + modifier, 0, 255); - ret.g() = MathUtil::Clamp(ret.g() + modifier, 0, 255); - ret.b() = MathUtil::Clamp(ret.b() + modifier, 0, 255); - - return ret.Cast(); - } - } const* etc1_tile = reinterpret_cast(source_ptr); - - alpha >>= 4 * ((x & 3) * 4 + (y & 3)); - return Math::MakeVec(etc1_tile->GetRGB(x & 3, y & 3), - disable_alpha ? (u8)255 : Color::Convert4To8(alpha & 0xF)); - } - - default: - LOG_ERROR(HW_GPU, "Unknown texture format: %x", (u32)info.format); - DEBUG_ASSERT(false); - return {}; - } -} - -TextureInfo TextureInfo::FromPicaRegister(const Regs::TextureConfig& config, - const Regs::TextureFormat& format) { - TextureInfo info; - info.physical_address = config.GetPhysicalAddress(); - info.width = config.width; - info.height = config.height; - info.format = format; - info.stride = Pica::Regs::NibblesPerPixel(info.format) * info.width / 2; - return info; -} - #ifdef HAVE_PNG // Adapter functions to libpng to write/flush to File::IOFile instances. static void WriteIOFile(png_structp png_ptr, png_bytep data, png_size_t length) { @@ -581,6 +332,13 @@ static void FlushIOFile(png_structp png_ptr) { } #endif +void clean_mess(png_infop info_ptr, png_structp png_ptr) { + if (info_ptr != nullptr) + png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1); + if (png_ptr != nullptr) + png_destroy_write_struct(&png_ptr, (png_infopp) nullptr); +} + void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { #ifndef HAVE_PNG return; @@ -608,20 +366,23 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); if (png_ptr == nullptr) { LOG_ERROR(Debug_GPU, "Could not allocate write struct"); - goto finalise; + clean_mess(info_ptr, png_ptr); + return; } // Initialize info structure info_ptr = png_create_info_struct(png_ptr); if (info_ptr == nullptr) { LOG_ERROR(Debug_GPU, "Could not allocate info struct"); - goto finalise; + clean_mess(info_ptr, png_ptr); + return; } // Setup Exception handling if (setjmp(png_jmpbuf(png_ptr))) { LOG_ERROR(Debug_GPU, "Error during png creation"); - goto finalise; + clean_mess(info_ptr, png_ptr); + return; } png_set_write_fn(png_ptr, static_cast(&fp), WriteIOFile, FlushIOFile); @@ -639,18 +400,30 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { png_write_info(png_ptr, info_ptr); + auto format = Pica::Texture::Format::FromTextureFormat(g_state.regs.texture0_format); + auto tmp = Pica::Texture::CodecFactory::build( + // clang-format off + format, data, texture_config.width, texture_config.height + // clang-format on + ); + Pica::Texture::Codec* codec = tmp.get(); + codec->configTiling(true, 8); // change 8 for 32 in case the image is tiled + // on blocks of 32x32 + codec->configRGBATransform(true); + codec->validate(); + std::unique_ptr texture; + if (!codec->invalid()) { + codec->decode(); + texture = codec->transferInternalBuffer(); + } + buf = new u8[row_stride * texture_config.height]; for (unsigned y = 0; y < texture_config.height; ++y) { for (unsigned x = 0; x < texture_config.width; ++x) { - TextureInfo info; - info.width = texture_config.width; - info.height = texture_config.height; - info.stride = row_stride; - info.format = g_state.regs.texture0_format; - Math::Vec4 texture_color = LookupTexture(data, x, y, info); - buf[3 * x + y * row_stride] = texture_color.r(); - buf[3 * x + y * row_stride + 1] = texture_color.g(); - buf[3 * x + y * row_stride + 2] = texture_color.b(); + const size_t pos1 = 3 * x + y * row_stride; + const size_t pos2 = (x + y * texture_config.width) * 4; + auto tex = texture.get(); + std::memcpy(&buf[pos1], &tex[pos2], 3); } } @@ -665,11 +438,8 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { // End write png_write_end(png_ptr, nullptr); -finalise: - if (info_ptr != nullptr) - png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1); - if (png_ptr != nullptr) - png_destroy_write_struct(&png_ptr, (png_infopp) nullptr); + clean_mess(info_ptr, png_ptr); + return; #endif } diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index 46ea8d9c7..938a2e1b5 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h @@ -205,31 +205,6 @@ inline bool IsPicaTracing() { void OnPicaRegWrite(PicaTrace::Write write); std::unique_ptr FinishPicaTracing(); -struct TextureInfo { - PAddr physical_address; - int width; - int height; - int stride; - Pica::Regs::TextureFormat format; - - static TextureInfo FromPicaRegister(const Pica::Regs::TextureConfig& config, - const Pica::Regs::TextureFormat& format); -}; - -/** - * Lookup texel located at the given coordinates and return an RGBA vector of its color. - * @param source Source pointer to read data from - * @param s,t Texture coordinates to read from - * @param info TextureInfo object describing the texture setup - * @param disable_alpha This is used for debug widgets which use this method to display textures - * without providing a good way to visualize alpha by themselves. If true, this will return 255 for - * the alpha component, and either drop the information entirely or store it in an "unused" color - * channel. - * @todo Eventually we should get rid of the disable_alpha parameter. - */ -const Math::Vec4 LookupTexture(const u8* source, int s, int t, const TextureInfo& info, - bool disable_alpha = false); - void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data); std::string GetTevStageConfigColorCombinerString(const Pica::Regs::TevStageConfig& tev_stage);