diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index da21bf075f..dab0c4d503 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -100,6 +100,19 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) { return VK_ERROR_INITIALIZATION_FAILED; } + if (info.flags & VulkanInitFlags::DISABLE_IMPLICIT_LAYERS) { + // https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderDebugging.md +#if PPSSPP_PLATFORM(WINDOWS) +#if !PPSSPP_PLATFORM(UWP) + // Windows uses _putenv_s + _putenv_s("VK_LOADER_LAYERS_DISABLE", "~implicit~"); +#endif +#else + // POSIX: use setenv + setenv("VK_LOADER_LAYERS_DISABLE", "~implicit~", 1); // overwrite = 1 +#endif + } + // Check which Vulkan version we should request. // Our code is fine with any version from 1.0 to 1.2, we don't know about higher versions. vulkanInstanceApiVersion_ = VK_API_VERSION_1_0; diff --git a/Common/GPU/Vulkan/VulkanContext.h b/Common/GPU/Vulkan/VulkanContext.h index f6ceea7939..8bb2057435 100644 --- a/Common/GPU/Vulkan/VulkanContext.h +++ b/Common/GPU/Vulkan/VulkanContext.h @@ -29,6 +29,7 @@ enum class VulkanInitFlags : uint32_t { PRESENT_IMMEDIATE = (1 << 2), PRESENT_FIFO_RELAXED = (1 << 3), PRESENT_FIFO = (1 << 4), + DISABLE_IMPLICIT_LAYERS = (1 << 5), }; ENUM_CLASS_BITOPS(VulkanInitFlags); diff --git a/Core/Config.cpp b/Core/Config.cpp index c87f4896f5..3b0c17be8a 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -337,6 +337,8 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("ShowGPOLEDs", &g_Config.bShowGPOLEDs, false, CfgFlag::PER_GAME), ConfigSetting("UIScaleFactor", &g_Config.iUIScaleFactor, false, CfgFlag::DEFAULT), + + ConfigSetting("VulkanDisableImplicitLayers", &g_Config.bVulkanDisableImplicitLayers, false, CfgFlag::DEFAULT), }; static bool DefaultSasThread() { diff --git a/Core/Config.h b/Core/Config.h index 03eaef7cb5..525d5703d4 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -262,7 +262,7 @@ public: bool bUberShaderFragment; int iDefaultTab; int iScreenshotMode; - bool bProhibitVulkanLayers; + bool bVulkanDisableImplicitLayers; std::vector vPostShaderNames; // Off for chain end (only Off for no shader) std::map mPostShaderSetting; diff --git a/SDL/SDLVulkanGraphicsContext.cpp b/SDL/SDLVulkanGraphicsContext.cpp index ed371fad3f..f3c70d5361 100644 --- a/SDL/SDLVulkanGraphicsContext.cpp +++ b/SDL/SDLVulkanGraphicsContext.cpp @@ -38,6 +38,9 @@ static VulkanInitFlags FlagsFromConfig() { if (g_Validate) { flags |= VulkanInitFlags::VALIDATE; } + if (g_Config.bVulkanDisableImplicitLayers) { + flags |= VulkanInitFlags::DISABLE_IMPLICIT_LAYERS; + } return flags; } @@ -64,12 +67,11 @@ bool SDLVulkanGraphicsContext::Init(SDL_Window *&window, int x, int y, int w, in } vulkan_ = new VulkanContext(); - int vulkanFlags = FlagsFromConfig(); VulkanContext::CreateInfo info{}; info.app_name = "PPSSPP"; info.app_ver = gitVer.ToInteger(); - info.flags = vulkanFlags; + info.flags = FlagsFromConfig(); if (VK_SUCCESS != vulkan_->CreateInstance(info)) { *error_message = vulkan_->InitError(); delete vulkan_; @@ -183,7 +185,7 @@ void SDLVulkanGraphicsContext::Shutdown() { void SDLVulkanGraphicsContext::Resize() { draw_->HandleEvent(Draw::Event::LOST_BACKBUFFER, vulkan_->GetBackbufferWidth(), vulkan_->GetBackbufferHeight()); vulkan_->DestroySwapchain(); - vulkan_->UpdateFlags(FlagsFromConfig()); + vulkan_->UpdateInitFlags(FlagsFromConfig()); vulkan_->InitSwapchain(); draw_->HandleEvent(Draw::Event::GOT_BACKBUFFER, vulkan_->GetBackbufferWidth(), vulkan_->GetBackbufferHeight()); } diff --git a/UI/DeveloperToolsScreen.cpp b/UI/DeveloperToolsScreen.cpp index 347db93955..ef3a9daf12 100644 --- a/UI/DeveloperToolsScreen.cpp +++ b/UI/DeveloperToolsScreen.cpp @@ -321,6 +321,9 @@ void DeveloperToolsScreen::CreateGraphicsTab(UI::LinearLayout *list) { Draw::DrawContext *draw = screenManager()->getDrawContext(); + list->Add(new ItemHeader(dev->T("Vulkan"))); + list->Add(new CheckBox(&g_Config.bVulkanDisableImplicitLayers, dev->T("Prevent loading overlays"))); + list->Add(new ItemHeader(dev->T("Ubershaders"))); if (draw->GetShaderLanguageDesc().bitwiseOps && !draw->GetBugs().Has(Draw::Bugs::UNIFORM_INDEXING_BROKEN)) { // If the above if fails, the checkbox is redundant since it'll be force disabled anyway. diff --git a/Windows/GPU/WindowsVulkanContext.cpp b/Windows/GPU/WindowsVulkanContext.cpp index 7f5473212a..ffb475b859 100644 --- a/Windows/GPU/WindowsVulkanContext.cpp +++ b/Windows/GPU/WindowsVulkanContext.cpp @@ -72,6 +72,9 @@ static VulkanInitFlags FlagsFromConfig() { if (g_validate_) { flags |= VulkanInitFlags::VALIDATE; } + if (g_Config.bVulkanDisableImplicitLayers) { + flags |= VulkanInitFlags::DISABLE_IMPLICIT_LAYERS; + } return flags; } diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp index f8c447fc5f..c9a5f95cd9 100644 --- a/android/jni/AndroidVulkanContext.cpp +++ b/android/jni/AndroidVulkanContext.cpp @@ -31,6 +31,9 @@ static VulkanInitFlags FlagsFromConfig() { if (g_Validate) { flags |= VulkanInitFlags::VALIDATE; } + if (g_Config.bVulkanDisableImplicitLayers) { + flags |= VulkanInitFlags::DISABLE_IMPLICIT_LAYERS; + } return flags; } @@ -148,7 +151,7 @@ void AndroidVulkanContext::Resize() { g_Vulkan->DestroySwapchain(); g_Vulkan->DestroySurface(); - g_Vulkan->UpdateFlags(FlagsFromConfig()); + g_Vulkan->UpdateInitFlags(FlagsFromConfig()); g_Vulkan->ReinitSurface(); g_Vulkan->InitSwapchain(); diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 315700ab79..38878bfeca 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -341,6 +341,7 @@ Next = ‎التالي No block = بدون منع Off = Off Prev = ‎السابق +Prevent loading overlays = Prevent loading overlays Random = ‎عشوائي Replace textures = ‎إستبدال الرسوم Reset = إعادة تشغيل diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index 18a2205f32..2e3e8f4e1a 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index a7e7586b38..3aa15f590c 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 91a88b2577..90fedf31e8 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -333,6 +333,7 @@ Next = Següent No block = No bloquis Off = Off Prev = Anterior +Prevent loading overlays = Prevent loading overlays Random = Aleatori Replace textures = Reemplaçar textures Reset = Reset diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 036e0f73b8..8cd78e87f7 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -333,6 +333,7 @@ Next = Další No block = Žádný blok Off = Off Prev = Předchozí +Prevent loading overlays = Prevent loading overlays Random = Náhodné Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 791f34be3d..0b47d11914 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -333,6 +333,7 @@ Next = Næste No block = Ingen blokering Off = Off Prev = Forrige +Prevent loading overlays = Prevent loading overlays Random = Tilfældig Replace textures = Erstat textures Reset = Reset diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index 1cdc6ee241..f49742c665 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -333,6 +333,7 @@ Next = Nächstes No block = Kein Block Off = Off Prev = Vorheriges +Prevent loading overlays = Prevent loading overlays Random = Zufall Replace textures = Texturen ersetzen Reset = Reset diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 289c8aa1ed..6d08370713 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index ff01547b96..23829ceb3a 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -359,6 +359,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index 65bc40f334..a1d357dc21 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -336,6 +336,7 @@ Next = Siguiente No block = No bloquear Off = Off Prev = Anterior +Prevent loading overlays = Prevent loading overlays Random = Aleatorio Replace textures = Remplazar texturas Reset = Restablecer diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index 1bb41ba5ac..32d7e7c9f7 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -333,6 +333,7 @@ Next = Siguiente No block = No bloquear Off = Off Prev = Atras +Prevent loading overlays = Prevent loading overlays Random = Aleatorio Replace textures = Remplazar texturas Reset = Reset diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 209813d6d0..9878fe2312 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -333,6 +333,7 @@ Next = بعدی No block = بدون بلوک Off = Off Prev = قبلی +Prevent loading overlays = Prevent loading overlays Random = شانسی Replace textures = جایگزین کردن بافت Reset = ریست diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 9f224cd3d0..18e70cf2e6 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index 516bf86bf9..6bcc17386e 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -333,6 +333,7 @@ Next = Suivant No block = Pas de bloc Off = Off Prev = Précédent +Prevent loading overlays = Prevent loading overlays Random = Aléatoire Replace textures = Remplacer les textures Reset = Reset diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index 106171f527..70dbb42c8b 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -333,6 +333,7 @@ Next = Seguinte No block = Non bloquear Off = Off Prev = Anterior +Prevent loading overlays = Prevent loading overlays Random = Aleatorio Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index f03051dfa1..57ce17b8f4 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -333,6 +333,7 @@ Next = Επόμενο No block = Κανένα block Off = Off Prev = Προηγούμενο +Prevent loading overlays = Prevent loading overlays Random = Τυχαίο Replace textures = Αντικαταστήστε τις υφές Reset = Reset diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index c9445a266c..0bf789852b 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 7b5d112b2a..870e4001ab 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index e7daa0ff22..b545023d39 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -333,6 +333,7 @@ Next = Sljedeće No block = Nema bloka Off = Off Prev = Prošlo +Prevent loading overlays = Prevent loading overlays Random = Nasumično Replace textures = Zamijeni teksture Reset = Reset diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 8336f9f02f..559f8ae5bc 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -333,6 +333,7 @@ Next = Következő No block = Nincs blokk Off = Ki Prev = Előző +Prevent loading overlays = Prevent loading overlays Random = Véletlenszerű Replace textures = Textúrák kicserélése Reset = Visszaállít diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index a71064f881..b76bec8b96 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -333,6 +333,7 @@ Next = Sesudah No block = Tidak ada blok Off = Off Prev = Sebelum +Prevent loading overlays = Prevent loading overlays Random = Acak Replace textures = Ganti tekstur Reset = Atur ulang diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 7ad864b953..d41c627155 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -333,6 +333,7 @@ Next = Avanti No block = Nessun blocco Off = Disattiva Prev = Indietro +Prevent loading overlays = Prevent loading overlays Random = Casuale Replace textures = Sostituisci texture Reset = Reset diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index b3dd7b65b8..4fd8cff7e7 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -333,6 +333,7 @@ Next = 次へ No block = ブロックなし Off = Off Prev = 前へ +Prevent loading overlays = Prevent loading overlays Random = ランダム Replace textures = テクスチャを置き換える Reset = リセット diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index b1b8564e53..508d9706df 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -333,6 +333,7 @@ Next = Sabanjure No block = Ora pemblokiran Off = Off Prev = Sadurunge +Prevent loading overlays = Prevent loading overlays Random = Acak Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index e535b23b90..ea6ecc1326 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -335,6 +335,7 @@ Next = 다음 No block = 차단 없음 Off = 끔 Prev = 이전 +Prevent loading overlays = Prevent loading overlays Random = 랜덤 Replace textures = 텍스처 교체 Reset = 재설정 diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini index 940ecc1fdb..ca6957f85e 100644 --- a/assets/lang/ku_SO.ini +++ b/assets/lang/ku_SO.ini @@ -349,6 +349,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index 6913df163d..b669d9e6b0 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -333,6 +333,7 @@ Next = ຕໍ່ໄປ No block = ບໍ່ຕ້ອງບລັອກ Off = Off Prev = ກ່ອນໜ້າ +Prevent loading overlays = Prevent loading overlays Random = ສຸມ Replace textures = ແທນທີ່ພື້ນຜິວ Reset = Reset diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 558e1b7c14..87585a55b6 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -333,6 +333,7 @@ Next = Kitas No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 9c7c2ea4e8..145f5a361a 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Rawak Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index ce167a1cd1..b911b5761e 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -333,6 +333,7 @@ Next = Volgende No block = Geen blok Off = Off Prev = Vorige +Prevent loading overlays = Prevent loading overlays Random = Willekeurig Replace textures = Textures vervangen Reset = Reset diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index dea670dba7..dd0fd915ae 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -333,6 +333,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index 3312ad1d47..15e4e102e2 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -333,6 +333,7 @@ Next = Następny No block = Brak bloku Off = Wyłączone Prev = Poprzedni +Prevent loading overlays = Prevent loading overlays Random = Przypadkowy Replace textures = Podmiana tekstur Reset = Reset diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index 43ada23f86..5cacfcc5e8 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -359,6 +359,7 @@ Next = Próximo No block = Nenhum bloco Off = Desligado Prev = Anterior +Prevent loading overlays = Prevent loading overlays Random = Aleatório Replace textures = Substituir texturas Reset = Resetar diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index b9e4636e2b..b58fffd838 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -357,6 +357,7 @@ Next = Próximo No block = Nenhum bloco Off = Off Prev = Anterior +Prevent loading overlays = Prevent loading overlays Random = Aleatório Replace textures = Substituir texturas Reset = Reiniciar diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index fb394ddc7f..82faf6c703 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -334,6 +334,7 @@ Next = Next No block = No block Off = Off Prev = Previous +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Replace textures Reset = Reset diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index 337366b7a2..d6d0dc6688 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -333,6 +333,7 @@ Next = Следующий No block = Нет блока Off = Выкл. Prev = Предыдущий +Prevent loading overlays = Prevent loading overlays Random = Случайный Replace textures = Подменять текстуры Reset = Сбросить diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index e25682dab0..7307fa1eca 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -333,6 +333,7 @@ Next = Nästa No block = Inget block Off = Av Prev = Föregående +Prevent loading overlays = Prevent loading overlays Random = Slumpa Replace textures = Ersätt texturer Reset = Nollställ diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index 7697892e2d..51a55a93bb 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -334,6 +334,7 @@ Next = Susunod No block = Walang block Off = Nakapatay Prev = Nagdaan +Prevent loading overlays = Prevent loading overlays Random = Random Replace textures = Palitan ang mga textures Reset = Ulitin diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index 9403066d6b..dee41c5ee6 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -341,6 +341,7 @@ Next = ถัดไป No block = ไม่ต้องบล็อค Off = ปิด Prev = ถอยกลับ +Prevent loading overlays = Prevent loading overlays Random = สุ่ม Replace textures = แทนที่เท็คเจอร์จากแหล่งที่เก็บข้อมูล Reset = คืนค่า diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 0835223a98..6beb236636 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -335,6 +335,7 @@ Next = Sonraki No block = Blok yok Off = Kapalı Prev = Önceki +Prevent loading overlays = Prevent loading overlays Random = Rastgele Replace textures = Dokuları değiştir Reset = Sıfırla diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index 77bc4237aa..f5ee94e2ff 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -333,6 +333,7 @@ Next = Наступний No block = Немає блоку Off = Вимкнути Prev = Попередній +Prevent loading overlays = Prevent loading overlays Random = Випадковий Replace textures = Заміна текстур Reset = Скинути diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index f3f71da3da..4ebdd85ed7 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -333,6 +333,7 @@ Next = Tiếp tục No block = không chặn Off = Off Prev = Trở lại +Prevent loading overlays = Prevent loading overlays Random = Ngẫu nhiên Replace textures = Thay thế textures Reset = Reset diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index cccc0724a3..fd3378ed77 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -333,6 +333,7 @@ Next = 下一个 No block = 没有内存块 Off = 关闭 Prev = 之前 +Prevent loading overlays = Prevent loading overlays Random = 随机 Replace textures = 纹理替换 Reset = 重置 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index dba893e272..5a1d60d251 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -333,6 +333,7 @@ Next = 下一個 No block = 沒有區塊 Off = 關閉 Prev = 上一個 +Prevent loading overlays = Prevent loading overlays Random = 隨機 Replace textures = 取代紋理 Reset = 重設 diff --git a/ios/ViewControllerMetal.mm b/ios/ViewControllerMetal.mm index 22bcf32cba..4d178a1a76 100644 --- a/ios/ViewControllerMetal.mm +++ b/ios/ViewControllerMetal.mm @@ -36,6 +36,9 @@ static VulkanInitFlags FlagsFromConfig() { } else { flags = VulkanInitFlags::PRESENT_MAILBOX | VulkanInitFlags::PRESENT_IMMEDIATE; } + if (g_Config.bVulkanDisableImplicitLayers) { + flags |= VulkanInitFlags::DISABLE_IMPLICIT_LAYERS; + } return flags; } @@ -143,7 +146,7 @@ void IOSVulkanContext::Resize() { g_Vulkan->DestroySwapchain(); g_Vulkan->DestroySurface(); - g_Vulkan->UpdateFlags(FlagsFromConfig()); + g_Vulkan->UpdateInitFlags(FlagsFromConfig()); g_Vulkan->ReinitSurface(); g_Vulkan->InitSwapchain();