Amazing-Mirror/pineapple-src
1
0
Fork 0
mirror of https://github.com/pineappleEA/pineapple-src.git synced 2024-11-29 01:58:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

early-access version 2506

Browse Source
This commit is contained in:
pineappleEA 2022-02-25 10:52:18 +01:00
parent 80162600c2
commit e59ad71cae
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

2
src/video_core/renderer_vulkan/vk_blit_screen.cpp
View File

@ -100,6 +100,8 @@ VkFormat GetFormat(const Tegra::FramebufferConfig& framebuffer) {
return VK_FORMAT_A8B8G8R8_UNORM_PACK32; return VK_FORMAT_A8B8G8R8_UNORM_PACK32;
case Tegra::FramebufferConfig::PixelFormat::RGB565_UNORM: case Tegra::FramebufferConfig::PixelFormat::RGB565_UNORM:
return VK_FORMAT_R5G6B5_UNORM_PACK16; return VK_FORMAT_R5G6B5_UNORM_PACK16;
case Tegra::FramebufferConfig::PixelFormat::B8G8R8A8_UNORM:
return VK_FORMAT_B8G8R8A8_UNORM;
default: default:
UNIMPLEMENTED_MSG("Unknown framebuffer pixel format: {}", UNIMPLEMENTED_MSG("Unknown framebuffer pixel format: {}",
static_cast<u32>(framebuffer.pixel_format)); static_cast<u32>(framebuffer.pixel_format));

10
src/yuzu/main.cpp
View File

@ -2937,6 +2937,7 @@ void GMainWindow::OnLoadAmiibo() {
if (nfc_state == Service::NFP::DeviceState::TagFound || if (nfc_state == Service::NFP::DeviceState::TagFound ||
nfc_state == Service::NFP::DeviceState::TagMounted) { nfc_state == Service::NFP::DeviceState::TagMounted) {
nfc->CloseAmiibo(); nfc->CloseAmiibo();
QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed"));
return; return;
} }
@ -2965,6 +2966,15 @@ void GMainWindow::LoadAmiibo(const QString& filename) {
return; return;
} }
// Remove amiibo if one is connected
const auto nfc_state = nfc->GetCurrentState();
if (nfc_state == Service::NFP::DeviceState::TagFound ||
nfc_state == Service::NFP::DeviceState::TagMounted) {
nfc->CloseAmiibo();
QMessageBox::warning(this, tr("Amiibo"), tr("The current amiibo has been removed"));
return;
}
QFile nfc_file{filename}; QFile nfc_file{filename};
if (!nfc_file.open(QIODevice::ReadOnly)) { if (!nfc_file.open(QIODevice::ReadOnly)) {
QMessageBox::warning(this, tr("Error opening Amiibo data file"), QMessageBox::warning(this, tr("Error opening Amiibo data file"),