From b1fc1da318bf6fe9ea4cf67413cfa461f652fe91 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Fri, 28 Jul 2023 17:29:37 +0200 Subject: [PATCH] early-access version 3782 --- README.md | 2 +- .../app/src/main/res/values-de/strings.xml | 20 ----------- .../app/src/main/res/values-es/strings.xml | 18 ---------- .../app/src/main/res/values-fr/strings.xml | 18 ---------- .../app/src/main/res/values-it/strings.xml | 18 ---------- .../app/src/main/res/values-ja/strings.xml | 18 ---------- .../app/src/main/res/values-ko/strings.xml | 18 ---------- .../app/src/main/res/values-nb/strings.xml | 18 ---------- .../app/src/main/res/values-pl/strings.xml | 18 ---------- .../src/main/res/values-pt-rBR/strings.xml | 18 ---------- .../src/main/res/values-pt-rPT/strings.xml | 18 ---------- .../app/src/main/res/values-ru/strings.xml | 18 ---------- .../app/src/main/res/values-uk/strings.xml | 18 ---------- .../src/main/res/values-zh-rCN/strings.xml | 18 ---------- .../src/main/res/values-zh-rTW/strings.xml | 18 ---------- .../app/src/main/res/values/strings.xml | 36 +++++++++---------- src/common/wall_clock.cpp | 4 +-- .../renderer_vulkan/vk_blit_screen.cpp | 4 +-- .../renderer_vulkan/vk_descriptor_pool.cpp | 2 +- src/video_core/renderer_vulkan/vk_fsr.cpp | 2 +- .../renderer_vulkan/vk_turbo_mode.cpp | 2 +- 21 files changed, 26 insertions(+), 280 deletions(-) diff --git a/README.md b/README.md index 79c993bc9..9e9f6d255 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3781. +This is the source code for early-access 3782. ## Legal Notice diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml index 969223ef8..0c1d91264 100755 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -235,26 +235,6 @@ Korea Taiwan - - Japanisch (日本語) - Englisch - Französisch (Français) - Deutsch (German) - Italienisch (Italiano) - Spanisch (Español) - Chinesisch (简体中文) - Koreanisch (한국어) - Niederländisch (Nederlands) - Portugiesisch (Português) - Russisch (Русский) - Taiwanesisch (台湾) - Britisches Englisch - Kanadisches Französisch (Français canadien) - Lateinamerikanisches Spanisch (Español latinoamericano) - Vereinfachtes Chinesisch (简体中文) - Traditionelles Chinesisch (正體中文) - Brasilianisches Portugiesisch (Português do Brasil) - Vulkan Keiner diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml index 986e80e50..357f956d1 100755 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -241,24 +241,6 @@ Taiwán - Japonés (日本語) - Inglés (English) - Francés (Français) - Alemán (deutsch) - Italiano (Italiano) - Español (Español) - Chino (简体中文) - Coreano (한국어) - Holandés (nederlands) - Portugués (Português) - Ruso (Русский) - Taiwanés (台湾) - Inglés británico - Francés Canadiense (Français canadien) - Español Latinoamericano (Español latinoamericano) - Chino Simplificado (简体中文) - Chino tradicional (正體中文) - Portugués Brasileño (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml index 14a9b2d5c..dfca1c830 100755 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -241,24 +241,6 @@ Taïwan - Japonais (日本語) - Anglais - Français (Français) - Allemand (Deutsch) - Italien (Italiano) - Espagnol (Español) - Chinois (简体中文) - Coréen (한국어) - Néerlandais (Nederlands) - Portugais (Português) - Russe (Русский) - Taïwanais (台湾) - Anglais Britannique - Français canadien (Français canadien) - Espagnol latino-américain (Español latinoamericano) - Chinois simplifié (简体中文) - Chinois Traditionnel (正體中文) - Portugais brésilien (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml index 47a4cfa31..089d93ed6 100755 --- a/src/android/app/src/main/res/values-it/strings.xml +++ b/src/android/app/src/main/res/values-it/strings.xml @@ -241,24 +241,6 @@ Taiwan - Giapponese (日本語) - Inglese (English) - Francese (Français) - Tedesco (Deutsch) - Italiano (Italiano) - Spagnolo (Español) - Cinese (简体中文) - Coreano (한국어) - Olandese (Nederlands) - Portoghese (Português) - Russo (Русский) - Taiwanese (台湾) - Inglese britannico - Francese Canadese (Français canadien) - Spagnolo Latino Americano (Español latinoamericano) - Cinese Semplificato (简体中文) - Cinese tradizionale (正體中文) - Portoghese (Português) Vulkan diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml index 46eda9ef7..39b590bee 100755 --- a/src/android/app/src/main/res/values-ja/strings.xml +++ b/src/android/app/src/main/res/values-ja/strings.xml @@ -239,24 +239,6 @@ 台湾 - 日本語 - 英語 - フランス語 (Français) - ドイツ語 (Deutsch) - イタリア語 (Italiano) - スペイン語 (Español) - 中国語 (简体中文) - 韓国語 (한국어) - オランダ語 (Nederlands) - ポルトガル語 (Português) - ロシア語 (Русский) - 台湾語 (台湾) - イギリス英語 - フランス語(カナダ) (Français canadien) - スペイン語(ラテンアメリカ) (Español latinoamericano) - 中国語 (简体中文) - 繁体字中国語 (正體中文) - ポルトガル語(ブラジル) (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml index 5da80ab4b..cbcb2873f 100755 --- a/src/android/app/src/main/res/values-ko/strings.xml +++ b/src/android/app/src/main/res/values-ko/strings.xml @@ -241,24 +241,6 @@ 타이완 - 일본어 (日本語) - 영어 (English) - 프랑스어 (Français) - 독일어(Deutsch) - 이탈리아어 (Italiano) - 스페인어 (Español) - 중국어 (简体中文) - 한국어 (Korean) - 네덜란드어 (Nederlands) - 포르투갈어 (Português) - 러시아어 (Русский) - 대만어 (台湾) - 영어 (British English) - 캐나다 프랑스어 (Français canadien) - 라틴 아메리카 스페인어 (Español latinoamericano) - 중국어 간체 (简体中文) - 중국어 번체 (正體中文) - 브라질 포르투갈어 (Português do Brasil) 불칸 diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml index 3e1f9bce5..e48a4be38 100755 --- a/src/android/app/src/main/res/values-nb/strings.xml +++ b/src/android/app/src/main/res/values-nb/strings.xml @@ -241,24 +241,6 @@ Taiwan - Japansk (日本語) - Engelsk - Fransk (Français) - Tysk (Deutsch) - Italiensk (Italiano) - Spansk (Español) - Kinesisk (简体中文) - Koreansk (한국어) - Nederlandsk (Nederlands) - Portugisisk (Português) - Russisk (Русский) - Taiwansk (台湾) - Britisk Engelsk - Kanadisk fransk (Français canadien) - Latinamerikansk spansk (Español latinoamericano) - Forenklet kinesisk (简体中文) - Tradisjonell Kinesisk (正體中文) - Brasiliansk portugisisk (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml index 1cd1a8f87..bc9c0f7f4 100755 --- a/src/android/app/src/main/res/values-pl/strings.xml +++ b/src/android/app/src/main/res/values-pl/strings.xml @@ -241,24 +241,6 @@ Tajwan - Japoński (日本語) - Angielski - Francuski (Francja) - Niemiecki (Niemcy) - Włoski (Włochy) - Hiszpański (Hiszpania) - Chiński (简体中文) - Koreański (한국어) - Duński (Holandia) - Portugalski (Portugalia) - Rosyjski (Русский) - Tajwański (台湾) - Angielski Brytyjski - Francuski (Kanada) - Hiszpański (Ameryka Latynoska) - Chiński uproszczony (简体中文) - Chiński tradycyjny (正體中文) - Portugalski (Brazylia) Vulkan diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml index 35197c280..75fe0edbf 100755 --- a/src/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml @@ -241,24 +241,6 @@ Taiwan - Japônes (日本語) - Português do Brasil - Francês (Français) - Alemão (Deutsch) - Italiano (Italiano) - Espanhol (Español) - Mandarim (简体中文) - Coreano (한국어) - Holandês (Nederlands) - Português (Português) - Russo (Русский) - Taiwanês (台湾) - Inglês britânico (British English) - Fracês Canadiano (Français canadien) - Espanhol da América Latina (Español latino-americano) - Chinês Simplificado (简体中文) - Chinês tradicional (正體中文) - Português do Brasil (Português do Brasil) Vulcano diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml index 8761e2374..96b040c66 100755 --- a/src/android/app/src/main/res/values-pt-rPT/strings.xml +++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml @@ -241,24 +241,6 @@ Taiwan - Japonês (日本語) - Inglês - Francês (Français) - Alemão (Deutsch) - Italiano (Italiano) - Espanhol (Español) - Chinês simplificado (简体中文) - Coreano (한국어) - Holandês (Nederlands) - Português (Português) - Russo (Русский) - Taiwanês (台湾) - Inglês Britânico - Fracês Canadiano (Français canadien) - Espanhol da América Latina (Español latino-americano) - Chinês Simplificado (简体中文) - Chinês Tradicional (正 體 中文) - Português do Brasil (Português do Brasil) Vulcano diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml index 0fb4908f7..8d954f59e 100755 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -241,24 +241,6 @@ Тайвань - Японский (日本語) - Английский (English) - Французский (Français) - Немецкий (Deutsch) - Итальянский (Italiano) - Испанский (Español) - Китайский (简体中文) - Корейский (한국어) - Голландский (Nederlands) - Португальский (Português) - Русский - Тайваньский (台湾) - Британский английский - Канадский французский (Français canadien) - Латиноамериканский испанский (Español latinoamericano) - Упрощенный китайский (简体中文) - Традиционный китайский (正體中文) - Бразильский португальский (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml index 0d11eb2d2..6c028535b 100755 --- a/src/android/app/src/main/res/values-uk/strings.xml +++ b/src/android/app/src/main/res/values-uk/strings.xml @@ -241,24 +241,6 @@ Тайвань - Японська (日本語) - Англійська (English) - Французька (Français) - Німецька (Deutsch) - Італійська (Italiano) - Іспанська (Español) - Китайскька (简体中文) - Корейська (한국어) - Голландська (Nederlands) - Португальська (Português) - Російська (Русский) - Тайванська (台湾) - Британська англійська - Канадська французька (Français canadien) - Латиноамериканська іспанська (Español latinoamericano) - Спрощена китайська (简体中文) - Традиційна китайська (正體中文) - Бразильська португальська (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml index e00bbaa2e..e4ad2ed07 100755 --- a/src/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml @@ -241,24 +241,6 @@ 中国台湾 - 日语 (日本語) - 英语 (English) - 法语 (Français) - 德语 (Deutsch) - 意大利语 (Italiano) - 西班牙语 (Español) - 中文 (简体中文) - 韩语 (한국어) - 荷兰语 (Nederlands) - 葡萄牙语 (Português) - 俄语 (Русский) - 台湾中文 (台灣) - 英式英语 - 加拿大法语 (Français canadien) - 拉丁美洲西班牙语 (Español latinoamericano) - 简体中文 (简体中文) - 繁体中文 (正體中文) - 巴西葡萄牙语 (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml index a54d04248..0d32f23df 100755 --- a/src/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml @@ -241,24 +241,6 @@ 台灣 - 日文 (日本語) - 英文 - 法文 (Français) - 德文 (Deutsch) - 義大利文 (Italiano) - 西班牙文 (Español) - 中文 (简体中文) - 韓文 (한국어) - 荷蘭文 (Nederlands) - 葡萄牙文 (Português) - 俄文 (Русский) - 台文 (台灣) - 英式英文 - 加拿大法文 (Français canadien) - 拉丁美洲西班牙文 (Español latinoamericano) - 簡體中文 (简体中文) - 正體中文 (正體中文) - 巴西葡萄牙文 (Português do Brasil) Vulkan diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index bfdebd35b..02e25504d 100755 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -287,24 +287,24 @@ Taiwan - Japanese (日本語) - English - French (Français) - German (Deutsch) - Italian (Italiano) - Spanish (Español) - Chinese (简体中文) - Korean (한국어) - Dutch (Nederlands) - Portuguese (Português) - Russian (Русский) - Taiwanese (台湾) - British English - Canadian French (Français canadien) - Latin American Spanish (Español latinoamericano) - Simplified Chinese (简体中文) - Traditional Chinese (正體中文) - Brazilian Portuguese (Português do Brasil) + 日本語 + English + Français + Deutsch + Italiano + Español + 简体中文 + 한국어 + Nederlands + Português + Русский + 台湾 + British English + Français canadien + Español latinoamericano + 简体中文 + 正體中文 + Português do Brasil Byte diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp index a511a82bf..2d4c93e18 100755 --- a/src/common/wall_clock.cpp +++ b/src/common/wall_clock.cpp @@ -56,12 +56,12 @@ std::unique_ptr CreateOptimalClock() { #ifdef ARCHITECTURE_x86_64 const auto& caps = GetCPUCaps(); - if (caps.invariant_tsc && caps.tsc_frequency >= WallClock::GPUTickFreq) { + if (caps.invariant_tsc && caps.tsc_frequency >= std::nano::den) { return std::make_unique(caps.tsc_frequency); } else { // Fallback to StandardWallClock if the hardware TSC // - Is not invariant - // - Is not more precise than GPUTickFreq + // - Is not more precise than 1 GHz (1ns resolution) return std::make_unique(); } #else diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp index 74c315fea..6b4e96770 100755 --- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp +++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp @@ -566,7 +566,7 @@ void BlitScreen::CreateDescriptorPool() { const VkDescriptorPoolCreateInfo ci{ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, .pNext = nullptr, - .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, + .flags = 0, .maxSets = static_cast(image_count), .poolSizeCount = static_cast(pool_sizes.size()), .pPoolSizes = pool_sizes.data(), @@ -576,7 +576,7 @@ void BlitScreen::CreateDescriptorPool() { const VkDescriptorPoolCreateInfo ci_aa{ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, .pNext = nullptr, - .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, + .flags = 0, .maxSets = static_cast(image_count), .poolSizeCount = static_cast(pool_sizes_aa.size()), .pPoolSizes = pool_sizes_aa.data(), diff --git a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp index 32bf71057..42c3c5b9f 100755 --- a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp @@ -77,7 +77,7 @@ static void AllocatePool(const Device& device, DescriptorBank& bank) { bank.pools.push_back(device.GetLogical().CreateDescriptorPool({ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, .pNext = nullptr, - .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, + .flags = 0, .maxSets = sets_per_pool, .poolSizeCount = static_cast(pool_cursor), .pPoolSizes = std::data(pool_sizes), diff --git a/src/video_core/renderer_vulkan/vk_fsr.cpp b/src/video_core/renderer_vulkan/vk_fsr.cpp index c7abff26a..e0bf4e679 100755 --- a/src/video_core/renderer_vulkan/vk_fsr.cpp +++ b/src/video_core/renderer_vulkan/vk_fsr.cpp @@ -150,7 +150,7 @@ void FSR::CreateDescriptorPool() { const VkDescriptorPoolCreateInfo ci{ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, .pNext = nullptr, - .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, + .flags = 0, .maxSets = static_cast(image_count * 2), .poolSizeCount = static_cast(pool_sizes.size()), .pPoolSizes = pool_sizes.data(), diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp index 460d8d59d..04a51f2d1 100755 --- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp +++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp @@ -62,7 +62,7 @@ void TurboMode::Run(std::stop_token stop_token) { auto descriptor_pool = dld.CreateDescriptorPool(VkDescriptorPoolCreateInfo{ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, .pNext = nullptr, - .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, + .flags = 0, .maxSets = 1, .poolSizeCount = 1, .pPoolSizes = &pool_size,