early-access version 3865

This commit is contained in:
pineappleEA 2023-09-13 17:42:25 +02:00
parent 687132519f
commit 1c6545b36c
9 changed files with 163 additions and 3 deletions

View File

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 3864. This is the source code for early-access 3865.
## Legal Notice ## Legal Notice

View File

@ -45,6 +45,10 @@ CNMT::CNMT(CNMTHeader header_, OptionalHeader opt_header_,
CNMT::~CNMT() = default; CNMT::~CNMT() = default;
const CNMTHeader& CNMT::GetHeader() const {
return header;
}
u64 CNMT::GetTitleID() const { u64 CNMT::GetTitleID() const {
return header.title_id; return header.title_id;
} }

View File

@ -89,6 +89,7 @@ public:
std::vector<ContentRecord> content_records_, std::vector<MetaRecord> meta_records_); std::vector<ContentRecord> content_records_, std::vector<MetaRecord> meta_records_);
~CNMT(); ~CNMT();
const CNMTHeader& GetHeader() const;
u64 GetTitleID() const; u64 GetTitleID() const;
u32 GetTitleVersion() const; u32 GetTitleVersion() const;
TitleType GetType() const; TitleType GetType() const;

View File

@ -9,6 +9,7 @@
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "common/hex_util.h" #include "common/hex_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/scope_exit.h"
#include "core/crypto/key_manager.h" #include "core/crypto/key_manager.h"
#include "core/file_sys/card_image.h" #include "core/file_sys/card_image.h"
#include "core/file_sys/common_funcs.h" #include "core/file_sys/common_funcs.h"
@ -625,7 +626,7 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
nca->GetTitleId() != title_id) { nca->GetTitleId() != title_id) {
// Create fake cnmt for patch to multiprogram application // Create fake cnmt for patch to multiprogram application
const auto sub_nca_result = const auto sub_nca_result =
InstallEntry(*nca, TitleType::Update, overwrite_if_exists, copy); InstallEntry(*nca, cnmt.GetHeader(), record, overwrite_if_exists, copy);
if (sub_nca_result != InstallResult::Success) { if (sub_nca_result != InstallResult::Success) {
return sub_nca_result; return sub_nca_result;
} }
@ -672,6 +673,31 @@ InstallResult RegisteredCache::InstallEntry(const NCA& nca, TitleType type,
return RawInstallNCA(nca, copy, overwrite_if_exists, c_rec.nca_id); return RawInstallNCA(nca, copy, overwrite_if_exists, c_rec.nca_id);
} }
InstallResult RegisteredCache::InstallEntry(const NCA& nca, const CNMTHeader& base_header,
const ContentRecord& base_record,
bool overwrite_if_exists, const VfsCopyFunction& copy) {
const CNMTHeader header{
.title_id = nca.GetTitleId(),
.title_version = base_header.title_version,
.type = base_header.type,
.reserved = {},
.table_offset = 0x10,
.number_content_entries = 1,
.number_meta_entries = 0,
.attributes = 0,
.reserved2 = {},
.is_committed = 0,
.required_download_system_version = 0,
.reserved3 = {},
};
const OptionalHeader opt_header{0, 0};
const CNMT new_cnmt(header, opt_header, {base_record}, {});
if (!RawInstallYuzuMeta(new_cnmt)) {
return InstallResult::ErrorMetaFailed;
}
return RawInstallNCA(nca, copy, overwrite_if_exists, base_record.nca_id);
}
bool RegisteredCache::RemoveExistingEntry(u64 title_id) const { bool RegisteredCache::RemoveExistingEntry(u64 title_id) const {
bool removed_data = false; bool removed_data = false;

View File

@ -24,6 +24,7 @@ enum class NCAContentType : u8;
enum class TitleType : u8; enum class TitleType : u8;
struct ContentRecord; struct ContentRecord;
struct CNMTHeader;
struct MetaRecord; struct MetaRecord;
class RegisteredCache; class RegisteredCache;
@ -169,6 +170,10 @@ public:
InstallResult InstallEntry(const NCA& nca, TitleType type, bool overwrite_if_exists = false, InstallResult InstallEntry(const NCA& nca, TitleType type, bool overwrite_if_exists = false,
const VfsCopyFunction& copy = &VfsRawCopy); const VfsCopyFunction& copy = &VfsRawCopy);
InstallResult InstallEntry(const NCA& nca, const CNMTHeader& base_header,
const ContentRecord& base_record, bool overwrite_if_exists = false,
const VfsCopyFunction& copy = &VfsRawCopy);
// Removes an existing entry based on title id // Removes an existing entry based on title id
bool RemoveExistingEntry(u64 title_id) const; bool RemoveExistingEntry(u64 title_id) const;

View File

@ -719,6 +719,7 @@ typename P::ImageView* TextureCache<P>::TryFindFramebufferImageView(VAddr cpu_ad
return nullptr; return nullptr;
} }
const auto& image_map_ids = it->second; const auto& image_map_ids = it->second;
boost::container::small_vector<const ImageBase*, 4> valid_images;
for (const ImageMapId map_id : image_map_ids) { for (const ImageMapId map_id : image_map_ids) {
const ImageMapView& map = slot_map_views[map_id]; const ImageMapView& map = slot_map_views[map_id];
const ImageBase& image = slot_images[map.image_id]; const ImageBase& image = slot_images[map.image_id];
@ -728,8 +729,20 @@ typename P::ImageView* TextureCache<P>::TryFindFramebufferImageView(VAddr cpu_ad
if (image.image_view_ids.empty()) { if (image.image_view_ids.empty()) {
continue; continue;
} }
return &slot_image_views[image.image_view_ids.at(0)]; valid_images.push_back(&image);
} }
if (valid_images.size() == 1) [[likely]] {
return &slot_image_views[valid_images[0]->image_view_ids.at(0)];
}
if (valid_images.size() > 0) [[unlikely]] {
std::ranges::sort(valid_images, [](const auto* a, const auto* b) {
return a->modification_tick > b->modification_tick;
});
return &slot_image_views[valid_images[0]->image_view_ids.at(0)];
}
return nullptr; return nullptr;
} }

