Vulkan: Experimental fix for self-dependency barriers during renderpass (#431)

Fixes #387

.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
     - name: "Install system dependencies"
       run: |
         sudo apt update -qq
-        sudo apt install -y ninja-build cmake libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev freeglut3-dev clang-12 nasm
+        sudo apt install -y clang-12 cmake freeglut3-dev libgcrypt20-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build
     - name: "Bootstrap vcpkg"
       run: |
         bash ./dependencies/vcpkg/bootstrap-vcpkg.sh
@@ -162,6 +162,8 @@ jobs:
       with:
         name: cemu-bin-windows-x64
         path: ./bin/Cemu.exe
+
+
   build-macos:
     runs-on: macos-12
     steps:
@@ -213,7 +215,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. ${{ env.BUILD_FLAGS }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja
+        cmake .. ${{ env.BUILD_FLAGS }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_MODE }} -DPORTABLE=OFF -DMACOS_BUNDLE=ON -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja
         
     - name: "Build Cemu"
       run: |
@@ -221,11 +223,20 @@ jobs:
 
     - name: Prepare artifact
       if: ${{ inputs.deploymode == 'release' }}
-      run: chmod a+x bin/Cemu_release && mv bin/Cemu_release bin/Cemu
+      run: |
+        mkdir bin/Cemu_app
+        mv bin/Cemu_release.app bin/Cemu_app/Cemu.app
+        mv bin/Cemu_app/Cemu.app/Contents/MacOS/Cemu_release bin/Cemu_app/Cemu.app/Contents/MacOS/Cemu
+        sed -i '' 's/Cemu_release/Cemu/g' bin/Cemu_app/Cemu.app/Contents/Info.plist
+        chmod a+x bin/Cemu_app/Cemu.app/Contents/MacOS/Cemu
+        ln -s /Applications bin/Cemu_app/Applications
+        hdiutil create ./bin/tmp.dmg -ov -volname "Cemu" -fs HFS+ -srcfolder "./bin/Cemu_app"
+        hdiutil convert ./bin/tmp.dmg -format UDZO -o bin/Cemu.dmg
+        rm bin/tmp.dmg
               
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       if: ${{ inputs.deploymode == 'release' }}
       with:
         name: cemu-bin-macos-x64
-        path: ./bin/Cemu
+        path: ./bin/Cemu.dmg

.github/workflows/deploy_experimental_release.yml

@@ -64,13 +64,7 @@ jobs:
           rm -r ./${{ env.CEMU_FOLDER_NAME }}
           
       - name: Create release from macos-bin
-        run: |
-          ls ./
-          ls ./bin/
-          cp -R ./bin ./${{ env.CEMU_FOLDER_NAME }}
-          mv cemu-bin-macos-x64/Cemu ./${{ env.CEMU_FOLDER_NAME }}/Cemu
-          zip -9 -r upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.zip ${{ env.CEMU_FOLDER_NAME }}
-          rm -r ./${{ env.CEMU_FOLDER_NAME }}
+        run: cp cemu-bin-macos-x64/Cemu.dmg upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.dmg
 
       - name: Create release
         run: |

.github/workflows/deploy_stable_release.yml

@@ -68,13 +68,7 @@ jobs:
           rm -r ./${{ env.CEMU_FOLDER_NAME }}
           
       - name: Create release from macos-bin
-        run: |
-          ls ./
-          ls ./bin/
-          cp -R ./bin ./${{ env.CEMU_FOLDER_NAME }}
-          mv cemu-bin-macos-x64/Cemu ./${{ env.CEMU_FOLDER_NAME }}/Cemu
-          zip -9 -r upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.zip ${{ env.CEMU_FOLDER_NAME }}
-          rm -r ./${{ env.CEMU_FOLDER_NAME }}
+        run: cp cemu-bin-macos-x64/Cemu.dmg upload/cemu-${{ env.CEMU_VERSION }}-macos-12-x64.dmg
           
       - name: Create release
         run: |

.gitignore

@@ -30,9 +30,11 @@ bin/Cemu_*.ilk
 bin/Cemu.exe.backup
 bin/mlc01/*
 bin/settings.xml
+bin/network_services.xml
 bin/title_list_cache.xml
 bin/debugger/*
 bin/sdcard/*
+bin/screenshots/*
 
 !bin/shaderCache/info.txt
 bin/shaderCache/*

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "dependencies/Vulkan-Headers"]
 	path = dependencies/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers
+[submodule "dependencies/imgui"]
+	path = dependencies/imgui
+	url = https://github.com/ocornut/imgui

BUILD.md

@@ -25,7 +25,7 @@ To compile Cemu, a recent enough compiler and STL with C++20 support is required
 ### Installing dependencies
 
 #### For Ubuntu and derivatives:
-`sudo apt install -y git curl cmake ninja-build nasm libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev freeglut3-dev libpulse-dev` 
+`sudo apt install -y cmake curl freeglut3-dev git libgcrypt20-dev libgtk-3-dev libpulse-dev libsecret-1-dev libsystemd-dev nasm ninja-build` 
 
 *Additionally, for Ubuntu 22.04 only:*
  - `sudo apt install -y clang-12`
@@ -33,10 +33,10 @@ To compile Cemu, a recent enough compiler and STL with C++20 support is required
    `cmake -S . -B build -DCMAKE_BUILD_TYPE=release -DCMAKE_C_COMPILER=/usr/bin/clang-12 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-12 -G Ninja -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja`
 
 #### For Arch and derivatives:
-`sudo pacman -S git cmake clang ninja nasm base-devel linux-headers gtk3 libsecret libgcrypt systemd freeglut zip unzip libpulse`
+`sudo pacman -S --needed base-devel clang cmake freeglut git gtk3 libgcrypt libpulse libsecret linux-headers llvm nasm ninja systemd unzip zip`
 
 #### For Fedora and derivatives:
-`sudo dnf install git cmake clang ninja-build nasm kernel-headers gtk3-devel libsecret-devel libgcrypt-devel systemd-devel freeglut-devel perl-core zlib-devel cubeb-devel`
+`sudo dnf install clang cmake cubeb-devel freeglut-devel git gtk3-devel kernel-headers libgcrypt-devel libsecret-devel nasm ninja-build perl-core systemd-devel zlib-devel`
 
 ### Build Cemu using cmake and clang
 1. `git clone --recursive https://github.com/cemu-project/Cemu`
@@ -65,7 +65,10 @@ To compile Cemu, a recent enough compiler and STL with C++20 support is required
 below, built in LLVM, and Xcode LLVM don't support the C++20 feature set required. Currently, 
 LLVM 15 isn't supported due to compatibility issues with Boost dependency. The OpenGL graphics
 API isn't support on MacOS, Vulkan must be used. Additionally Vulkan must be used through the 
-Molten-VK compatibility layer.
+Molten-VK compatibility layer.  
+
+### Installing brew
+`/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
 
 ### Installing dependencies
 `brew install git cmake llvm@14 ninja nasm molten-vk`
@@ -73,7 +76,7 @@ Molten-VK compatibility layer.
 ### Build Cemu using cmake and clang
 1. `git clone --recursive https://github.com/cemu-project/Cemu`
 2. `cd Cemu`
-3. `cmake -S . -B build -DCMAKE_BUILD_TYPE=release -DPUBLIC_RELEASE=ON 
+3. `cmake -S . -B build -DCMAKE_BUILD_TYPE=release
    -DCMAKE_C_COMPILER=/usr/local/opt/llvm@14/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@14/bin/clang++ -G Ninja`
 4. `cmake --build build`
 5. You should now have a Cemu executable file in the /bin folder, which you can run using `./bin/Cemu_release`.

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.21.1)
 
 option(ENABLE_VCPKG "Enable the vcpkg package manager" ON)
+option(PORTABLE "All data created and maintained by Cemu will be in the directory where the executable file is located" ON)
+option(MACOS_BUNDLE "The executable when built on macOS will be created as an application bundle" OFF)
 set(EXPERIMENTAL_VERSION "" CACHE STRING "") # used by CI script to set experimental version
 
 if (EXPERIMENTAL_VERSION)
@@ -19,7 +21,7 @@ if (ENABLE_VCPKG)
 	endif()
 endif()
 
-project(Cemu VERSION 2.0)
+project(Cemu VERSION 2.0.0)
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
@@ -30,6 +32,10 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 add_compile_definitions($<$<CONFIG:Debug>:CEMU_DEBUG_ASSERT>) # if build type is debug, set CEMU_DEBUG_ASSERT
 
+if(PORTABLE)
+	add_compile_definitions(PORTABLE)
+endif()
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # enable link time optimization for release builds
@@ -83,7 +89,6 @@ find_package(Threads REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(CURL REQUIRED)
 find_package(pugixml REQUIRED)
-find_package(imgui REQUIRED)
 find_package(RapidJSON REQUIRED)
 find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED)
 find_package(libzip REQUIRED)

bin/gameProfiles/default/0005000010101a00.ini

@@ -1,7 +1 @@
-# LEGO City Undercover (USA)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# LEGO City Undercover (USA)

bin/gameProfiles/default/0005000010101b00.ini

@@ -1,7 +1 @@
-# LEGO City Undercover (EUR)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# LEGO City Undercover (EUR)

bin/gameProfiles/default/0005000010104d00.ini

@@ -1,5 +1,4 @@
 # Monster Hunter 3(tri-)GHD Ver. (JPN)
 
 [Graphics]
-GPUBufferCacheAccuracy = 1
 streamoutBufferCacheSize = 48

bin/gameProfiles/default/0005000010106100.ini

@@ -1,7 +1,4 @@
 # Super Mario 3D World (JPN)
 
-[CPU]
-
 [Graphics]
 accurateShaderMul = false
-GPUBufferCacheAccuracy = 2

bin/gameProfiles/default/000500001010EB00.ini

@@ -2,6 +2,3 @@
 
 [CPU]
 cpuMode = Singlecore-Recompiler
-
-[Graphics]
-GPUBufferCacheAccuracy = 2

bin/gameProfiles/default/000500001010F900.ini

@@ -1,7 +1 @@
-# Scribblenauts Unlimited (EUR)
-
-[General]
-loadSharedLibraries = true
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Scribblenauts Unlimited (EUR)

bin/gameProfiles/default/000500001010ac00.ini

@@ -1,7 +1 @@
-# Ben 10 Omniverse (USA)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Ben 10 Omniverse (USA)

bin/gameProfiles/default/000500001010b100.ini

@@ -1,4 +1 @@
-# Rayman Legends (USA)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Rayman Legends (USA)

bin/gameProfiles/default/000500001010b200.ini

@@ -1,7 +1 @@
-# Scribblenauts Unlimited (US)
-
-[General]
-loadSharedLibraries = true
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Scribblenauts Unlimited (US)

bin/gameProfiles/default/000500001010dc00.ini

@@ -1,4 +1 @@
-# Mass Effect 3 Special Edition (USA)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Mass Effect 3 Special Edition (USA)

bin/gameProfiles/default/000500001010dd00.ini

@@ -1,4 +1 @@
-# ZombiU (US)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# ZombiU (US)

bin/gameProfiles/default/000500001010e600.ini

@@ -1,4 +1 @@
-# 007 Legends (US)
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# 007 Legends (US)

bin/gameProfiles/default/000500001010e700.ini

@@ -1,7 +1 @@
-# Cabela's Dangerous Hunts 2013 (USA)
-
-[General]
-loadSharedLibraries = false
-
-[Graphics]
-GPUBufferCacheAccuracy = 0
+# Cabela's Dangerous Hunts 2013 (USA)