"
"")
- .arg(currentRev.left(7), currentDate, latestRev, latestDate);
+ .arg(currentRev.left(7), currentDate, latestRev.left(7), latestDate);
QLabel* updateLabel = new QLabel(updateText, this);
layout->addWidget(updateLabel);
diff --git a/src/qt_gui/game_info.h b/src/qt_gui/game_info.h
index 09e5a4557..723142e1c 100644
--- a/src/qt_gui/game_info.h
+++ b/src/qt_gui/game_info.h
@@ -79,6 +79,11 @@ public:
if (const auto play_time = psf.GetString("PLAY_TIME"); play_time.has_value()) {
game.play_time = *play_time;
}
+ if (const auto save_dir = psf.GetString("INSTALL_DIR_SAVEDATA"); save_dir.has_value()) {
+ game.save_dir = *save_dir;
+ } else {
+ game.save_dir = game.serial;
+ }
}
return game;
}
diff --git a/src/qt_gui/game_list_utils.h b/src/qt_gui/game_list_utils.h
index 804f0e4b7..e19cf364e 100644
--- a/src/qt_gui/game_list_utils.h
+++ b/src/qt_gui/game_list_utils.h
@@ -25,6 +25,7 @@ struct GameInfo {
std::string version = "Unknown";
std::string region = "Unknown";
std::string fw = "Unknown";
+ std::string save_dir = "Unknown";
std::string play_time = "Unknown";
CompatibilityEntry compatibility = CompatibilityEntry{CompatibilityStatus::Unknown};
diff --git a/src/qt_gui/gui_context_menus.h b/src/qt_gui/gui_context_menus.h
index 2fd4588d2..46a40c5cd 100644
--- a/src/qt_gui/gui_context_menus.h
+++ b/src/qt_gui/gui_context_menus.h
@@ -156,11 +156,9 @@ public:
}
if (selected == openSaveDataFolder) {
- QString userPath;
- Common::FS::PathToQString(userPath,
- Common::FS::GetUserPath(Common::FS::PathType::UserDir));
- QString saveDataPath =
- userPath + "/savedata/1/" + QString::fromStdString(m_games[itemID].serial);
+ QString saveDataPath;
+ Common::FS::PathToQString(saveDataPath,
+ Config::GetSaveDataPath() / "1" / m_games[itemID].save_dir);
QDir(saveDataPath).mkpath(saveDataPath);
QDesktopServices::openUrl(QUrl::fromLocalFile(saveDataPath));
}
@@ -485,8 +483,7 @@ public:
dlc_path, Config::getAddonInstallDir() /
Common::FS::PathFromQString(folder_path).parent_path().filename());
Common::FS::PathToQString(save_data_path,
- Common::FS::GetUserPath(Common::FS::PathType::UserDir) /
- "savedata/1" / m_games[itemID].serial);
+ Config::GetSaveDataPath() / "1" / m_games[itemID].save_dir);
Common::FS::PathToQString(trophy_data_path,
Common::FS::GetUserPath(Common::FS::PathType::MetaDataDir) /
diff --git a/src/qt_gui/kbm_gui.ui b/src/qt_gui/kbm_gui.ui
index c8d63cd00..109423aa8 100644
--- a/src/qt_gui/kbm_gui.ui
+++ b/src/qt_gui/kbm_gui.ui
@@ -825,6 +825,9 @@
0
+
+ 48
+ Qt::FocusPolicy::NoFocus
@@ -841,6 +844,9 @@
0
+
+ 48
+ Qt::FocusPolicy::NoFocus
@@ -983,8 +989,8 @@
- 500
- 200
+ 424
+ 250
diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index 36037fd4c..906a3066e 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -24,7 +24,6 @@
#include "main_window.h"
#include "settings_dialog.h"
-#include "video_core/renderer_vulkan/vk_instance.h"
#ifdef ENABLE_DISCORD_RPC
#include "common/discord_rpc_handler.h"
#endif
@@ -53,20 +52,18 @@ bool MainWindow::Init() {
CreateConnects();
SetLastUsedTheme();
SetLastIconSizeBullet();
- GetPhysicalDevices();
// show ui
setMinimumSize(720, 405);
std::string window_title = "";
+ std::string remote_url(Common::g_scm_remote_url);
+ std::string remote_host = Common::GetRemoteNameFromLink();
if (Common::g_is_release) {
- window_title = fmt::format("shadPS4 v{}", Common::g_version);
- } else {
- std::string remote_url(Common::g_scm_remote_url);
- std::string remote_host;
- try {
- remote_host = remote_url.substr(19, remote_url.rfind('/') - 19);
- } catch (...) {
- remote_host = "unknown";
+ if (remote_host == "shadps4-emu" || remote_url.length() == 0) {
+ window_title = fmt::format("shadPS4 v{}", Common::g_version);
+ } else {
+ window_title = fmt::format("shadPS4 {}/v{}", remote_host, Common::g_version);
}
+ } else {
if (remote_host == "shadps4-emu" || remote_url.length() == 0) {
window_title = fmt::format("shadPS4 v{} {} {}", Common::g_version, Common::g_scm_branch,
Common::g_scm_desc);
@@ -368,19 +365,6 @@ void MainWindow::CheckUpdateMain(bool checkSave) {
}
#endif
-void MainWindow::GetPhysicalDevices() {
- Vulkan::Instance instance(false, false);
- auto physical_devices = instance.GetPhysicalDevices();
- for (const vk::PhysicalDevice physical_device : physical_devices) {
- auto prop = physical_device.getProperties();
- QString name = QString::fromUtf8(prop.deviceName, -1);
- if (prop.apiVersion < Vulkan::TargetVulkanApiVersion) {
- name += tr(" * Unsupported Vulkan Version");
- }
- m_physical_devices.push_back(name);
- }
-}
-
void MainWindow::CreateConnects() {
connect(this, &MainWindow::WindowResized, this, &MainWindow::HandleResize);
connect(ui->mw_searchbar, &QLineEdit::textChanged, this, &MainWindow::SearchGameTable);
@@ -388,16 +372,15 @@ void MainWindow::CreateConnects() {
connect(ui->refreshGameListAct, &QAction::triggered, this, &MainWindow::RefreshGameTable);
connect(ui->refreshButton, &QPushButton::clicked, this, &MainWindow::RefreshGameTable);
connect(ui->showGameListAct, &QAction::triggered, this, &MainWindow::ShowGameList);
- connect(this, &MainWindow::ExtractionFinished, this, &MainWindow::RefreshGameTable);
connect(ui->toggleLabelsAct, &QAction::toggled, this, &MainWindow::toggleLabelsUnderIcons);
connect(ui->fullscreenButton, &QPushButton::clicked, this, &MainWindow::toggleFullscreen);
connect(ui->sizeSlider, &QSlider::valueChanged, this, [this](int value) {
if (isTableList) {
m_game_list_frame->icon_size =
- 36 + value; // 36 is the minimum icon size to use due to text disappearing.
- m_game_list_frame->ResizeIcons(36 + value);
- Config::setIconSize(36 + value);
+ 48 + value; // 48 is the minimum icon size to use due to text disappearing.
+ m_game_list_frame->ResizeIcons(48 + value);
+ Config::setIconSize(48 + value);
Config::setSliderPosition(value);
} else {
m_game_grid_frame->icon_size = 69 + value;
@@ -421,7 +404,7 @@ void MainWindow::CreateConnects() {
&MainWindow::StartGame);
connect(ui->configureAct, &QAction::triggered, this, [this]() {
- auto settingsDialog = new SettingsDialog(m_physical_devices, m_compat_info, this);
+ auto settingsDialog = new SettingsDialog(m_compat_info, this);
connect(settingsDialog, &SettingsDialog::LanguageChanged, this,
&MainWindow::OnLanguageChanged);
@@ -454,7 +437,7 @@ void MainWindow::CreateConnects() {
});
connect(ui->settingsButton, &QPushButton::clicked, this, [this]() {
- auto settingsDialog = new SettingsDialog(m_physical_devices, m_compat_info, this);
+ auto settingsDialog = new SettingsDialog(m_compat_info, this);
connect(settingsDialog, &SettingsDialog::LanguageChanged, this,
&MainWindow::OnLanguageChanged);
diff --git a/src/qt_gui/main_window.h b/src/qt_gui/main_window.h
index 5d05bfca4..97c56433d 100644
--- a/src/qt_gui/main_window.h
+++ b/src/qt_gui/main_window.h
@@ -29,7 +29,6 @@ class MainWindow : public QMainWindow {
Q_OBJECT
signals:
void WindowResized(QResizeEvent* event);
- void ExtractionFinished();
public:
explicit MainWindow(QWidget* parent = nullptr);
@@ -60,7 +59,6 @@ private:
void toggleFullscreen();
void CreateRecentGameActions();
void CreateDockWindows();
- void GetPhysicalDevices();
void LoadGameLists();
#ifdef ENABLE_UPDATER
@@ -96,8 +94,6 @@ private:
QScopedPointer m_elf_viewer;
// Status Bar.
QScopedPointer statusBar;
- // Available GPU devices
- std::vector m_physical_devices;
PSF psf;
diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp
index 5ee802b0c..914cc5470 100644
--- a/src/qt_gui/settings_dialog.cpp
+++ b/src/qt_gui/settings_dialog.cpp
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
+#include
#include
#include
#include
@@ -25,6 +26,7 @@
#include "common/logging/filter.h"
#include "settings_dialog.h"
#include "ui_settings_dialog.h"
+#include "video_core/renderer_vulkan/vk_instance.h"
QStringList languageNames = {"Arabic",
"Czech",
"Danish",
@@ -67,8 +69,9 @@ QMap chooseHomeTabMap;
int backgroundImageOpacitySlider_backup;
int bgm_volume_backup;
-SettingsDialog::SettingsDialog(std::span physical_devices,
- std::shared_ptr m_compat_info,
+static std::vector m_physical_devices;
+
+SettingsDialog::SettingsDialog(std::shared_ptr m_compat_info,
QWidget* parent)
: QDialog(parent), ui(new Ui::SettingsDialog) {
ui->setupUi(this);
@@ -89,9 +92,23 @@ SettingsDialog::SettingsDialog(std::span physical_devices,
{tr("Input"), "Input"}, {tr("Paths"), "Paths"},
{tr("Debug"), "Debug"}};
+ if (m_physical_devices.empty()) {
+ // Populate cache of physical devices.
+ Vulkan::Instance instance(false, false);
+ auto physical_devices = instance.GetPhysicalDevices();
+ for (const vk::PhysicalDevice physical_device : physical_devices) {
+ auto prop = physical_device.getProperties();
+ QString name = QString::fromUtf8(prop.deviceName, -1);
+ if (prop.apiVersion < Vulkan::TargetVulkanApiVersion) {
+ name += tr(" * Unsupported Vulkan Version");
+ }
+ m_physical_devices.push_back(name);
+ }
+ }
+
// Add list of available GPUs
ui->graphicsAdapterBox->addItem(tr("Auto Select")); // -1, auto selection
- for (const auto& device : physical_devices) {
+ for (const auto& device : m_physical_devices) {
ui->graphicsAdapterBox->addItem(device);
}
diff --git a/src/qt_gui/settings_dialog.h b/src/qt_gui/settings_dialog.h
index 09aa2b855..cdf9be80e 100644
--- a/src/qt_gui/settings_dialog.h
+++ b/src/qt_gui/settings_dialog.h
@@ -20,8 +20,7 @@ class SettingsDialog;
class SettingsDialog : public QDialog {
Q_OBJECT
public:
- explicit SettingsDialog(std::span physical_devices,
- std::shared_ptr m_compat_info,
+ explicit SettingsDialog(std::shared_ptr m_compat_info,
QWidget* parent = nullptr);
~SettingsDialog();
diff --git a/src/qt_gui/translations/ar_SA.ts b/src/qt_gui/translations/ar_SA.ts
index e434b3259..26e768720 100644
--- a/src/qt_gui/translations/ar_SA.ts
+++ b/src/qt_gui/translations/ar_SA.ts
@@ -1347,10 +1347,6 @@
Game Listقائمة الألعاب
-
- * Unsupported Vulkan Version
- * إصدار Vulkan غير مدعوم
- Download Cheats For All Installed Gamesتحميل الشفرات لجميع الألعاب المثبتة
@@ -2051,6 +2047,10 @@ Nightly: نُسخ تحتوي على أحدث الميزات، لكنها أقل
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.افتح مجلد الصور/الأصوات الخاصة بالجوائز المخصصة:\nيمكنك إضافة صور مخصصة للجوائز وصوت مرفق.\nأضف الملفات إلى مجلد custom_trophy بالأسماء التالية:\ntrophy.wav أو trophy.mp3، bronze.png، gold.png، platinum.png، silver.png\nملاحظة: الصوت سيعمل فقط في الإصدارات التي تستخدم QT.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/da_DK.ts b/src/qt_gui/translations/da_DK.ts
index 131a989e1..1023c584b 100644
--- a/src/qt_gui/translations/da_DK.ts
+++ b/src/qt_gui/translations/da_DK.ts
@@ -1347,10 +1347,6 @@
Game ListSpiloversigt
-
- * Unsupported Vulkan Version
- * Ikke understøttet Vulkan-version
- Download Cheats For All Installed GamesHent snyd til alle installerede spil
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/de_DE.ts b/src/qt_gui/translations/de_DE.ts
index c7a18dd99..1d44eb717 100644
--- a/src/qt_gui/translations/de_DE.ts
+++ b/src/qt_gui/translations/de_DE.ts
@@ -1347,10 +1347,6 @@
Game ListSpieleliste
-
- * Unsupported Vulkan Version
- * Nicht unterstützte Vulkan-Version
- Download Cheats For All Installed GamesCheats für alle installierten Spiele herunterladen
@@ -2054,6 +2050,10 @@ Fügen Sie die Dateien dem Ordner custom_trophy mit folgenden Namen hinzu:\n
trophy.wav ODER trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\n
Hinweis: Der Sound funktioniert nur in Qt-Versionen.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/el_GR.ts b/src/qt_gui/translations/el_GR.ts
index c91e0c731..765185c9e 100644
--- a/src/qt_gui/translations/el_GR.ts
+++ b/src/qt_gui/translations/el_GR.ts
@@ -1347,10 +1347,6 @@
Game ListΛίστα παιχνιδιών
-
- * Unsupported Vulkan Version
- * Μη υποστηριζόμενη έκδοση Vulkan
- Download Cheats For All Installed GamesΛήψη Cheats για όλα τα εγκατεστημένα παιχνίδια
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/en_US.ts b/src/qt_gui/translations/en_US.ts
index 780f089e8..cc854120f 100644
--- a/src/qt_gui/translations/en_US.ts
+++ b/src/qt_gui/translations/en_US.ts
@@ -1347,10 +1347,6 @@
Game ListGame List
-
- * Unsupported Vulkan Version
- * Unsupported Vulkan Version
- Download Cheats For All Installed GamesDownload Cheats For All Installed Games
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/es_ES.ts b/src/qt_gui/translations/es_ES.ts
index 035aac6a3..9568388cc 100644
--- a/src/qt_gui/translations/es_ES.ts
+++ b/src/qt_gui/translations/es_ES.ts
@@ -26,7 +26,7 @@
Cheats/Patches are experimental.\nUse with caution.\n\nDownload cheats individually by selecting the repository and clicking the download button.\nIn the Patches tab, you can download all patches at once, choose which ones you want to use, and save your selection.\n\nSince we do not develop the Cheats/Patches,\nplease report issues to the cheat author.\n\nCreated a new cheat? Visit:\n
- Los cheats/patches son experimentales.\nÚselos con precaución.\n\nDescargue los cheats individualmente seleccionando el repositorio y haciendo clic en el botón de descarga.\nEn la pestaña Patches, puede descargar todos los patches a la vez, elegir cuáles desea usar y guardar la selección.\n\nComo no desarrollamos los Cheats/Patches,\npor favor informe los problemas al autor del cheat.\n\n¿Creaste un nuevo cheat? Visita:\n
+ Los trucos/parches son experimentales.\nÚselos con precaución.\n\nPuede descargar cada truco seleccionando el repositorio y haciendo clic en el botón de descarga.\nEn la pestaña Parches podrá descargar todos los parches a la vez, elegir cuáles desea usar y guardar la selección.\n\nComo no desarrollamos los trucos/parches,\ndebe informar de cualquier problema a sus autores correspondientes.\n\n¿Creaste un truco nuevo? Visita:\nNo Image Available
@@ -1347,10 +1347,6 @@
Game ListLista de Juegos
-
- * Unsupported Vulkan Version
- * Versión de Vulkan no soportada
- Download Cheats For All Installed GamesDescargar trucos para todos los juegos instalados
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Abre la carpeta de trofeos/sonidos personalizados:\nPuedes añadir imágenes y un audio personalizados a los trofeos.\nAñade los archivos a custom_trophy con los siguientes nombres:\ntrophy.wav o trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNota: El sonido sólo funcionará en versiones QT.
+
+ * Unsupported Vulkan Version
+ * Versión de Vulkan no soportada
+ TrophyViewer
diff --git a/src/qt_gui/translations/fa_IR.ts b/src/qt_gui/translations/fa_IR.ts
index 552a0ff23..b9c2282fa 100644
--- a/src/qt_gui/translations/fa_IR.ts
+++ b/src/qt_gui/translations/fa_IR.ts
@@ -1347,10 +1347,6 @@
Game Listلیست بازی
-
- * Unsupported Vulkan Version
- شما پشتیبانی نمیشود Vulkan ورژن *
- Download Cheats For All Installed Gamesدانلود چیت برای همه بازی ها
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/fi_FI.ts b/src/qt_gui/translations/fi_FI.ts
index 44c668560..c77c63b3e 100644
--- a/src/qt_gui/translations/fi_FI.ts
+++ b/src/qt_gui/translations/fi_FI.ts
@@ -1347,10 +1347,6 @@
Game ListPelilista
-
- * Unsupported Vulkan Version
- * Ei Tuettu Vulkan-versio
- Download Cheats For All Installed GamesLataa Huijaukset Kaikille Asennetuille Peleille
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/fr_FR.ts b/src/qt_gui/translations/fr_FR.ts
index 13e1be9f5..75e424ad0 100644
--- a/src/qt_gui/translations/fr_FR.ts
+++ b/src/qt_gui/translations/fr_FR.ts
@@ -1347,10 +1347,6 @@
Game ListListe de jeux
-
- * Unsupported Vulkan Version
- * Version de Vulkan non prise en charge
- Download Cheats For All Installed GamesTélécharger les Cheats pour tous les jeux installés
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Ouvrez le dossier des images/sons des trophées personnalisés:\nVous pouvez ajouter des images personnalisées aux trophées et aux sons.\nAjoutez les fichiers à custom_trophy avec les noms suivants:\ntrophy.wav OU trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote : Le son ne fonctionnera que dans les versions QT.
+
+ * Unsupported Vulkan Version
+ * Version de Vulkan non prise en charge
+ TrophyViewer
diff --git a/src/qt_gui/translations/hu_HU.ts b/src/qt_gui/translations/hu_HU.ts
index 58857d0d7..e396cc4f5 100644
--- a/src/qt_gui/translations/hu_HU.ts
+++ b/src/qt_gui/translations/hu_HU.ts
@@ -1347,10 +1347,6 @@
Game ListJátéklista
-
- * Unsupported Vulkan Version
- * Nem támogatott Vulkan verzió
- Download Cheats For All Installed GamesCsalások letöltése minden telepített játékhoz
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/id_ID.ts b/src/qt_gui/translations/id_ID.ts
index de19824f7..b4fe48637 100644
--- a/src/qt_gui/translations/id_ID.ts
+++ b/src/qt_gui/translations/id_ID.ts
@@ -1347,10 +1347,6 @@
Game ListDaftar game
-
- * Unsupported Vulkan Version
- * Versi Vulkan Tidak Didukung
- Download Cheats For All Installed GamesUnduh Cheat Untuk Semua Game Yang Terpasang
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/it_IT.ts b/src/qt_gui/translations/it_IT.ts
index 8c9e53611..a1aa0bb3f 100644
--- a/src/qt_gui/translations/it_IT.ts
+++ b/src/qt_gui/translations/it_IT.ts
@@ -1347,10 +1347,6 @@
Game ListElenco giochi
-
- * Unsupported Vulkan Version
- * Versione Vulkan non supportata
- Download Cheats For All Installed GamesScarica Trucchi per tutti i giochi installati
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Apri la cartella personalizzata delle immagini/suoni trofei:\nÈ possibile aggiungere immagini personalizzate ai trofei e un audio.\nAggiungi i file a custom_trophy con i seguenti nomi:\ntrophy.wav OPPURE trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNota: Il suono funzionerà solo nelle versioni QT.
+
+ * Unsupported Vulkan Version
+ * Versione Vulkan non supportata
+ TrophyViewer
diff --git a/src/qt_gui/translations/ja_JP.ts b/src/qt_gui/translations/ja_JP.ts
index 146caa515..7bd7fed8a 100644
--- a/src/qt_gui/translations/ja_JP.ts
+++ b/src/qt_gui/translations/ja_JP.ts
@@ -1347,10 +1347,6 @@
Game Listゲームリスト
-
- * Unsupported Vulkan Version
- * サポートされていないVulkanバージョン
- Download Cheats For All Installed Gamesすべてのインストール済みゲームのチートをダウンロード
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/ko_KR.ts b/src/qt_gui/translations/ko_KR.ts
index b79959d38..6e5b232a0 100644
--- a/src/qt_gui/translations/ko_KR.ts
+++ b/src/qt_gui/translations/ko_KR.ts
@@ -7,15 +7,15 @@
AboutDialogAbout shadPS4
- About shadPS4
+ shadPS4에 관하여shadPS4 is an experimental open-source emulator for the PlayStation 4.
- shadPS4 is an experimental open-source emulator for the PlayStation 4.
+ shadPS4는 PlayStation 4용 실험적인 오픈 소스 에뮬레이터입니다.This software should not be used to play games you have not legally obtained.
- This software should not be used to play games you have not legally obtained.
+ 이 소프트웨어는 합법적으로 얻지 않은 게임을 플레이하는 데 사용되어서는 안 됩니다.
@@ -26,238 +26,238 @@
Cheats/Patches are experimental.\nUse with caution.\n\nDownload cheats individually by selecting the repository and clicking the download button.\nIn the Patches tab, you can download all patches at once, choose which ones you want to use, and save your selection.\n\nSince we do not develop the Cheats/Patches,\nplease report issues to the cheat author.\n\nCreated a new cheat? Visit:\n
- Cheats/Patches are experimental.\nUse with caution.\n\nDownload cheats individually by selecting the repository and clicking the download button.\nIn the Patches tab, you can download all patches at once, choose which ones you want to use, and save your selection.\n\nSince we do not develop the Cheats/Patches,\nplease report issues to the cheat author.\n\nCreated a new cheat? Visit:\n
+ 치트/패치는 실험적인 기능입니다.\n사용 시 주의하시기 바랍니다.\n\n치트를 개별적으로 다운로드하려면, 저장소를 선택한 후 다운로드 버튼을 클릭하세요.\n패치 탭에서는 모든 패치를 한 번에 다운로드할 수 있으며, 원하는 항목을 선택하고 저장할 수 있습니다.\n\n치트/패치는 저희가 개발한 것이 아니므로,\n문제가 발생하면 해당 치트 제작자에게 문의해 주세요.\n\n새로운 치트를 만들었나요? 방문해 주세요:\nNo Image Available
- No Image Available
+ 사용 가능한 이미지 없음Serial:
- Serial:
+ 시리얼: Version:
- Version:
+ 버전: Size:
- Size:
+ 사이즈: Select Cheat File:
- Select Cheat File:
+ 치트 파일 선택:Repository:
- Repository:
+ 저장소:Download Cheats
- Download Cheats
+ 치트 다운로드Delete File
- Delete File
+ 파일 삭제No files selected.
- No files selected.
+ 파일 선택되지 않음.You can delete the cheats you don't want after downloading them.
- You can delete the cheats you don't want after downloading them.
+ 다운로드한 후 원하지 않는 치트는 삭제할 수 있습니다.Do you want to delete the selected file?\n%1
- Do you want to delete the selected file?\n%1
+ 선택한 파일을 삭제하시겠습니까?\n%1Select Patch File:
- Select Patch File:
+ 패치 파일 선택:Download Patches
- Download Patches
+ 패치 다운로드Save
- Save
+ 저장Cheats
- Cheats
+ 치트Patches
- Patches
+ 패치Error
- Error
+ 오류No patch selected.
- No patch selected.
+ 패치 선택되지 않음.Unable to open files.json for reading.
- Unable to open files.json for reading.
+ Files.json을 읽기 위해 열 수 없습니다.No patch file found for the current serial.
- No patch file found for the current serial.
+ 현재 시리얼에 해당하는 패치 파일을 찾을 수 없습니다.Unable to open the file for reading.
- Unable to open the file for reading.
+ 파일을 읽기 위해 열 수 없습니다.Unable to open the file for writing.
- Unable to open the file for writing.
+ 파일을 쓰기 위해 열 수 없습니다.Failed to parse XML:
- Failed to parse XML:
+ XML 구문 분석에 실패했습니다: Success
- Success
+ 성공Options saved successfully.
- Options saved successfully.
+ 옵션이 성공적으로 저장되었습니다.Invalid Source
- Invalid Source
+ 잘못된 출처The selected source is invalid.
- The selected source is invalid.
+ 선택한 출처가 올바르지 않습니다.File Exists
- File Exists
+ 파일이 이미 존재합니다File already exists. Do you want to replace it?
- File already exists. Do you want to replace it?
+ 파일이 이미 존재합니다. 덮어쓰시겠습니까?Failed to save file:
- Failed to save file:
+ 파일 저장 실패:Failed to download file:
- Failed to download file:
+ 파일 다운로드 실패:Cheats Not Found
- Cheats Not Found
+ 치트 찾을 수 없음No Cheats found for this game in this version of the selected repository,try another repository or a different version of the game.
- No Cheats found for this game in this version of the selected repository,try another repository or a different version of the game.
+ 선택한 저장소의 이 버전에서 해당 게임에 대한 치트를 찾을 수 없습니다. 다른 저장소나 게임의 다른 버전을 시도해 보세요.Cheats Downloaded Successfully
- Cheats Downloaded Successfully
+ 치트가 성공적으로 다운로드되었습니다You have successfully downloaded the cheats for this version of the game from the selected repository. You can try downloading from another repository, if it is available it will also be possible to use it by selecting the file from the list.
- You have successfully downloaded the cheats for this version of the game from the selected repository. You can try downloading from another repository, if it is available it will also be possible to use it by selecting the file from the list.
+ 선택한 저장소에서 이 게임 버전의 치트를 성공적으로 다운로드했습니다. 다른 저장소에서 다운로드할 수 있는 경우, 목록에서 파일을 선택하여 사용할 수도 있습니다.Failed to save:
- Failed to save:
+ 저장 실패:Failed to download:
- Failed to download:
+ 다운로드 실패:Download Complete
- Download Complete
+ 다운로드 완료Patches Downloaded Successfully! All Patches available for all games have been downloaded, there is no need to download them individually for each game as happens in Cheats. If the patch does not appear, it may be that it does not exist for the specific serial and version of the game.
- Patches Downloaded Successfully! All Patches available for all games have been downloaded, there is no need to download them individually for each game as happens in Cheats. If the patch does not appear, it may be that it does not exist for the specific serial and version of the game.
+ 패치가 성공적으로 다운로드되었습니다! 모든 게임에 적용 가능한 모든 패치가 다운로드되었으므로, 치트처럼 각 게임마다 개별적으로 다운로드할 필요가 없습니다. 만약 패치가 나타나지 않는다면, 해당 게임의 특정 시리얼 및 버전에 해당 패치가 없기 때문일 수 있습니다.Failed to parse JSON data from HTML.
- Failed to parse JSON data from HTML.
+ HTML에서 JSON 데이터를 구문 분석하는 데 실패했습니다.Failed to retrieve HTML page.
- Failed to retrieve HTML page.
+ HTML 페이지를 가져오지 못했습니다.The game is in version: %1
- The game is in version: %1
+ 게임 버전: %1The downloaded patch only works on version: %1
- The downloaded patch only works on version: %1
+ 다운로드한 패치는 버전 %1 에서만 작동합니다.You may need to update your game.
- You may need to update your game.
+ 게임을 업데이트해야 할 수도 있습니다.Incompatibility Notice
- Incompatibility Notice
+ 호환성 경고Failed to open file:
- Failed to open file:
+ 파일을 열지 못했습니다:XML ERROR:
- XML ERROR:
+ XML 오류:Failed to open files.json for writing
- Failed to open files.json for writing
+ files.json 파일을 쓰기 위해 열지 못했습니다Author:
- Author:
+ 제작자: Directory does not exist:
- Directory does not exist:
+ 디렉터리가 존재하지 않습니다:Failed to open files.json for reading.
- Failed to open files.json for reading.
+ files.json 파일을 읽기 위해 열지 못했습니다.Name:
- Name:
+ 이름:Can't apply cheats before the game is started
- Can't apply cheats before the game is started
+ 게임이 시작되기 전에 치트를 적용할 수 없습니다Close
- Close
+ 닫기CheckUpdateAuto Updater
- Auto Updater
+ 자동 업데이트Error
- Error
+ 오류Network error:
- Network error:
+ 네트워크 오류:The Auto Updater allows up to 60 update checks per hour.\nYou have reached this limit. Please try again later.
@@ -265,91 +265,91 @@
Failed to parse update information.
- Failed to parse update information.
+ 업데이트 정보 구문 분석에 실패했습니다.No pre-releases found.
- No pre-releases found.
+ 사전 릴리스가 없습니다.Invalid release data.
- Invalid release data.
+ 잘못된 릴리스 데이터입니다.No download URL found for the specified asset.
- No download URL found for the specified asset.
+ 지정된 자산에 대한 다운로드 URL을 찾을 수 없습니다.Your version is already up to date!
- Your version is already up to date!
+ 버전이 이미 최신입니다!Update Available
- Update Available
+ 업데이트 가능Update Channel
- Update Channel
+ 업데이트 채널Current Version
- Current Version
+ 현재 버전Latest Version
- Latest Version
+ 최신 버전Do you want to update?
- Do you want to update?
+ 업데이트하시겠습니까?Show Changelog
- Show Changelog
+ 변경 사항 보기Check for Updates at Startup
- Check for Updates at Startup
+ 시작할 때 업데이트 확인Update
- Update
+ 업데이트No
- No
+ 아니요Hide Changelog
- Hide Changelog
+ 변경 사항 숨기기Changes
- Changes
+ 변경 사항Network error occurred while trying to access the URL
- Network error occurred while trying to access the URL
+ URL에 접근하는 동안 네트워크 오류가 발생했습니다Download Complete
- Download Complete
+ 다운로드 완료The update has been downloaded, press OK to install.
- The update has been downloaded, press OK to install.
+ 업데이트가 다운로드 되었습니다. 설치하려면 확인을 눌러주세요.Failed to save the update file at
- Failed to save the update file at
+ 업데이트 파일을 다음 위치에 저장하지 못했습니다Starting Update...
- Starting Update...
+ 업데이트를 시작합니다...Failed to create the update script file
- Failed to create the update script file
+ 업데이트 스크립트 파일을 생성하지 못했습니다
@@ -407,83 +407,83 @@
ControlSettingsConfigure Controls
- Configure Controls
+ 컨트롤 설정D-Pad
- D-Pad
+ D-패드Up
- Up
+ 위Left
- Left
+ 왼쪽Right
- Right
+ 오른쪽Down
- Down
+ 아래Left Stick Deadzone (def:2 max:127)
- Left Stick Deadzone (def:2 max:127)
+ 왼쪽 스틱 데드존 (기본값:2 최대값:127)Left Deadzone
- Left Deadzone
+ 왼쪽 데드존Left Stick
- Left Stick
+ 왼쪽 스틱Config Selection
- Config Selection
+ 설정 선택Common Config
- Common Config
+ 공통 설정Use per-game configs
- Use per-game configs
+ 게임 별 설정 사용L1 / LB
- L1 / LB
+ L1 / LBL2 / LT
- L2 / LT
+ L2 / LTBack
- Back
+ 뒤로R1 / RB
- R1 / RB
+ R1 / RBR2 / RT
- R2 / RT
+ R2 / RTL3
- L3
+ L3Options / Start
- Options / Start
+ 옵션 / 시작R3
- R3
+ R3Face Buttons
@@ -1347,10 +1347,6 @@
Game ListGame List
-
- * Unsupported Vulkan Version
- * Unsupported Vulkan Version
- Download Cheats For All Installed GamesDownload Cheats For All Installed Games
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/lt_LT.ts b/src/qt_gui/translations/lt_LT.ts
index 03ff5a003..a0b047dbb 100644
--- a/src/qt_gui/translations/lt_LT.ts
+++ b/src/qt_gui/translations/lt_LT.ts
@@ -1347,10 +1347,6 @@
Game ListŽaidimų sąrašas
-
- * Unsupported Vulkan Version
- * Nepalaikoma Vulkan versija
- Download Cheats For All Installed GamesAtsisiųsti sukčiavimus visiems įdiegtiems žaidimams
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/nb_NO.ts b/src/qt_gui/translations/nb_NO.ts
index e937287fd..cb209cfb1 100644
--- a/src/qt_gui/translations/nb_NO.ts
+++ b/src/qt_gui/translations/nb_NO.ts
@@ -1253,11 +1253,11 @@
List View
- Liste-visning
+ ListevisningGrid View
- Rute-visning
+ RutenettvisningElf Viewer
@@ -1347,10 +1347,6 @@
Game ListSpilliste
-
- * Unsupported Vulkan Version
- * Ustøttet Vulkan-versjon
- Download Cheats For All Installed GamesLast ned juks for alle installerte spill
@@ -1760,7 +1756,7 @@
Log Filter:\nFilters the log to only print specific information.\nExamples: "Core:Trace" "Lib.Pad:Debug Common.Filesystem:Error" "*:Critical"\nLevels: Trace, Debug, Info, Warning, Error, Critical - in this order, a specific level silences all levels preceding it in the list and logs every level after it.
- Loggfilter:\nFiltrerer loggen for å kun skrive ut spesifikk informasjon.\nEksempler: "Core:Trace" "Lib.Pad:Debug Common.Filesystem:Error" "*:Critical" \nNivåer: Trace, Debug, Info, Warning, Error, Critical - i denne rekkefølgen, et spesifikt nivå demper alle tidligere nivåer i lista og loggfører alle nivåer etter det.
+ Loggfilter:\nFiltrerer loggen for å kun skrive ut spesifikk informasjon.\nEksempler: «Core:Trace» «Lib.Pad:Debug Common.Filesystem:Error» «*:Critical» \nNivåer: Trace, Debug, Info, Warning, Error, Critical - i denne rekkefølgen, et spesifikt nivå demper alle tidligere nivåer i lista og loggfører alle nivåer etter det.Update:\nRelease: Official versions released every month that may be very outdated, but are more reliable and tested.\nNightly: Development versions that have all the latest features and fixes, but may contain bugs and are less stable.
@@ -1792,7 +1788,7 @@
Display Compatibility Data:\nDisplays game compatibility information in table view. Enable "Update Compatibility On Startup" to get up-to-date information.
- Vis kompatibilitets-data:\nViser informasjon om spillkompatibilitet i tabellvisning. Bruk "Oppdater kompatibilitets-data ved oppstart" for oppdatert informasjon.
+ Vis kompatibilitets-data:\nViser informasjon om spillkompatibilitet i tabellvisning. Bruk «Oppdater database ved oppstart» for oppdatert informasjon.Update Compatibility On Startup:\nAutomatically update the compatibility database when shadPS4 starts.
@@ -1832,7 +1828,7 @@
Graphics Device:\nOn multiple GPU systems, select the GPU the emulator will use from the drop down list,\nor select "Auto Select" to automatically determine it.
- Grafikkenhet:\nSystemer med flere GPU-er, kan emulatoren velge hvilken enhet som skal brukes fra rullegardinlista,\neller velg "Velg automatisk".
+ Grafikkenhet:\nSystemer med flere GPU-er, kan emulatoren velge hvilken enhet som skal brukes fra rullegardinlista,\neller bruk «Velg automatisk».Width/Height:\nSets the size of the emulator window at launch, which can be resized during gameplay.\nThis is different from the in-game resolution.
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Åpne mappa med tilpassede bilder og lyder for trofé:\nDu kan legge til tilpassede bilder til trofeer og en lyd.\nLegg filene til custom_trophy med følgende navn:\ntrophy.wav ELLER trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nMerk: Lyden avspilles kun i Qt-versjonen.
+
+ * Unsupported Vulkan Version
+ *Ustøttet Vulkan-versjon
+ TrophyViewer
diff --git a/src/qt_gui/translations/nl_NL.ts b/src/qt_gui/translations/nl_NL.ts
index 2d75b74eb..ec676d360 100644
--- a/src/qt_gui/translations/nl_NL.ts
+++ b/src/qt_gui/translations/nl_NL.ts
@@ -1347,10 +1347,6 @@
Game ListLijst met spellen
-
- * Unsupported Vulkan Version
- * Niet ondersteunde Vulkan-versie
- Download Cheats For All Installed GamesDownload cheats voor alle geïnstalleerde spellen
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/pl_PL.ts b/src/qt_gui/translations/pl_PL.ts
index bd59a1894..c1343cd2e 100644
--- a/src/qt_gui/translations/pl_PL.ts
+++ b/src/qt_gui/translations/pl_PL.ts
@@ -1347,10 +1347,6 @@
Game ListLista gier
-
- * Unsupported Vulkan Version
- * Nieobsługiwana wersja Vulkan
- Download Cheats For All Installed GamesPobierz kody do wszystkich zainstalowanych gier
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Otwórz niestandardowy folder obrazów/dźwięków:\nMożesz dodać własne obrazy dla trofeów i ich dźwięki.\nDodaj pliki do custom_trophy o następujących nazwach:\ntrophy.wav LUB trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nUwaga: Dźwięki działają tylko w wersji QT.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/pt_BR.ts b/src/qt_gui/translations/pt_BR.ts
index 584d6dc19..9f254e272 100644
--- a/src/qt_gui/translations/pt_BR.ts
+++ b/src/qt_gui/translations/pt_BR.ts
@@ -1347,10 +1347,6 @@
Game ListLista de Jogos
-
- * Unsupported Vulkan Version
- * Versão Vulkan não suportada
- Download Cheats For All Installed GamesBaixar Trapaças para Todos os Jogos Instalados
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Abrir a pasta de imagens e sons de troféus personalizados:\nVocê pode adicionar imagens personalizadas aos troféus e um áudio.\nAdicione os arquivos na pasta custom_trophy com os seguintes nomes:\ntrophy.wav OU trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nObservação: O som funcionará apenas em versões Qt.
+
+ * Unsupported Vulkan Version
+ * Versão do Vulkan não suportada
+ TrophyViewer
diff --git a/src/qt_gui/translations/pt_PT.ts b/src/qt_gui/translations/pt_PT.ts
index 70a73afe7..a543d0ec3 100644
--- a/src/qt_gui/translations/pt_PT.ts
+++ b/src/qt_gui/translations/pt_PT.ts
@@ -543,7 +543,7 @@
Unable to Save
- Não é possível salvar
+ Não foi possível guardarCannot bind axis values more than once
@@ -551,7 +551,7 @@
Save
- Salvar
+ GuardarApply
@@ -559,7 +559,7 @@
Restore Defaults
- Restaurar o Padrão
+ Restaurar PredefiniçõesCancel
@@ -570,11 +570,11 @@
EditorDialogEdit Keyboard + Mouse and Controller input bindings
- Editar comandos do Teclado + Mouse e do Controle
+ Editar configurações de entrada do Teclado + Rato e do ComandoUse Per-Game configs
- Use uma configuração para cada jogo
+ Utilizar configurações por jogoError
@@ -582,19 +582,19 @@
Could not open the file for reading
- Não foi possível abrir o arquivo para ler
+ Não foi possível abrir o ficheiro para leituraCould not open the file for writing
- Não foi possível abrir o arquivo para escrever
+ Não foi possível abrir o ficheiro para escritaSave Changes
- Salvar mudanças
+ Guardar as alteraçõesDo you want to save changes?
- Salvar as mudanças?
+ Pretende guardar as alterações?Help
@@ -610,7 +610,7 @@
Reset to Default
- Resetar ao Padrão
+ Repor para o Padrão
@@ -1150,7 +1150,7 @@
Unable to Save
- Não é possível salvar
+ Não foi possível guardarCannot bind any unique input more than once
@@ -1166,11 +1166,11 @@
Mousewheel cannot be mapped to stick outputs
- Roda do rato não pode ser mapeada para saídas empates
+ Roda do rato não pode ser mapeada para saídas dos manípulosSave
- Salvar
+ GuardarApply
@@ -1178,7 +1178,7 @@
Restore Defaults
- Restaurar Definições
+ Restaurar PredefiniçõesCancel
@@ -1347,10 +1347,6 @@
Game ListLista de Jogos
-
- * Unsupported Vulkan Version
- * Versão do Vulkan não suportada
- Download Cheats For All Installed GamesTransferir Cheats para Todos os Jogos Instalados
@@ -1409,43 +1405,43 @@
Play
- Play
+ ReproduzirPause
- Pause
+ PausaStop
- Stop
+ PararRestart
- Restart
+ ReiniciarFull Screen
- Full Screen
+ Ecrã InteiroControllers
- Controllers
+ ComandosKeyboard
- Keyboard
+ TecladoRefresh List
- Refresh List
+ Atualizar ListaResume
- Resume
+ ContinuarShow Labels Under Icons
- Show Labels Under Icons
+ Mostrar Etiquetas Debaixo dos Ícones
@@ -2032,7 +2028,7 @@
Cannot create portable user folder
- Não é possível criar pasta de utilizador portátil
+ Não foi possível criar pasta de utilizador portátil%1 already exists
@@ -2048,7 +2044,11 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
- Abra a pasta de imagens/sons de troféus personalizados:\nPoderá adicionar imagens personalizadas aos troféus e um áudio.\nAdicione os arquivos na pasta custom_trophy com os seguintes nomes:\ntrophy.mp3 ou trophy.wav, bronze.png, gold.png, platinum.png, silver.png\nObservação: O som funcionará apenas nas versões Qt.
+ Abra a pasta de imagens/sons de troféus personalizados:\nPoderá adicionar imagens personalizadas aos troféus e um áudio.\nAdicione os ficheiros na pasta custom_trophy com os seguintes nomes:\ntrophy.mp3 ou trophy.wav, bronze.png, gold.png, platinum.png, silver.png\nObservação: O som funcionará apenas nas versões Qt.
+
+
+ * Unsupported Vulkan Version
+ * Versão do Vulkan não suportada
diff --git a/src/qt_gui/translations/ro_RO.ts b/src/qt_gui/translations/ro_RO.ts
index 78dd79c53..a05bb06a8 100644
--- a/src/qt_gui/translations/ro_RO.ts
+++ b/src/qt_gui/translations/ro_RO.ts
@@ -1347,10 +1347,6 @@
Game ListLista jocurilor
-
- * Unsupported Vulkan Version
- * Versiune Vulkan nesuportată
- Download Cheats For All Installed GamesDescarcă Cheats pentru toate jocurile instalate
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/ru_RU.ts b/src/qt_gui/translations/ru_RU.ts
index 0f16efc2c..a56127ece 100644
--- a/src/qt_gui/translations/ru_RU.ts
+++ b/src/qt_gui/translations/ru_RU.ts
@@ -1347,10 +1347,6 @@
Game ListСписок игр
-
- * Unsupported Vulkan Version
- * Неподдерживаемая версия Vulkan
- Download Cheats For All Installed GamesСкачать читы для всех установленных игр
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Открыть папку с пользовательскими изображениями/звуками трофеев:\nВы можете добавить пользовательские изображения к трофеям и аудио.\nДобавьте файлы в custom_trophy со следующими именами:\ntrophy.wav ИЛИ trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nПримечание: звук будет работать только в QT-версии.
+
+ * Unsupported Vulkan Version
+ * Неподдерживаемая версия Vulkan
+ TrophyViewer
diff --git a/src/qt_gui/translations/sl_SI.ts b/src/qt_gui/translations/sl_SI.ts
index ab61a5d3a..47c5f5534 100644
--- a/src/qt_gui/translations/sl_SI.ts
+++ b/src/qt_gui/translations/sl_SI.ts
@@ -1347,10 +1347,6 @@
Game ListGame List
-
- * Unsupported Vulkan Version
- * Unsupported Vulkan Version
- Download Cheats For All Installed GamesDownload Cheats For All Installed Games
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/sq_AL.ts b/src/qt_gui/translations/sq_AL.ts
index 50314a9b2..c554a283a 100644
--- a/src/qt_gui/translations/sq_AL.ts
+++ b/src/qt_gui/translations/sq_AL.ts
@@ -1347,10 +1347,6 @@
Game ListLista e lojërave
-
- * Unsupported Vulkan Version
- * Version i pambështetur i Vulkan
- Download Cheats For All Installed GamesShkarko mashtrime për të gjitha lojërat e instaluara
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Hap dosjen e imazheve/tingujve të trofeve të personalizuar:\nMund të shtosh imazhe të personalizuara për trofetë dhe një audio.\nShto skedarët në dosjen custom_trophy me emrat që vijojnë:\ntrophy.wav ose trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nShënim: Tingulli do të punojë vetëm në versionet QT.
+
+ * Unsupported Vulkan Version
+ * Version i pambështetur i Vulkan
+ TrophyViewer
diff --git a/src/qt_gui/translations/sv_SE.ts b/src/qt_gui/translations/sv_SE.ts
index ce0da785c..b8fab701c 100644
--- a/src/qt_gui/translations/sv_SE.ts
+++ b/src/qt_gui/translations/sv_SE.ts
@@ -1347,10 +1347,6 @@
Game ListSpellista
-
- * Unsupported Vulkan Version
- * Vulkan-versionen stöds inte
- Download Cheats For All Installed GamesHämta fusk för alla installerade spel
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Öppna mappen för anpassade trofébilder/ljud:\nDu kan lägga till egna bilder till troféerna och ett ljud.\nLägg till filerna i custom_trophy med följande namn:\ntrophy.wav ELLER trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nObservera: Ljudet fungerar endast i QT-versioner.
+
+ * Unsupported Vulkan Version
+ * Versionen av Vulkan stöds inte
+ TrophyViewer
diff --git a/src/qt_gui/translations/tr_TR.ts b/src/qt_gui/translations/tr_TR.ts
index f5f7b65e5..c6d641470 100644
--- a/src/qt_gui/translations/tr_TR.ts
+++ b/src/qt_gui/translations/tr_TR.ts
@@ -138,7 +138,7 @@
File Exists
- Dosya mevcut
+ Dosya MevcutFile already exists. Do you want to replace it?
@@ -1221,7 +1221,7 @@
Exit shadPS4
- shadPS4'ten Çık
+ shadPS4 ÇıkışExit the application.
@@ -1347,10 +1347,6 @@
Game ListOyun Listesi
-
- * Unsupported Vulkan Version
- * Desteklenmeyen Vulkan Sürümü
- Download Cheats For All Installed GamesTüm Yüklenmiş Oyunlar İçin Hileleri İndir
@@ -1385,7 +1381,7 @@
Game Boot
- Oyun Başlatma
+ Oyun BaşlatOnly one file can be selected!
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Özel kupa görüntüleri/sesleri klasörünü aç:\nKupalara özel görüntüler ve sesler ekleyebilirsiniz.\nDosyaları aşağıdaki adlarla custom_trophy'ye ekleyin:\ntrophy.wav ya da trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNot: Ses yalnızca QT sürümlerinde çalışacaktır.
+
+ * Unsupported Vulkan Version
+ * Desteklenmeyen Vulkan Sürümü
+ TrophyViewer
diff --git a/src/qt_gui/translations/uk_UA.ts b/src/qt_gui/translations/uk_UA.ts
index 3eb88bcab..8b83ae62f 100644
--- a/src/qt_gui/translations/uk_UA.ts
+++ b/src/qt_gui/translations/uk_UA.ts
@@ -1347,10 +1347,6 @@
Game ListСписок ігор
-
- * Unsupported Vulkan Version
- * Непідтримувана версія Vulkan
- Download Cheats For All Installed GamesЗавантажити чити для усіх встановлених ігор
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Відкрити папку користувацьких зображень трофеїв/звуків:\nВи можете додати користувацькі зображення до трофеїв та звук.\nДодайте файли до теки custom_trophy з такими назвами:\ntrophy.wav АБО trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nПримітка: Звук буде працювати лише у версіях ShadPS4 з графічним інтерфейсом.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/vi_VN.ts b/src/qt_gui/translations/vi_VN.ts
index c657888bf..1e26f626c 100644
--- a/src/qt_gui/translations/vi_VN.ts
+++ b/src/qt_gui/translations/vi_VN.ts
@@ -1347,10 +1347,6 @@
Game ListDanh sách trò chơi
-
- * Unsupported Vulkan Version
- * Phiên bản Vulkan không được hỗ trợ
- Download Cheats For All Installed GamesTải xuống cheat cho tất cả các trò chơi đã cài đặt
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/qt_gui/translations/zh_CN.ts b/src/qt_gui/translations/zh_CN.ts
index 120310810..2bc635c41 100644
--- a/src/qt_gui/translations/zh_CN.ts
+++ b/src/qt_gui/translations/zh_CN.ts
@@ -1347,10 +1347,6 @@
Game List游戏列表
-
- * Unsupported Vulkan Version
- * 不支持的 Vulkan 版本
- Download Cheats For All Installed Games下载所有已安装游戏的作弊码
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.打开自定义奖杯图像/声音文件夹：\n您可以自定义奖杯图像和声音。\n将文件添加到 custom_trophy 文件夹中，文件名如下：\ntrophy.wav 或 trophy.mp3、bronze.png、gold.png、platinum.png、silver.png。\n注意：自定义声音只能在 QT 版本中生效。
+
+ * Unsupported Vulkan Version
+ * 不支持的 Vulkan 版本
+ TrophyViewer
diff --git a/src/qt_gui/translations/zh_TW.ts b/src/qt_gui/translations/zh_TW.ts
index bd051651d..320f73c83 100644
--- a/src/qt_gui/translations/zh_TW.ts
+++ b/src/qt_gui/translations/zh_TW.ts
@@ -1347,10 +1347,6 @@
Game List遊戲列表
-
- * Unsupported Vulkan Version
- * 不支援的 Vulkan 版本
- Download Cheats For All Installed Games下載所有已安裝遊戲的金手指
@@ -2050,6 +2046,10 @@
Open the custom trophy images/sounds folder:\nYou can add custom images to the trophies and an audio.\nAdd the files to custom_trophy with the following names:\ntrophy.wav OR trophy.mp3, bronze.png, gold.png, platinum.png, silver.png\nNote: The sound will only work in QT versions.開啟自訂獎盃影像/聲音資料夾：\n您可以將自訂影像新增至獎盃和音訊。 \n將檔案加入 custom_tropy，名稱如下：\ntropy.wav OR trophy.mp3、bronze.png、gold.png、platinum.png、silver.png\n注意：聲音僅在 QT 版本中有效。
+
+ * Unsupported Vulkan Version
+ * Unsupported Vulkan Version
+ TrophyViewer
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
index 9ebb842cc..f2e6279f4 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@@ -154,6 +154,7 @@ void Traverse(EmitContext& ctx, const IR::Program& program) {
for (IR::Inst& inst : node.data.block->Instructions()) {
EmitInst(ctx, &inst);
}
+ ctx.first_to_last_label_map[label.value] = ctx.last_label;
break;
}
case IR::AbstractSyntaxNode::Type::If: {
@@ -298,6 +299,10 @@ void SetupCapabilities(const Info& info, const Profile& profile, EmitContext& ct
if (stage == LogicalStage::TessellationControl || stage == LogicalStage::TessellationEval) {
ctx.AddCapability(spv::Capability::Tessellation);
}
+ if (info.dma_types != IR::Type::Void) {
+ ctx.AddCapability(spv::Capability::PhysicalStorageBufferAddresses);
+ ctx.AddExtension("SPV_KHR_physical_storage_buffer");
+ }
}
void DefineEntryPoint(const Info& info, EmitContext& ctx, Id main) {
@@ -387,7 +392,7 @@ void SetupFloatMode(EmitContext& ctx, const Profile& profile, const RuntimeInfo&
void PatchPhiNodes(const IR::Program& program, EmitContext& ctx) {
auto inst{program.blocks.front()->begin()};
size_t block_index{0};
- ctx.PatchDeferredPhi([&](size_t phi_arg) {
+ ctx.PatchDeferredPhi([&](u32 phi_arg, Id first_parent) {
if (phi_arg == 0) {
++inst;
if (inst == program.blocks[block_index]->end() ||
@@ -398,7 +403,9 @@ void PatchPhiNodes(const IR::Program& program, EmitContext& ctx) {
} while (inst->GetOpcode() != IR::Opcode::Phi);
}
}
- return ctx.Def(inst->Arg(phi_arg));
+ const Id arg = ctx.Def(inst->Arg(phi_arg));
+ const Id parent = ctx.first_to_last_label_map[first_parent.value];
+ return std::make_pair(arg, parent);
});
}
} // Anonymous namespace
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_atomic.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_atomic.cpp
index c3799fb4b..d7c73ca8f 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_atomic.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_atomic.cpp
@@ -60,7 +60,7 @@ Id BufferAtomicU32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id
address = ctx.OpIAdd(ctx.U32[1], address, buffer.offset);
}
const Id index = ctx.OpShiftRightLogical(ctx.U32[1], address, ctx.ConstU32(2u));
- const auto [id, pointer_type] = buffer[EmitContext::BufferAlias::U32];
+ const auto [id, pointer_type] = buffer[EmitContext::PointerType::U32];
const Id ptr = ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, index);
const auto [scope, semantics]{AtomicArgs(ctx)};
return BufferAtomicU32BoundsCheck(ctx, index, buffer.size_dwords, [&] {
@@ -257,7 +257,7 @@ Id EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id co
Id EmitDataAppend(EmitContext& ctx, u32 gds_addr, u32 binding) {
const auto& buffer = ctx.buffers[binding];
- const auto [id, pointer_type] = buffer[EmitContext::BufferAlias::U32];
+ const auto [id, pointer_type] = buffer[EmitContext::PointerType::U32];
const Id ptr = ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, ctx.ConstU32(gds_addr));
const auto [scope, semantics]{AtomicArgs(ctx)};
return ctx.OpAtomicIIncrement(ctx.U32[1], ptr, scope, semantics);
@@ -265,7 +265,7 @@ Id EmitDataAppend(EmitContext& ctx, u32 gds_addr, u32 binding) {
Id EmitDataConsume(EmitContext& ctx, u32 gds_addr, u32 binding) {
const auto& buffer = ctx.buffers[binding];
- const auto [id, pointer_type] = buffer[EmitContext::BufferAlias::U32];
+ const auto [id, pointer_type] = buffer[EmitContext::PointerType::U32];
const Id ptr = ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, ctx.ConstU32(gds_addr));
const auto [scope, semantics]{AtomicArgs(ctx)};
return ctx.OpAtomicIDecrement(ctx.U32[1], ptr, scope, semantics);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
index 83e8afd78..658d4759f 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "common/assert.h"
+#include "common/logging/log.h"
#include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
#include "shader_recompiler/backend/spirv/spirv_emit_context.h"
#include "shader_recompiler/ir/attribute.h"
@@ -160,32 +161,37 @@ void EmitGetGotoVariable(EmitContext&) {
UNREACHABLE_MSG("Unreachable instruction");
}
-using BufferAlias = EmitContext::BufferAlias;
+using PointerType = EmitContext::PointerType;
-Id EmitReadConst(EmitContext& ctx, IR::Inst* inst) {
+Id EmitReadConst(EmitContext& ctx, IR::Inst* inst, Id addr, Id offset) {
const u32 flatbuf_off_dw = inst->Flags();
- const auto& srt_flatbuf = ctx.buffers.back();
- ASSERT(srt_flatbuf.binding >= 0 && flatbuf_off_dw > 0 &&
- srt_flatbuf.buffer_type == BufferType::ReadConstUbo);
- const auto [id, pointer_type] = srt_flatbuf[BufferAlias::U32];
- const Id ptr{
- ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, ctx.ConstU32(flatbuf_off_dw))};
- return ctx.OpLoad(ctx.U32[1], ptr);
+ // We can only provide a fallback for immediate offsets.
+ if (flatbuf_off_dw == 0) {
+ return ctx.OpFunctionCall(ctx.U32[1], ctx.read_const_dynamic, addr, offset);
+ } else {
+ return ctx.OpFunctionCall(ctx.U32[1], ctx.read_const, addr, offset,
+ ctx.ConstU32(flatbuf_off_dw));
+ }
}
-Id EmitReadConstBuffer(EmitContext& ctx, u32 handle, Id index) {
+template
+Id ReadConstBuffer(EmitContext& ctx, u32 handle, Id index) {
const auto& buffer = ctx.buffers[handle];
index = ctx.OpIAdd(ctx.U32[1], index, buffer.offset_dwords);
- const auto [id, pointer_type] = buffer[BufferAlias::U32];
+ const auto [id, pointer_type] = buffer[type];
+ const auto value_type = type == PointerType::U32 ? ctx.U32[1] : ctx.F32[1];
const Id ptr{ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, index)};
- const Id result{ctx.OpLoad(ctx.U32[1], ptr)};
+ const Id result{ctx.OpLoad(value_type, ptr)};
if (Sirit::ValidId(buffer.size_dwords)) {
const Id in_bounds = ctx.OpULessThan(ctx.U1[1], index, buffer.size_dwords);
- return ctx.OpSelect(ctx.U32[1], in_bounds, result, ctx.u32_zero_value);
- } else {
- return result;
+ return ctx.OpSelect(value_type, in_bounds, result, ctx.u32_zero_value);
}
+ return result;
+}
+
+Id EmitReadConstBuffer(EmitContext& ctx, u32 handle, Id index) {
+ return ReadConstBuffer(ctx, handle, index);
}
Id EmitReadStepRate(EmitContext& ctx, int rate_idx) {
@@ -244,7 +250,7 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, u32 comp, Id index) {
ctx.OpUDiv(ctx.U32[1], ctx.OpLoad(ctx.U32[1], ctx.instance_id), step_rate),
ctx.ConstU32(param.num_components)),
ctx.ConstU32(comp));
- return EmitReadConstBuffer(ctx, param.buffer_handle, offset);
+ return ReadConstBuffer(ctx, param.buffer_handle, offset);
}
Id result;
@@ -430,7 +436,7 @@ static Id EmitLoadBufferBoundsCheck(EmitContext& ctx, Id index, Id buffer_size,
return result;
}
-template
+template
static Id EmitLoadBufferB32xN(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
const auto flags = inst->Flags();
const auto& spv_buffer = ctx.buffers[handle];
@@ -438,7 +444,7 @@ static Id EmitLoadBufferB32xN(EmitContext& ctx, IR::Inst* inst, u32 handle, Id a
address = ctx.OpIAdd(ctx.U32[1], address, spv_buffer.offset);
}
const Id index = ctx.OpShiftRightLogical(ctx.U32[1], address, ctx.ConstU32(2u));
- const auto& data_types = alias == BufferAlias::U32 ? ctx.U32 : ctx.F32;
+ const auto& data_types = alias == PointerType::U32 ? ctx.U32 : ctx.F32;
const auto [id, pointer_type] = spv_buffer[alias];
boost::container::static_vector ids;
@@ -449,7 +455,7 @@ static Id EmitLoadBufferB32xN(EmitContext& ctx, IR::Inst* inst, u32 handle, Id a
if (!flags.typed) {
// Untyped loads have bounds checking per-component.
ids.push_back(EmitLoadBufferBoundsCheck<1>(ctx, index_i, spv_buffer.size_dwords,
- result_i, alias == BufferAlias::F32));
+ result_i, alias == PointerType::F32));
} else {
ids.push_back(result_i);
}
@@ -459,7 +465,7 @@ static Id EmitLoadBufferB32xN(EmitContext& ctx, IR::Inst* inst, u32 handle, Id a
if (flags.typed) {
// Typed loads have single bounds check for the whole load.
return EmitLoadBufferBoundsCheck(ctx, index, spv_buffer.size_dwords, result,
- alias == BufferAlias::F32);
+ alias == PointerType::F32);
}
return result;
}
@@ -469,7 +475,7 @@ Id EmitLoadBufferU8(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
if (Sirit::ValidId(spv_buffer.offset)) {
address = ctx.OpIAdd(ctx.U32[1], address, spv_buffer.offset);
}
- const auto [id, pointer_type] = spv_buffer[BufferAlias::U8];
+ const auto [id, pointer_type] = spv_buffer[PointerType::U8];
const Id ptr{ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, address)};
const Id result{ctx.OpUConvert(ctx.U32[1], ctx.OpLoad(ctx.U8, ptr))};
return EmitLoadBufferBoundsCheck<1>(ctx, address, spv_buffer.size, result, false);
@@ -480,7 +486,7 @@ Id EmitLoadBufferU16(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
if (Sirit::ValidId(spv_buffer.offset)) {
address = ctx.OpIAdd(ctx.U32[1], address, spv_buffer.offset);
}
- const auto [id, pointer_type] = spv_buffer[BufferAlias::U16];
+ const auto [id, pointer_type] = spv_buffer[PointerType::U16];
const Id index = ctx.OpShiftRightLogical(ctx.U32[1], address, ctx.ConstU32(1u));
const Id ptr{ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, index)};
const Id result{ctx.OpUConvert(ctx.U32[1], ctx.OpLoad(ctx.U16, ptr))};
@@ -488,35 +494,35 @@ Id EmitLoadBufferU16(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
}
Id EmitLoadBufferU32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<1, BufferAlias::U32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<1, PointerType::U32>(ctx, inst, handle, address);
}
Id EmitLoadBufferU32x2(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<2, BufferAlias::U32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<2, PointerType::U32>(ctx, inst, handle, address);
}
Id EmitLoadBufferU32x3(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<3, BufferAlias::U32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<3, PointerType::U32>(ctx, inst, handle, address);
}
Id EmitLoadBufferU32x4(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<4, BufferAlias::U32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<4, PointerType::U32>(ctx, inst, handle, address);
}
Id EmitLoadBufferF32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<1, BufferAlias::F32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<1, PointerType::F32>(ctx, inst, handle, address);
}
Id EmitLoadBufferF32x2(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<2, BufferAlias::F32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<2, PointerType::F32>(ctx, inst, handle, address);
}
Id EmitLoadBufferF32x3(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<3, BufferAlias::F32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<3, PointerType::F32>(ctx, inst, handle, address);
}
Id EmitLoadBufferF32x4(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
- return EmitLoadBufferB32xN<4, BufferAlias::F32>(ctx, inst, handle, address);
+ return EmitLoadBufferB32xN<4, PointerType::F32>(ctx, inst, handle, address);
}
Id EmitLoadBufferFormatF32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address) {
@@ -546,7 +552,7 @@ void EmitStoreBufferBoundsCheck(EmitContext& ctx, Id index, Id buffer_size, auto
emit_func();
}
-template
+template
static void EmitStoreBufferB32xN(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address,
Id value) {
const auto flags = inst->Flags();
@@ -555,7 +561,7 @@ static void EmitStoreBufferB32xN(EmitContext& ctx, IR::Inst* inst, u32 handle, I
address = ctx.OpIAdd(ctx.U32[1], address, spv_buffer.offset);
}
const Id index = ctx.OpShiftRightLogical(ctx.U32[1], address, ctx.ConstU32(2u));
- const auto& data_types = alias == BufferAlias::U32 ? ctx.U32 : ctx.F32;
+ const auto& data_types = alias == PointerType::U32 ? ctx.U32 : ctx.F32;
const auto [id, pointer_type] = spv_buffer[alias];
auto store = [&] {
@@ -586,7 +592,7 @@ void EmitStoreBufferU8(EmitContext& ctx, IR::Inst*, u32 handle, Id address, Id v
if (Sirit::ValidId(spv_buffer.offset)) {
address = ctx.OpIAdd(ctx.U32[1], address, spv_buffer.offset);
}
- const auto [id, pointer_type] = spv_buffer[BufferAlias::U8];
+ const auto [id, pointer_type] = spv_buffer[PointerType::U8];
const Id ptr{ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, address)};
const Id result{ctx.OpUConvert(ctx.U8, value)};
EmitStoreBufferBoundsCheck<1>(ctx, address, spv_buffer.size, [&] { ctx.OpStore(ptr, result); });
@@ -597,7 +603,7 @@ void EmitStoreBufferU16(EmitContext& ctx, IR::Inst*, u32 handle, Id address, Id
if (Sirit::ValidId(spv_buffer.offset)) {
address = ctx.OpIAdd(ctx.U32[1], address, spv_buffer.offset);
}
- const auto [id, pointer_type] = spv_buffer[BufferAlias::U16];
+ const auto [id, pointer_type] = spv_buffer[PointerType::U16];
const Id index = ctx.OpShiftRightLogical(ctx.U32[1], address, ctx.ConstU32(1u));
const Id ptr{ctx.OpAccessChain(pointer_type, id, ctx.u32_zero_value, index)};
const Id result{ctx.OpUConvert(ctx.U16, value)};
@@ -606,35 +612,35 @@ void EmitStoreBufferU16(EmitContext& ctx, IR::Inst*, u32 handle, Id address, Id
}
void EmitStoreBufferU32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<1, BufferAlias::U32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<1, PointerType::U32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferU32x2(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<2, BufferAlias::U32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<2, PointerType::U32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferU32x3(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<3, BufferAlias::U32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<3, PointerType::U32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferU32x4(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<4, BufferAlias::U32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<4, PointerType::U32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferF32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<1, BufferAlias::F32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<1, PointerType::F32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferF32x2(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<2, BufferAlias::F32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<2, PointerType::F32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferF32x3(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<3, BufferAlias::F32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<3, PointerType::F32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferF32x4(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
- EmitStoreBufferB32xN<4, BufferAlias::F32>(ctx, inst, handle, address, value);
+ EmitStoreBufferB32xN<4, PointerType::F32>(ctx, inst, handle, address, value);
}
void EmitStoreBufferFormatF32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address, Id value) {
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp
index 347c4cb0a..01c51e399 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_floating_point.cpp
@@ -154,7 +154,7 @@ Id EmitFPRecip32(EmitContext& ctx, Id value) {
}
Id EmitFPRecip64(EmitContext& ctx, Id value) {
- return ctx.OpFDiv(ctx.F64[1], ctx.Constant(ctx.F64[1], 1.0f), value);
+ return ctx.OpFDiv(ctx.F64[1], ctx.Constant(ctx.F64[1], f64{1.0}), value);
}
Id EmitFPRecipSqrt32(EmitContext& ctx, Id value) {
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
index 269f372d5..172358866 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
@@ -61,7 +61,7 @@ void EmitSetVectorRegister(EmitContext& ctx);
void EmitSetGotoVariable(EmitContext& ctx);
void EmitGetGotoVariable(EmitContext& ctx);
void EmitSetScc(EmitContext& ctx);
-Id EmitReadConst(EmitContext& ctx, IR::Inst* inst);
+Id EmitReadConst(EmitContext& ctx, IR::Inst* inst, Id addr, Id offset);
Id EmitReadConstBuffer(EmitContext& ctx, u32 handle, Id index);
Id EmitLoadBufferU8(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address);
Id EmitLoadBufferU16(EmitContext& ctx, IR::Inst* inst, u32 handle, Id address);
@@ -372,6 +372,7 @@ Id EmitBitCount64(EmitContext& ctx, Id value);
Id EmitBitwiseNot32(EmitContext& ctx, Id value);
Id EmitFindSMsb32(EmitContext& ctx, Id value);
Id EmitFindUMsb32(EmitContext& ctx, Id value);
+Id EmitFindUMsb64(EmitContext& ctx, Id value);
Id EmitFindILsb32(EmitContext& ctx, Id value);
Id EmitFindILsb64(EmitContext& ctx, Id value);
Id EmitSMin32(EmitContext& ctx, Id a, Id b);
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp
index 10bfbb2ab..1a995354d 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp
@@ -229,6 +229,20 @@ Id EmitFindUMsb32(EmitContext& ctx, Id value) {
return ctx.OpFindUMsb(ctx.U32[1], value);
}
+Id EmitFindUMsb64(EmitContext& ctx, Id value) {
+ // Vulkan restricts some bitwise operations to 32-bit only, so decompose into
+ // two 32-bit values and select the correct result.
+ const Id unpacked{ctx.OpBitcast(ctx.U32[2], value)};
+ const Id hi{ctx.OpCompositeExtract(ctx.U32[1], unpacked, 1U)};
+ const Id lo{ctx.OpCompositeExtract(ctx.U32[1], unpacked, 0U)};
+ const Id hi_msb{ctx.OpFindUMsb(ctx.U32[1], hi)};
+ const Id lo_msb{ctx.OpFindUMsb(ctx.U32[1], lo)};
+ const Id found_hi{ctx.OpINotEqual(ctx.U1[1], hi_msb, ctx.ConstU32(u32(-1)))};
+ const Id shifted_hi{ctx.OpIAdd(ctx.U32[1], hi_msb, ctx.ConstU32(32u))};
+ // value == 0 case is checked in IREmitter
+ return ctx.OpSelect(ctx.U32[1], found_hi, shifted_hi, lo_msb);
+}
+
Id EmitFindILsb32(EmitContext& ctx, Id value) {
return ctx.OpFindILsb(ctx.U32[1], value);
}
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
index 2640030df..68bfcc0d0 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -7,6 +7,7 @@
#include "shader_recompiler/frontend/fetch_shader.h"
#include "shader_recompiler/runtime_info.h"
#include "video_core/amdgpu/types.h"
+#include "video_core/buffer_cache/buffer_cache.h"
#include
#include
@@ -70,6 +71,12 @@ EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_inf
Bindings& binding_)
: Sirit::Module(profile_.supported_spirv), info{info_}, runtime_info{runtime_info_},
profile{profile_}, stage{info.stage}, l_stage{info.l_stage}, binding{binding_} {
+ if (info.dma_types != IR::Type::Void) {
+ SetMemoryModel(spv::AddressingModel::PhysicalStorageBuffer64, spv::MemoryModel::GLSL450);
+ } else {
+ SetMemoryModel(spv::AddressingModel::Logical, spv::MemoryModel::GLSL450);
+ }
+
AddCapability(spv::Capability::Shader);
DefineArithmeticTypes();
DefineInterfaces();
@@ -137,9 +144,13 @@ void EmitContext::DefineArithmeticTypes() {
true_value = ConstantTrue(U1[1]);
false_value = ConstantFalse(U1[1]);
+ u8_one_value = Constant(U8, 1U);
+ u8_zero_value = Constant(U8, 0U);
u32_one_value = ConstU32(1U);
u32_zero_value = ConstU32(0U);
f32_zero_value = ConstF32(0.0f);
+ u64_one_value = Constant(U64, 1ULL);
+ u64_zero_value = Constant(U64, 0ULL);
pi_x2 = ConstF32(2.0f * float{std::numbers::pi});
@@ -157,6 +168,35 @@ void EmitContext::DefineArithmeticTypes() {
if (info.uses_fp64) {
frexp_result_f64 = Name(TypeStruct(F64[1], S32[1]), "frexp_result_f64");
}
+
+ if (True(info.dma_types & IR::Type::F64)) {
+ physical_pointer_types[PointerType::F64] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, F64[1]);
+ }
+ if (True(info.dma_types & IR::Type::U64)) {
+ physical_pointer_types[PointerType::U64] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, U64);
+ }
+ if (True(info.dma_types & IR::Type::F32)) {
+ physical_pointer_types[PointerType::F32] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, F32[1]);
+ }
+ if (True(info.dma_types & IR::Type::U32)) {
+ physical_pointer_types[PointerType::U32] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, U32[1]);
+ }
+ if (True(info.dma_types & IR::Type::F16)) {
+ physical_pointer_types[PointerType::F16] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, F16[1]);
+ }
+ if (True(info.dma_types & IR::Type::U16)) {
+ physical_pointer_types[PointerType::U16] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, U16);
+ }
+ if (True(info.dma_types & IR::Type::U8)) {
+ physical_pointer_types[PointerType::U8] =
+ TypePointer(spv::StorageClass::PhysicalStorageBuffer, U8);
+ }
}
void EmitContext::DefineInterfaces() {
@@ -195,9 +235,10 @@ EmitContext::SpirvAttribute EmitContext::GetAttributeInfo(AmdGpu::NumberFormat f
}
Id EmitContext::GetBufferSize(const u32 sharp_idx) {
- const auto& srt_flatbuf = buffers.back();
- ASSERT(srt_flatbuf.buffer_type == BufferType::ReadConstUbo);
- const auto [id, pointer_type] = srt_flatbuf[BufferAlias::U32];
+ // Can this be done with memory access? Like we do now with ReadConst
+ const auto& srt_flatbuf = buffers[flatbuf_index];
+ ASSERT(srt_flatbuf.buffer_type == BufferType::Flatbuf);
+ const auto [id, pointer_type] = srt_flatbuf[PointerType::U32];
const auto rsrc1{
OpLoad(U32[1], OpAccessChain(pointer_type, id, u32_zero_value, ConstU32(sharp_idx + 1)))};
@@ -690,8 +731,14 @@ EmitContext::BufferSpv EmitContext::DefineBuffer(bool is_storage, bool is_writte
case Shader::BufferType::GdsBuffer:
Name(id, "gds_buffer");
break;
- case Shader::BufferType::ReadConstUbo:
- Name(id, "srt_flatbuf_ubo");
+ case Shader::BufferType::Flatbuf:
+ Name(id, "srt_flatbuf");
+ break;
+ case Shader::BufferType::BdaPagetable:
+ Name(id, "bda_pagetable");
+ break;
+ case Shader::BufferType::FaultBuffer:
+ Name(id, "fault_buffer");
break;
case Shader::BufferType::SharedMemory:
Name(id, "ssbo_shmem");
@@ -705,35 +752,53 @@ EmitContext::BufferSpv EmitContext::DefineBuffer(bool is_storage, bool is_writte
};
void EmitContext::DefineBuffers() {
- if (!profile.supports_robust_buffer_access && !info.has_readconst) {
- // In case ReadConstUbo has not already been bound by IR and is needed
+ if (!profile.supports_robust_buffer_access &&
+ info.readconst_types == Info::ReadConstType::None) {
+ // In case Flatbuf has not already been bound by IR and is needed
// to query buffer sizes, bind it now.
info.buffers.push_back({
.used_types = IR::Type::U32,
- .inline_cbuf = AmdGpu::Buffer::Null(),
- .buffer_type = BufferType::ReadConstUbo,
+ // We can't guarantee that flatbuf will not grow past UBO
+ // limit if there are a lot of ReadConsts. (We could specialize)
+ .inline_cbuf = AmdGpu::Buffer::Placeholder(std::numeric_limits::max()),
+ .buffer_type = BufferType::Flatbuf,
});
+ // In the future we may want to read buffer sizes from GPU memory if available.
+ // info.readconst_types |= Info::ReadConstType::Immediate;
}
for (const auto& desc : info.buffers) {
const auto buf_sharp = desc.GetSharp(info);
const bool is_storage = desc.IsStorage(buf_sharp, profile);
+ // Set indexes for special buffers.
+ if (desc.buffer_type == BufferType::Flatbuf) {
+ flatbuf_index = buffers.size();
+ } else if (desc.buffer_type == BufferType::BdaPagetable) {
+ bda_pagetable_index = buffers.size();
+ } else if (desc.buffer_type == BufferType::FaultBuffer) {
+ fault_buffer_index = buffers.size();
+ }
+
// Define aliases depending on the shader usage.
auto& spv_buffer = buffers.emplace_back(binding.buffer++, desc.buffer_type);
+ if (True(desc.used_types & IR::Type::U64)) {
+ spv_buffer[PointerType::U64] =
+ DefineBuffer(is_storage, desc.is_written, 3, desc.buffer_type, U64);
+ }
if (True(desc.used_types & IR::Type::U32)) {
- spv_buffer[BufferAlias::U32] =
+ spv_buffer[PointerType::U32] =
DefineBuffer(is_storage, desc.is_written, 2, desc.buffer_type, U32[1]);
}
if (True(desc.used_types & IR::Type::F32)) {
- spv_buffer[BufferAlias::F32] =
+ spv_buffer[PointerType::F32] =
DefineBuffer(is_storage, desc.is_written, 2, desc.buffer_type, F32[1]);
}
if (True(desc.used_types & IR::Type::U16)) {
- spv_buffer[BufferAlias::U16] =
+ spv_buffer[PointerType::U16] =
DefineBuffer(is_storage, desc.is_written, 1, desc.buffer_type, U16);
}
if (True(desc.used_types & IR::Type::U8)) {
- spv_buffer[BufferAlias::U8] =
+ spv_buffer[PointerType::U8] =
DefineBuffer(is_storage, desc.is_written, 0, desc.buffer_type, U8);
}
++binding.unified;
@@ -1003,6 +1068,101 @@ Id EmitContext::DefineUfloatM5ToFloat32(u32 mantissa_bits, const std::string_vie
return func;
}
+Id EmitContext::DefineGetBdaPointer() {
+ const auto caching_pagebits{
+ Constant(U64, static_cast(VideoCore::BufferCache::CACHING_PAGEBITS))};
+ const auto caching_pagemask{Constant(U64, VideoCore::BufferCache::CACHING_PAGESIZE - 1)};
+
+ const auto func_type{TypeFunction(U64, U64)};
+ const auto func{OpFunction(U64, spv::FunctionControlMask::MaskNone, func_type)};
+ const auto address{OpFunctionParameter(U64)};
+ Name(func, "get_bda_pointer");
+ AddLabel();
+
+ const auto fault_label{OpLabel()};
+ const auto available_label{OpLabel()};
+ const auto merge_label{OpLabel()};
+
+ // Get page BDA
+ const auto page{OpShiftRightLogical(U64, address, caching_pagebits)};
+ const auto page32{OpUConvert(U32[1], page)};
+ const auto& bda_buffer{buffers[bda_pagetable_index]};
+ const auto [bda_buffer_id, bda_pointer_type] = bda_buffer[PointerType::U64];
+ const auto bda_ptr{OpAccessChain(bda_pointer_type, bda_buffer_id, u32_zero_value, page32)};
+ const auto bda{OpLoad(U64, bda_ptr)};
+
+ // Check if page is GPU cached
+ const auto is_fault{OpIEqual(U1[1], bda, u64_zero_value)};
+ OpSelectionMerge(merge_label, spv::SelectionControlMask::MaskNone);
+ OpBranchConditional(is_fault, fault_label, available_label);
+
+ // First time acces, mark as fault
+ AddLabel(fault_label);
+ const auto& fault_buffer{buffers[fault_buffer_index]};
+ const auto [fault_buffer_id, fault_pointer_type] = fault_buffer[PointerType::U8];
+ const auto page_div8{OpShiftRightLogical(U32[1], page32, ConstU32(3U))};
+ const auto page_mod8{OpBitwiseAnd(U32[1], page32, ConstU32(7U))};
+ const auto page_mask{OpShiftLeftLogical(U8, u8_one_value, page_mod8)};
+ const auto fault_ptr{
+ OpAccessChain(fault_pointer_type, fault_buffer_id, u32_zero_value, page_div8)};
+ const auto fault_value{OpLoad(U8, fault_ptr)};
+ const auto fault_value_masked{OpBitwiseOr(U8, fault_value, page_mask)};
+ OpStore(fault_ptr, fault_value_masked);
+
+ // Return null pointer
+ const auto fallback_result{u64_zero_value};
+ OpBranch(merge_label);
+
+ // Value is available, compute address
+ AddLabel(available_label);
+ const auto offset_in_bda{OpBitwiseAnd(U64, address, caching_pagemask)};
+ const auto addr{OpIAdd(U64, bda, offset_in_bda)};
+ OpBranch(merge_label);
+
+ // Merge
+ AddLabel(merge_label);
+ const auto result{OpPhi(U64, addr, available_label, fallback_result, fault_label)};
+ OpReturnValue(result);
+ OpFunctionEnd();
+ return func;
+}
+
+Id EmitContext::DefineReadConst(bool dynamic) {
+ const auto func_type{!dynamic ? TypeFunction(U32[1], U32[2], U32[1], U32[1])
+ : TypeFunction(U32[1], U32[2], U32[1])};
+ const auto func{OpFunction(U32[1], spv::FunctionControlMask::MaskNone, func_type)};
+ const auto base{OpFunctionParameter(U32[2])};
+ const auto offset{OpFunctionParameter(U32[1])};
+ const auto flatbuf_offset{!dynamic ? OpFunctionParameter(U32[1]) : Id{}};
+ Name(func, dynamic ? "read_const_dynamic" : "read_const");
+ AddLabel();
+
+ const auto base_lo{OpUConvert(U64, OpCompositeExtract(U32[1], base, 0))};
+ const auto base_hi{OpUConvert(U64, OpCompositeExtract(U32[1], base, 1))};
+ const auto base_shift{OpShiftLeftLogical(U64, base_hi, ConstU32(32U))};
+ const auto base_addr{OpBitwiseOr(U64, base_lo, base_shift)};
+ const auto offset_bytes{OpShiftLeftLogical(U32[1], offset, ConstU32(2U))};
+ const auto addr{OpIAdd(U64, base_addr, OpUConvert(U64, offset_bytes))};
+
+ const auto result = EmitMemoryRead(U32[1], addr, [&]() {
+ if (dynamic) {
+ return u32_zero_value;
+ } else {
+ const auto& flatbuf_buffer{buffers[flatbuf_index]};
+ ASSERT(flatbuf_buffer.binding >= 0 &&
+ flatbuf_buffer.buffer_type == BufferType::Flatbuf);
+ const auto [flatbuf_buffer_id, flatbuf_pointer_type] = flatbuf_buffer[PointerType::U32];
+ const auto ptr{OpAccessChain(flatbuf_pointer_type, flatbuf_buffer_id, u32_zero_value,
+ flatbuf_offset)};
+ return OpLoad(U32[1], ptr);
+ }
+ });
+
+ OpReturnValue(result);
+ OpFunctionEnd();
+ return func;
+}
+
void EmitContext::DefineFunctions() {
if (info.uses_pack_10_11_11) {
f32_to_uf11 = DefineFloat32ToUfloatM5(6, "f32_to_uf11");
@@ -1012,6 +1172,18 @@ void EmitContext::DefineFunctions() {
uf11_to_f32 = DefineUfloatM5ToFloat32(6, "uf11_to_f32");
uf10_to_f32 = DefineUfloatM5ToFloat32(5, "uf10_to_f32");
}
+ if (info.dma_types != IR::Type::Void) {
+ get_bda_pointer = DefineGetBdaPointer();
+ }
+
+ if (True(info.readconst_types & Info::ReadConstType::Immediate)) {
+ LOG_DEBUG(Render_Recompiler, "Shader {:#x} uses immediate ReadConst", info.pgm_hash);
+ read_const = DefineReadConst(false);
+ }
+ if (True(info.readconst_types & Info::ReadConstType::Dynamic)) {
+ LOG_DEBUG(Render_Recompiler, "Shader {:#x} uses dynamic ReadConst", info.pgm_hash);
+ read_const_dynamic = DefineReadConst(true);
+ }
}
} // namespace Shader::Backend::SPIRV
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
index 38d55e0e4..a2e0d2f47 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@@ -4,6 +4,7 @@
#pragma once
#include
+#include
#include
#include "shader_recompiler/backend/bindings.h"
@@ -41,6 +42,17 @@ public:
Bindings& binding);
~EmitContext();
+ enum class PointerType : u32 {
+ U8,
+ U16,
+ F16,
+ U32,
+ F32,
+ U64,
+ F64,
+ NumAlias,
+ };
+
Id Def(const IR::Value& value);
void DefineBufferProperties();
@@ -133,12 +145,72 @@ public:
return ConstantComposite(type, constituents);
}
+ inline Id AddLabel() {
+ last_label = Module::AddLabel();
+ return last_label;
+ }
+
+ inline Id AddLabel(Id label) {
+ last_label = Module::AddLabel(label);
+ return last_label;
+ }
+
+ PointerType PointerTypeFromType(Id type) {
+ if (type.value == U8.value)
+ return PointerType::U8;
+ if (type.value == U16.value)
+ return PointerType::U16;
+ if (type.value == F16[1].value)
+ return PointerType::F16;
+ if (type.value == U32[1].value)
+ return PointerType::U32;
+ if (type.value == F32[1].value)
+ return PointerType::F32;
+ if (type.value == U64.value)
+ return PointerType::U64;
+ if (type.value == F64[1].value)
+ return PointerType::F64;
+ UNREACHABLE_MSG("Unknown type for pointer");
+ }
+
+ Id EmitMemoryRead(Id type, Id address, auto&& fallback) {
+ const Id available_label = OpLabel();
+ const Id fallback_label = OpLabel();
+ const Id merge_label = OpLabel();
+
+ const Id addr = OpFunctionCall(U64, get_bda_pointer, address);
+ const Id is_available = OpINotEqual(U1[1], addr, u64_zero_value);
+ OpSelectionMerge(merge_label, spv::SelectionControlMask::MaskNone);
+ OpBranchConditional(is_available, available_label, fallback_label);
+
+ // Available
+ AddLabel(available_label);
+ const auto pointer_type = PointerTypeFromType(type);
+ const Id pointer_type_id = physical_pointer_types[pointer_type];
+ const Id addr_ptr = OpConvertUToPtr(pointer_type_id, addr);
+ const Id result = OpLoad(type, addr_ptr, spv::MemoryAccessMask::Aligned, 4u);
+ OpBranch(merge_label);
+
+ // Fallback
+ AddLabel(fallback_label);
+ const Id fallback_result = fallback();
+ OpBranch(merge_label);
+
+ // Merge
+ AddLabel(merge_label);
+ const Id final_result =
+ OpPhi(type, fallback_result, fallback_label, result, available_label);
+ return final_result;
+ }
+
Info& info;
const RuntimeInfo& runtime_info;
const Profile& profile;
Stage stage;
LogicalStage l_stage{};
+ Id last_label{};
+
Id void_id{};
Id U8{};
Id S8{};
@@ -161,9 +233,13 @@ public:
Id true_value{};
Id false_value{};
+ Id u8_one_value{};
+ Id u8_zero_value{};
Id u32_one_value{};
Id u32_zero_value{};
Id f32_zero_value{};
+ Id u64_one_value{};
+ Id u64_zero_value{};
Id shared_u8{};
Id shared_u16{};
@@ -231,14 +307,6 @@ public:
bool is_storage = false;
};
- enum class BufferAlias : u32 {
- U8,
- U16,
- U32,
- F32,
- NumAlias,
- };
-
struct BufferSpv {
Id id;
Id pointer_type;
@@ -252,22 +320,40 @@ public:
Id size;
Id size_shorts;
Id size_dwords;
- std::array aliases;
+ std::array aliases;
- const BufferSpv& operator[](BufferAlias alias) const {
+ const BufferSpv& operator[](PointerType alias) const {
return aliases[u32(alias)];
}
- BufferSpv& operator[](BufferAlias alias) {
+ BufferSpv& operator[](PointerType alias) {
return aliases[u32(alias)];
}
};
+ struct PhysicalPointerTypes {
+ std::array types;
+
+ const Id& operator[](PointerType type) const {
+ return types[u32(type)];
+ }
+
+ Id& operator[](PointerType type) {
+ return types[u32(type)];
+ }
+ };
+
Bindings& binding;
boost::container::small_vector buf_type_ids;
boost::container::small_vector buffers;
boost::container::small_vector images;
boost::container::small_vector samplers;
+ PhysicalPointerTypes physical_pointer_types;
+ std::unordered_map first_to_last_label_map;
+
+ size_t flatbuf_index{};
+ size_t bda_pagetable_index{};
+ size_t fault_buffer_index{};
Id sampler_type{};
Id sampler_pointer_type{};
@@ -292,6 +378,11 @@ public:
Id uf10_to_f32{};
Id f32_to_uf10{};
+ Id get_bda_pointer{};
+
+ Id read_const{};
+ Id read_const_dynamic{};
+
private:
void DefineArithmeticTypes();
void DefineInterfaces();
@@ -312,6 +403,10 @@ private:
Id DefineFloat32ToUfloatM5(u32 mantissa_bits, std::string_view name);
Id DefineUfloatM5ToFloat32(u32 mantissa_bits, std::string_view name);
+ Id DefineGetBdaPointer();
+
+ Id DefineReadConst(bool dynamic);
+
Id GetBufferSize(u32 sharp_idx);
};
diff --git a/src/shader_recompiler/frontend/decode.cpp b/src/shader_recompiler/frontend/decode.cpp
index 20b78e869..37e8a0973 100644
--- a/src/shader_recompiler/frontend/decode.cpp
+++ b/src/shader_recompiler/frontend/decode.cpp
@@ -1032,7 +1032,6 @@ void GcnDecodeContext::decodeInstructionMIMG(uint64_t hexInstruction) {
m_instruction.control.mimg = *reinterpret_cast(&hexInstruction);
m_instruction.control.mimg.mod = getMimgModifier(m_instruction.opcode);
- ASSERT(m_instruction.control.mimg.r128 == 0);
}
void GcnDecodeContext::decodeInstructionDS(uint64_t hexInstruction) {
diff --git a/src/shader_recompiler/frontend/translate/scalar_alu.cpp b/src/shader_recompiler/frontend/translate/scalar_alu.cpp
index 3a8e894ae..7beb594c3 100644
--- a/src/shader_recompiler/frontend/translate/scalar_alu.cpp
+++ b/src/shader_recompiler/frontend/translate/scalar_alu.cpp
@@ -114,6 +114,8 @@ void Translator::EmitScalarAlu(const GcnInst& inst) {
return S_FF1_I32_B64(inst);
case Opcode::S_FLBIT_I32_B32:
return S_FLBIT_I32_B32(inst);
+ case Opcode::S_FLBIT_I32_B64:
+ return S_FLBIT_I32_B64(inst);
case Opcode::S_BITSET0_B32:
return S_BITSET_B32(inst, 0);
case Opcode::S_BITSET1_B32:
@@ -686,6 +688,17 @@ void Translator::S_FLBIT_I32_B32(const GcnInst& inst) {
SetDst(inst.dst[0], IR::U32{ir.Select(cond, pos_from_left, ir.Imm32(~0U))});
}
+void Translator::S_FLBIT_I32_B64(const GcnInst& inst) {
+ const IR::U64 src0{GetSrc64(inst.src[0])};
+ // Gcn wants the MSB position counting from the left, but SPIR-V counts from the rightmost (LSB)
+ // position
+ const IR::U32 msb_pos = ir.FindUMsb(src0);
+ const IR::U32 pos_from_left = ir.ISub(ir.Imm32(63), msb_pos);
+ // Select 0xFFFFFFFF if src0 was 0
+ const IR::U1 cond = ir.INotEqual(src0, ir.Imm64(u64(0u)));
+ SetDst(inst.dst[0], IR::U32{ir.Select(cond, pos_from_left, ir.Imm32(~0U))});
+}
+
void Translator::S_BITSET_B32(const GcnInst& inst, u32 bit_value) {
const IR::U32 old_value{GetSrc(inst.dst[0])};
const IR::U32 offset{ir.BitFieldExtract(GetSrc(inst.src[0]), ir.Imm32(0U), ir.Imm32(5U))};
diff --git a/src/shader_recompiler/frontend/translate/scalar_memory.cpp b/src/shader_recompiler/frontend/translate/scalar_memory.cpp
index 89426e080..3c6fd3968 100644
--- a/src/shader_recompiler/frontend/translate/scalar_memory.cpp
+++ b/src/shader_recompiler/frontend/translate/scalar_memory.cpp
@@ -39,21 +39,22 @@ void Translator::EmitScalarMemory(const GcnInst& inst) {
void Translator::S_LOAD_DWORD(int num_dwords, const GcnInst& inst) {
const auto& smrd = inst.control.smrd;
- const u32 dword_offset = [&] -> u32 {
+ const IR::ScalarReg sbase{inst.src[0].code * 2};
+ const IR::U32 dword_offset = [&] -> IR::U32 {
if (smrd.imm) {
- return smrd.offset;
+ return ir.Imm32(smrd.offset);
}
if (smrd.offset == SQ_SRC_LITERAL) {
- return inst.src[1].code;
+ return ir.Imm32(inst.src[1].code);
}
- UNREACHABLE();
+ return ir.ShiftRightLogical(ir.GetScalarReg(IR::ScalarReg(smrd.offset)), ir.Imm32(2));
}();
- const IR::ScalarReg sbase{inst.src[0].code * 2};
const IR::Value base =
ir.CompositeConstruct(ir.GetScalarReg(sbase), ir.GetScalarReg(sbase + 1));
IR::ScalarReg dst_reg{inst.dst[0].code};
for (u32 i = 0; i < num_dwords; i++) {
- ir.SetScalarReg(dst_reg++, ir.ReadConst(base, ir.Imm32(dword_offset + i)));
+ IR::U32 index = ir.IAdd(dword_offset, ir.Imm32(i));
+ ir.SetScalarReg(dst_reg + i, ir.ReadConst(base, index));
}
}
@@ -75,7 +76,7 @@ void Translator::S_BUFFER_LOAD_DWORD(int num_dwords, const GcnInst& inst) {
IR::ScalarReg dst_reg{inst.dst[0].code};
for (u32 i = 0; i < num_dwords; i++) {
const IR::U32 index = ir.IAdd(dword_offset, ir.Imm32(i));
- ir.SetScalarReg(dst_reg++, ir.ReadConstBuffer(vsharp, index));
+ ir.SetScalarReg(dst_reg + i, ir.ReadConstBuffer(vsharp, index));
}
}
diff --git a/src/shader_recompiler/frontend/translate/translate.cpp b/src/shader_recompiler/frontend/translate/translate.cpp
index e49f95d9a..5675adf3c 100644
--- a/src/shader_recompiler/frontend/translate/translate.cpp
+++ b/src/shader_recompiler/frontend/translate/translate.cpp
@@ -380,7 +380,7 @@ T Translator::GetSrc64(const InstOperand& operand) {
break;
case OperandField::VccLo:
if constexpr (is_float) {
- UNREACHABLE();
+ value = ir.PackDouble2x32(ir.CompositeConstruct(ir.GetVccLo(), ir.GetVccHi()));
} else {
value = ir.PackUint2x32(ir.CompositeConstruct(ir.GetVccLo(), ir.GetVccHi()));
}
diff --git a/src/shader_recompiler/frontend/translate/translate.h b/src/shader_recompiler/frontend/translate/translate.h
index 68d5e8dc8..15ba8c8d7 100644
--- a/src/shader_recompiler/frontend/translate/translate.h
+++ b/src/shader_recompiler/frontend/translate/translate.h
@@ -121,6 +121,7 @@ public:
void S_FF1_I32_B32(const GcnInst& inst);
void S_FF1_I32_B64(const GcnInst& inst);
void S_FLBIT_I32_B32(const GcnInst& inst);
+ void S_FLBIT_I32_B64(const GcnInst& inst);
void S_BITSET_B32(const GcnInst& inst, u32 bit_value);
void S_GETPC_B64(u32 pc, const GcnInst& inst);
void S_SAVEEXEC_B64(NegateMode negate, bool is_or, const GcnInst& inst);
@@ -183,6 +184,7 @@ public:
void V_READFIRSTLANE_B32(const GcnInst& inst);
void V_CVT_I32_F64(const GcnInst& inst);
void V_CVT_F64_I32(const GcnInst& inst);
+ void V_CVT_F64_U32(const GcnInst& inst);
void V_CVT_F32_I32(const GcnInst& inst);
void V_CVT_F32_U32(const GcnInst& inst);
void V_CVT_U32_F32(const GcnInst& inst);
@@ -203,6 +205,7 @@ public:
void V_EXP_F32(const GcnInst& inst);
void V_LOG_F32(const GcnInst& inst);
void V_RCP_F32(const GcnInst& inst);
+ void V_RCP_LEGACY_F32(const GcnInst& inst);
void V_RCP_F64(const GcnInst& inst);
void V_RSQ_F32(const GcnInst& inst);
void V_SQRT_F32(const GcnInst& inst);
diff --git a/src/shader_recompiler/frontend/translate/vector_alu.cpp b/src/shader_recompiler/frontend/translate/vector_alu.cpp
index 3ce86c131..3b88e4dec 100644
--- a/src/shader_recompiler/frontend/translate/vector_alu.cpp
+++ b/src/shader_recompiler/frontend/translate/vector_alu.cpp
@@ -110,6 +110,8 @@ void Translator::EmitVectorAlu(const GcnInst& inst) {
return V_CVT_I32_F64(inst);
case Opcode::V_CVT_F64_I32:
return V_CVT_F64_I32(inst);
+ case Opcode::V_CVT_F64_U32:
+ return V_CVT_F64_U32(inst);
case Opcode::V_CVT_F32_I32:
return V_CVT_F32_I32(inst);
case Opcode::V_CVT_F32_U32:
@@ -156,6 +158,8 @@ void Translator::EmitVectorAlu(const GcnInst& inst) {
return V_LOG_F32(inst);
case Opcode::V_RCP_F32:
return V_RCP_F32(inst);
+ case Opcode::V_RCP_LEGACY_F32:
+ return V_RCP_LEGACY_F32(inst);
case Opcode::V_RCP_F64:
return V_RCP_F64(inst);
case Opcode::V_RCP_IFLAG_F32:
@@ -684,6 +688,11 @@ void Translator::V_CVT_F64_I32(const GcnInst& inst) {
SetDst64(inst.dst[0], ir.ConvertSToF(64, 32, src0));
}
+void Translator::V_CVT_F64_U32(const GcnInst& inst) {
+ const IR::U32 src0{GetSrc(inst.src[0])};
+ SetDst64(inst.dst[0], ir.ConvertUToF(64, 32, src0));
+}
+
void Translator::V_CVT_F32_I32(const GcnInst& inst) {
const IR::U32 src0{GetSrc(inst.src[0])};
SetDst(inst.dst[0], ir.ConvertSToF(32, 32, src0));
@@ -791,6 +800,20 @@ void Translator::V_RCP_F32(const GcnInst& inst) {
SetDst(inst.dst[0], ir.FPRecip(src0));
}
+void Translator::V_RCP_LEGACY_F32(const GcnInst& inst) {
+ const IR::F32 src0{GetSrc(inst.src[0])};
+ const auto result = ir.FPRecip(src0);
+ const auto inf = ir.FPIsInf(result);
+
+ const auto raw_result = ir.ConvertFToU(32, result);
+ const auto sign_bit = ir.ShiftRightLogical(raw_result, ir.Imm32(31u));
+ const auto sign_bit_set = ir.INotEqual(sign_bit, ir.Imm32(0u));
+ const IR::F32 inf_result{ir.Select(sign_bit_set, ir.Imm32(-0.0f), ir.Imm32(0.0f))};
+ const IR::F32 val{ir.Select(inf, inf_result, result)};
+
+ SetDst(inst.dst[0], val);
+}
+
void Translator::V_RCP_F64(const GcnInst& inst) {
const IR::F64 src0{GetSrc64(inst.src[0])};
SetDst64(inst.dst[0], ir.FPRecip(src0));
@@ -989,13 +1012,22 @@ void Translator::V_CMP_NE_U64(const GcnInst& inst) {
}
};
const IR::U1 src0{get_src(inst.src[0])};
- ASSERT(inst.src[1].field == OperandField::ConstZero); // src0 != 0
+ auto op = [&inst, this](auto x) {
+ switch (inst.src[1].field) {
+ case OperandField::ConstZero:
+ return x;
+ case OperandField::SignedConstIntNeg:
+ return ir.LogicalNot(x);
+ default:
+ UNREACHABLE_MSG("unhandled V_CMP_NE_U64 source argument {}", u32(inst.src[1].field));
+ }
+ };
switch (inst.dst[1].field) {
case OperandField::VccLo:
- ir.SetVcc(src0);
+ ir.SetVcc(op(src0));
break;
case OperandField::ScalarGPR:
- ir.SetThreadBitScalarReg(IR::ScalarReg(inst.dst[1].code), src0);
+ ir.SetThreadBitScalarReg(IR::ScalarReg(inst.dst[1].code), op(src0));
break;
default:
UNREACHABLE();
diff --git a/src/shader_recompiler/frontend/translate/vector_memory.cpp b/src/shader_recompiler/frontend/translate/vector_memory.cpp
index 5639bc56a..5c972c607 100644
--- a/src/shader_recompiler/frontend/translate/vector_memory.cpp
+++ b/src/shader_recompiler/frontend/translate/vector_memory.cpp
@@ -152,6 +152,7 @@ void Translator::EmitVectorMemory(const GcnInst& inst) {
// Image gather operations
case Opcode::IMAGE_GATHER4:
+ case Opcode::IMAGE_GATHER4_L:
case Opcode::IMAGE_GATHER4_LZ:
case Opcode::IMAGE_GATHER4_C:
case Opcode::IMAGE_GATHER4_O:
@@ -377,6 +378,7 @@ void Translator::IMAGE_LOAD(bool has_mip, const GcnInst& inst) {
IR::TextureInstInfo info{};
info.has_lod.Assign(has_mip);
info.is_array.Assign(mimg.da);
+ info.is_r128.Assign(mimg.r128);
const IR::Value texel = ir.ImageRead(handle, body, {}, {}, info);
for (u32 i = 0; i < 4; i++) {
@@ -426,6 +428,7 @@ void Translator::IMAGE_GET_RESINFO(const GcnInst& inst) {
IR::TextureInstInfo info{};
info.is_array.Assign(mimg.da);
+ info.is_r128.Assign(mimg.r128);
const IR::Value size = ir.ImageQueryDimension(tsharp, lod, ir.Imm1(has_mips), info);
@@ -451,6 +454,7 @@ void Translator::IMAGE_ATOMIC(AtomicOp op, const GcnInst& inst) {
IR::TextureInstInfo info{};
info.is_array.Assign(mimg.da);
+ info.is_r128.Assign(mimg.r128);
const IR::Value value = ir.GetVectorReg(val_reg);
const IR::Value handle = ir.GetScalarReg(tsharp_reg);
@@ -509,6 +513,7 @@ IR::Value EmitImageSample(IR::IREmitter& ir, const GcnInst& inst, const IR::Scal
info.has_lod.Assign(flags.any(MimgModifier::Lod));
info.is_array.Assign(mimg.da);
info.is_unnormalized.Assign(mimg.unrm);
+ info.is_r128.Assign(mimg.r128);
if (gather) {
info.gather_comp.Assign(std::bit_width(mimg.dmask) - 1);
@@ -617,6 +622,7 @@ void Translator::IMAGE_GET_LOD(const GcnInst& inst) {
IR::TextureInstInfo info{};
info.is_array.Assign(mimg.da);
+ info.is_r128.Assign(mimg.r128);
const IR::Value handle = ir.GetScalarReg(tsharp_reg);
const IR::Value body = ir.CompositeConstruct(
diff --git a/src/shader_recompiler/info.h b/src/shader_recompiler/info.h
index 12e48c8e4..24e0741c1 100644
--- a/src/shader_recompiler/info.h
+++ b/src/shader_recompiler/info.h
@@ -41,7 +41,9 @@ constexpr u32 NUM_TEXTURE_TYPES = 7;
enum class BufferType : u32 {
Guest,
- ReadConstUbo,
+ Flatbuf,
+ BdaPagetable,
+ FaultBuffer,
GdsBuffer,
SharedMemory,
};
@@ -62,7 +64,14 @@ struct BufferResource {
}
bool IsStorage(const AmdGpu::Buffer& buffer, const Profile& profile) const noexcept {
- return buffer.GetSize() > profile.max_ubo_size || is_written;
+ // When using uniform buffers, a size is required at compilation time, so we need to
+ // either compile a lot of shader specializations to handle each size or just force it to
+ // the maximum possible size always. However, for some vendors the shader-supplied size is
+ // used for bounds checking uniform buffer accesses, so the latter would effectively turn
+ // off buffer robustness behavior. Instead, force storage buffers which are bounds checked
+ // using the actual buffer size. We are assuming the performance hit from this is
+ // acceptable.
+ return true; // buffer.GetSize() > profile.max_ubo_size || is_written;
}
[[nodiscard]] constexpr AmdGpu::Buffer GetSharp(const Info& info) const noexcept;
@@ -75,6 +84,7 @@ struct ImageResource {
bool is_atomic{};
bool is_array{};
bool is_written{};
+ bool is_r128{};
[[nodiscard]] constexpr AmdGpu::Image GetSharp(const Info& info) const noexcept;
};
@@ -208,11 +218,18 @@ struct Info {
bool stores_tess_level_outer{};
bool stores_tess_level_inner{};
bool translation_failed{};
- bool has_readconst{};
u8 mrt_mask{0u};
bool has_fetch_shader{false};
u32 fetch_shader_sgpr_base{0u};
+ enum class ReadConstType {
+ None = 0,
+ Immediate = 1 << 0,
+ Dynamic = 1 << 1,
+ };
+ ReadConstType readconst_types{};
+ IR::Type dma_types{IR::Type::Void};
+
explicit Info(Stage stage_, LogicalStage l_stage_, ShaderParams params)
: stage{stage_}, l_stage{l_stage_}, pgm_hash{params.hash}, pgm_base{params.Base()},
user_data{params.user_data} {}
@@ -270,13 +287,20 @@ struct Info {
sizeof(tess_constants));
}
};
+DECLARE_ENUM_FLAG_OPERATORS(Info::ReadConstType);
constexpr AmdGpu::Buffer BufferResource::GetSharp(const Info& info) const noexcept {
return inline_cbuf ? inline_cbuf : info.ReadUdSharp(sharp_idx);
}
constexpr AmdGpu::Image ImageResource::GetSharp(const Info& info) const noexcept {
- const auto image = info.ReadUdSharp(sharp_idx);
+ AmdGpu::Image image{0};
+ if (!is_r128) {
+ image = info.ReadUdSharp(sharp_idx);
+ } else {
+ AmdGpu::Buffer buf = info.ReadUdSharp(sharp_idx);
+ memcpy(&image, &buf, sizeof(buf));
+ }
if (!image.Valid()) {
// Fall back to null image if unbound.
return AmdGpu::Image::Null();
diff --git a/src/shader_recompiler/ir/abstract_syntax_list.cpp b/src/shader_recompiler/ir/abstract_syntax_list.cpp
new file mode 100644
index 000000000..0d967ac11
--- /dev/null
+++ b/src/shader_recompiler/ir/abstract_syntax_list.cpp
@@ -0,0 +1,44 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "abstract_syntax_list.h"
+
+namespace Shader::IR {
+
+std::string DumpASLNode(const AbstractSyntaxNode& node,
+ const std::map& block_to_index,
+ const std::map& inst_to_index) {
+ switch (node.type) {
+ case AbstractSyntaxNode::Type::Block:
+ return fmt::format("Block: ${}", block_to_index.at(node.data.block));
+ case AbstractSyntaxNode::Type::If:
+ return fmt::format("If: cond = %{}, body = ${}, merge = ${}",
+ inst_to_index.at(node.data.if_node.cond.Inst()),
+ block_to_index.at(node.data.if_node.body),
+ block_to_index.at(node.data.if_node.merge));
+ case AbstractSyntaxNode::Type::EndIf:
+ return fmt::format("EndIf: merge = ${}", block_to_index.at(node.data.end_if.merge));
+ case AbstractSyntaxNode::Type::Loop:
+ return fmt::format("Loop: body = ${}, continue = ${}, merge = ${}",
+ block_to_index.at(node.data.loop.body),
+ block_to_index.at(node.data.loop.continue_block),
+ block_to_index.at(node.data.loop.merge));
+ case AbstractSyntaxNode::Type::Repeat:
+ return fmt::format("Repeat: cond = %{}, header = ${}, merge = ${}",
+ inst_to_index.at(node.data.repeat.cond.Inst()),
+ block_to_index.at(node.data.repeat.loop_header),
+ block_to_index.at(node.data.repeat.merge));
+ case AbstractSyntaxNode::Type::Break:
+ return fmt::format("Break: cond = %{}, merge = ${}, skip = ${}",
+ inst_to_index.at(node.data.break_node.cond.Inst()),
+ block_to_index.at(node.data.break_node.merge),
+ block_to_index.at(node.data.break_node.skip));
+ case AbstractSyntaxNode::Type::Return:
+ return "Return";
+ case AbstractSyntaxNode::Type::Unreachable:
+ return "Unreachable";
+ };
+ UNREACHABLE();
+}
+
+} // namespace Shader::IR
\ No newline at end of file
diff --git a/src/shader_recompiler/ir/abstract_syntax_list.h b/src/shader_recompiler/ir/abstract_syntax_list.h
index 313a23abc..a620baccb 100644
--- a/src/shader_recompiler/ir/abstract_syntax_list.h
+++ b/src/shader_recompiler/ir/abstract_syntax_list.h
@@ -3,6 +3,7 @@
#pragma once
+#include