View File

@ -8,6 +8,7 @@
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <thread> #include <thread>
#include "core/loader/nca.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <unistd.h> // for chdir #include <unistd.h> // for chdir
#endif #endif
@ -1559,6 +1560,7 @@ void GMainWindow::ConnectMenuEvents() {
// Help // Help
connect_menu(ui->action_Open_yuzu_Folder, &GMainWindow::OnOpenYuzuFolder); connect_menu(ui->action_Open_yuzu_Folder, &GMainWindow::OnOpenYuzuFolder);
connect_menu(ui->action_Verify_installed_contents, &GMainWindow::OnVerifyInstalledContents);
connect_menu(ui->action_About, &GMainWindow::OnAbout); connect_menu(ui->action_About, &GMainWindow::OnAbout);
} }
@ -4029,6 +4031,108 @@ void GMainWindow::OnOpenYuzuFolder() {
QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::YuzuDir)))); QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::YuzuDir))));
} }
void GMainWindow::OnVerifyInstalledContents() {
// Declare sizes.
size_t total_size = 0;
size_t processed_size = 0;
// Initialize a progress dialog.
QProgressDialog progress(tr("Verifying integrity..."), tr("Cancel"), 0, 100, this);
progress.setWindowModality(Qt::WindowModal);
progress.setMinimumDuration(100);
progress.setAutoClose(false);
progress.setAutoReset(false);
// Declare a list of file names which failed to verify.
std::vector<std::string> failed;
// Declare progress callback.
auto QtProgressCallback = [&](size_t nca_processed, size_t nca_total) {
if (progress.wasCanceled()) {
return false;
}
progress.setValue(static_cast<int>(((processed_size + nca_processed) * 100) / total_size));
return true;
};
// Get content registries.
auto bis_contents = system->GetFileSystemController().GetSystemNANDContents();
auto user_contents = system->GetFileSystemController().GetUserNANDContents();
std::vector<FileSys::RegisteredCache*> content_providers;
if (bis_contents) {
content_providers.push_back(bis_contents);
}
if (user_contents) {
content_providers.push_back(user_contents);
}
// Get associated NCA files.
std::vector<FileSys::VirtualFile> nca_files;
// Get all installed IDs.
for (auto nca_provider : content_providers) {
const auto entries = nca_provider->ListEntriesFilter();
for (const auto& entry : entries) {
auto nca_file = nca_provider->GetEntryRaw(entry.title_id, entry.type);
if (!nca_file) {
continue;
}
total_size += nca_file->GetSize();
nca_files.push_back(std::move(nca_file));
}
}
// Using the NCA loader, determine if all NCAs are valid.
for (auto& nca_file : nca_files) {
Loader::AppLoader_NCA nca_loader(nca_file);
auto status = nca_loader.VerifyIntegrity(QtProgressCallback);
if (progress.wasCanceled()) {
break;
}
if (status != Loader::ResultStatus::Success) {
FileSys::NCA nca(nca_file);
const auto title_id = nca.GetTitleId();
std::string title_name = "unknown";
const auto control = provider->GetEntry(FileSys::GetBaseTitleID(title_id),
FileSys::ContentRecordType::Control);
if (control && control->GetStatus() == Loader::ResultStatus::Success) {
const FileSys::PatchManager pm{title_id, system->GetFileSystemController(),
*provider};
const auto [nacp, logo] = pm.ParseControlNCA(*control);
if (nacp) {
title_name = nacp->GetApplicationName();
}
}
if (title_id > 0) {
failed.push_back(
fmt::format("{} ({:016X}) ({})", nca_file->GetName(), title_id, title_name));
} else {
failed.push_back(fmt::format("{} (unknown)", nca_file->GetName()));
}
}
processed_size += nca_file->GetSize();
}
progress.close();
if (failed.size() > 0) {
auto failed_names = QString::fromStdString(fmt::format("{}", fmt::join(failed, "\n")));
QMessageBox::critical(
this, tr("Integrity verification failed!"),
tr("Verification failed for the following files:\n\n%1").arg(failed_names));
} else {
QMessageBox::information(this, tr("Integrity verification succeeded!"),
tr("The operation completed successfully."));
}
}
void GMainWindow::OnAbout() { void GMainWindow::OnAbout() {
AboutDialog aboutDialog(this); AboutDialog aboutDialog(this);
aboutDialog.exec(); aboutDialog.exec();

View File

@ -355,6 +355,7 @@ private slots:
void OnConfigurePerGame(); void OnConfigurePerGame();
void OnLoadAmiibo(); void OnLoadAmiibo();
void OnOpenYuzuFolder(); void OnOpenYuzuFolder();
void OnVerifyInstalledContents();
void OnAbout(); void OnAbout();
void OnToggleFilterBar(); void OnToggleFilterBar();
void OnToggleStatusBar(); void OnToggleStatusBar();

View File

@ -148,6 +148,7 @@
<addaction name="action_Configure_Tas"/> <addaction name="action_Configure_Tas"/>
</widget> </widget>
<addaction name="action_Rederive"/> <addaction name="action_Rederive"/>
<addaction name="action_Verify_installed_contents"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_Capture_Screenshot"/> <addaction name="action_Capture_Screenshot"/>
<addaction name="menuTAS"/> <addaction name="menuTAS"/>
@ -214,6 +215,11 @@
<string>&amp;Reinitialize keys...</string> <string>&amp;Reinitialize keys...</string>
</property> </property>
</action> </action>
<action name="action_Verify_installed_contents">
<property name="text">
<string>Verify installed contents</string>
</property>
</action>
<action name="action_About"> <action name="action_About">
<property name="text"> <property name="text">
<string>&amp;About yuzu</string> <string>&amp;About yuzu</string>