Misc changes

viehoang68 · Aug 18, 2024 · 7057603 · 7057603
1 parent 63938ba
commit 7057603
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -43,10 +43,10 @@ jobs:
         mv ${{github.workspace}}/build/shadps4 upload
         cp $(arch -x86_64 /usr/local/bin/brew --prefix)/opt/molten-vk/lib/libMoltenVK.dylib upload
         install_name_tool -add_rpath "@loader_path" upload/shadps4
-        tar cf shadps4-macos.tar.gz -C upload .
+        tar cf shadps4-macos-sdl.tar.gz -C upload .
 
     - name: Upload executable
       uses: actions/upload-artifact@v4
       with:
-        name: shadps4-macos
-        path: shadps4-macos.tar.gz
+        name: shadps4-macos-sdl
+        path: shadps4-macos-sdl.tar.gz
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Upload executable
       uses: actions/upload-artifact@v4
       with:
-        name: shadps4-win64
+        name: shadps4-win64-sdl
         path: |
           ${{github.workspace}}/build/Release/shadPS4.exe
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,7 +73,7 @@ find_package(glslang 14.2.0 CONFIG)
 find_package(magic_enum 0.9.6 CONFIG)
 find_package(RenderDoc 1.6.0 MODULE)
 find_package(SDL3 3.1.2 CONFIG)
-find_package(toml11 3.8.1 CONFIG)
+find_package(toml11 4.2.0 CONFIG)
 find_package(tsl-robin-map 1.3.0 CONFIG)
 find_package(VulkanHeaders 1.3.289 CONFIG)
 find_package(VulkanMemoryAllocator 3.1.0 CONFIG)

diff --git a/externals/glslang b/externals/glslang
diff --git a/externals/toml11 b/externals/toml11
diff --git a/externals/vma b/externals/vma
diff --git a/externals/vulkan-headers b/externals/vulkan-headers
diff --git a/externals/xxhash b/externals/xxhash
diff --git a/externals/zydis b/externals/zydis
diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
@@ -202,6 +202,11 @@ void MainWindow::CreateConnects() {
     connect(m_game_list_frame.get(), &QTableWidget::cellDoubleClicked, this,
             &MainWindow::StartGame);
 
+    connect(ui->configureAct, &QAction::triggered, this, [this]() {
+        auto settingsDialog = new SettingsDialog(m_physical_devices, this);
+        settingsDialog->exec();
+    });
+
     connect(ui->settingsButton, &QPushButton::clicked, this, [this]() {
         auto settingsDialog = new SettingsDialog(m_physical_devices, this);
         settingsDialog->exec();

diff --git a/src/qt_gui/main_window_ui.h b/src/qt_gui/main_window_ui.h
@@ -46,6 +46,7 @@ class Ui_MainWindow {
     QAction* dumpGameListAct;
     QAction* pkgViewerAct;
     QAction* aboutAct;
+    QAction* configureAct;
     QAction* setThemeDark;
     QAction* setThemeLight;
     QAction* setThemeGreen;
@@ -143,6 +144,8 @@ class Ui_MainWindow {
         pkgViewerAct->setIcon(QIcon(":images/file_icon.png"));
         aboutAct = new QAction(MainWindow);
         aboutAct->setObjectName("aboutAct");
+        configureAct = new QAction(MainWindow);
+        configureAct->setObjectName("configureAct");
         setThemeDark = new QAction(MainWindow);
         setThemeDark->setObjectName("setThemeDark");
         setThemeDark->setCheckable(true);
@@ -285,6 +288,7 @@ class Ui_MainWindow {
         menuGame_List_Mode->addAction(setlistModeListAct);
         menuGame_List_Mode->addAction(setlistModeGridAct);
         menuGame_List_Mode->addAction(setlistElfAct);
+        menuSettings->addAction(configureAct);
         menuSettings->addAction(gameInstallPathAct);
         menuSettings->addAction(menuUtils->menuAction());
         menuUtils->addAction(dumpGameListAct);
@@ -303,7 +307,8 @@ class Ui_MainWindow {
         bootInstallPkgAct->setText(
             QCoreApplication::translate("MainWindow", "Install Packages (PKG)", nullptr));
         bootGameAct->setText(QCoreApplication::translate("MainWindow", "Boot Game", nullptr));
-        aboutAct->setText(QCoreApplication::translate("MainWindow", "About", nullptr));
+        aboutAct->setText(QCoreApplication::translate("MainWindow", "About shadPS4", nullptr));
+        configureAct->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr));
 #if QT_CONFIG(tooltip)
         bootInstallPkgAct->setToolTip(QCoreApplication::translate(
             "MainWindow", "Install application from a .pkg file", nullptr));
+3 −3		.github/workflows/continuous_deployment.yml
+14 −27		.github/workflows/continuous_integration.yml
+1 −1		.github/workflows/scorecard.yml
+21 −22		Android.mk
+8 −1		CMakeLists.txt
+6 −2		README.md
+33 −33		SPIRV/CMakeLists.txt
+12 −10		StandAlone/CMakeLists.txt
+15 −3		StandAlone/StandAlone.cpp
+27 −10		glslang/CMakeLists.txt
+3 −0		glslang/MachineIndependent/ShaderLang.cpp
+9 −6		glslang/OSDependent/Unix/CMakeLists.txt
+1 −1		glslang/OSDependent/Web/CMakeLists.txt
+10 −4		glslang/OSDependent/Windows/CMakeLists.txt
+3 −0		glslang/Public/ShaderLang.h
+37 −0		glslang/stub.cpp
+1 −2		gtests/CMakeLists.txt
+1 −1		ndk_test/Android.mk
+20 −2		README.md
+16 −2		README_ja.md
+18 −0		docs/content.en/docs/changelog/_index.md
+11 −0		docs/content.en/docs/features/configure_types.md
+12 −3		docs/content.en/docs/reference/color.md
+18 −0		docs/content.ja/docs/changelog/_index.md
+11 −0		docs/content.ja/docs/features/configure_types.md
+12 −3		docs/content.ja/docs/reference/color.md
+6 −8		include/toml11/find.hpp
+1 −1		include/toml11/version.hpp
+7 −9		single_include/toml.hpp
+106 −0		tests/test_find_or.cpp
+7 −3		include/vulkan/vulkan.cppm
+107 −250		include/vulkan/vulkan.hpp
+14 −1		include/vulkan/vulkan_core.h
+4 −0		include/vulkan/vulkan_enums.hpp
+5 −3		include/vulkan/vulkan_extension_inspection.hpp
+3 −0		include/vulkan/vulkan_funcs.hpp
+6 −0		include/vulkan/vulkan_handles.hpp
+14 −0		include/vulkan/vulkan_hash.hpp
+37 −2		include/vulkan/vulkan_shared.hpp
+10 −0		include/vulkan/vulkan_static_assertions.hpp
+102 −0		include/vulkan/vulkan_structs.hpp
+1 −0		include/vulkan/vulkan_to_string.hpp
+52 −48		registry/validusage.json
+20 −14		registry/vk.xml
+1 −1		dependencies/zycore
+2 −2		examples/ZydisPerfTest.c
+20 −7		src/Utils.c