early-access version 2214

main
pineappleEA 2021-11-18 22:24:47 +01:00
parent 27d8331649
commit 31055796af
3 changed files with 4 additions and 4 deletions

View File

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

View File

@ -21,7 +21,7 @@
namespace Vulkan { namespace Vulkan {
namespace { namespace {
namespace Alternatives { namespace Alternatives {
constexpr std::array S8_UINT{ constexpr std::array STENCIL8_UINT{
VK_FORMAT_D16_UNORM_S8_UINT, VK_FORMAT_D16_UNORM_S8_UINT,
VK_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT,
VK_FORMAT_D32_SFLOAT_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT,
@ -82,7 +82,7 @@ void SetNext(void**& next, T& data) {
constexpr const VkFormat* GetFormatAlternatives(VkFormat format) { constexpr const VkFormat* GetFormatAlternatives(VkFormat format) {
switch (format) { switch (format) {
case VK_FORMAT_S8_UINT: case VK_FORMAT_S8_UINT:
return Alternatives::S8_UINT.data(); return Alternatives::STENCIL8_UINT.data();
case VK_FORMAT_D24_UNORM_S8_UINT: case VK_FORMAT_D24_UNORM_S8_UINT:
return Alternatives::DEPTH24_UNORM_STENCIL8_UINT.data(); return Alternatives::DEPTH24_UNORM_STENCIL8_UINT.data();
case VK_FORMAT_D16_UNORM_S8_UINT: case VK_FORMAT_D16_UNORM_S8_UINT:

View File

@ -1037,7 +1037,7 @@ void GMainWindow::InitializeHotkeys() {
&QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger); &QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger);
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this), connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this),
&QShortcut::activated, this, [&] { &QShortcut::activated, this, [&] {
if (emulation_running) { if (emulation_running && ui->action_Fullscreen->isChecked()) {
ui->action_Fullscreen->setChecked(false); ui->action_Fullscreen->setChecked(false);
ToggleFullscreen(); ToggleFullscreen();
} }