GS/HW: Cleanup gl and vk shaders.

gl: Rename fetch_rt to sample_from_rt to match vk shaders, remove old atst call.

vk: Make sure shuffle values have correct unsigned type.

.github/workflows/cron_publish_flatpak.yml

@@ -10,6 +10,7 @@ jobs:
     if: github.repository == 'PCSX2/pcsx2'
     name: "Check if release is needed"
     runs-on: ubuntu-latest
+    timeout-minutes: 180
     outputs:
       PCSX2_RELEASE: ${{ steps.getinfo.outputs.PCSX2_RELEASE }}
       FLATHUB_RELEASE: ${{ steps.getinfo.outputs.FLATHUB_RELEASE }}

.github/workflows/linux_build_qt.yml

@@ -55,7 +55,7 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 100M
+      CCACHE_MAXSIZE: 500M
 
     steps:
       - name: Checkout Repository

.github/workflows/macos_build.yml

@@ -25,6 +25,10 @@ on:
         required: false
         type: boolean
         default: false
+      sign_and_notarize:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_macos:
@@ -38,7 +42,9 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 100M
+      CCACHE_MAXSIZE: 500M
+      # Only way to use a secret in an if statement
+      SIGN_KEY: ${{ secrets.APPLE_SIGN_P12_B64 }}
 
     steps:
       - name: Checkout Repository
@@ -143,6 +149,38 @@ jobs:
         run: make -j$(getconf _NPROCESSORS_ONLN) unittests
 
       - name: Prepare Build Artifacts
+        run: |
+          mv build/pcsx2*/PCSX2.app PCSX2.app
+
+      - name: Pull the Signing Keys and Notarization Credentials
+        if: ${{ inputs.sign_and_notarize == true && env.SIGN_KEY }}
+        run: |
+          echo "${{ secrets.APPLE_SIGN_P12_B64 }}" | base64 -d > cert.p12
+          echo "${{ secrets.APPLE_APPSTORECONNECT_CFG }}" | base64 -d > key.json
+
+      - name: Sign the Application
+        if: ${{ inputs.sign_and_notarize == true && env.SIGN_KEY }}
+        uses: indygreg/apple-code-sign-action@v1.1
+        with:
+          input_path: 'PCSX2.app'
+          p12_file: cert.p12
+          p12_password: "${{ secrets.APPLE_SIGN_P12_PASS }}"
+          sign_args: |
+            --for-notarization
+            --code-signature-flags=runtime
+            --entitlements-xml-file=pcsx2/Resources/PCSX2.entitlements
+          notarize: true
+          # max_wait_seconds is only present on my fork located at F0bes/apple-code-sign-action@demo4
+          # If we are timing out we should switch to the newest upstream (if I get it upstreamed)
+          # or use my fork.
+          # max_wait_seconds: '2000'
+          staple: true
+          # Generated using rcodesign
+          # Despite what the docs say, I found that this file is required and I had 0 luck
+          # passing the issuer id, key, etc through arguments.
+          app_store_connect_api_key_json_file: 'key.json'
+
+      - name: Zip Build Artifacts
         run: |
           TAG="$(git tag --points-at HEAD)"
           if [ -z "$TAG" ]; then
@@ -150,7 +188,7 @@ jobs:
           else
             APPNAME="PCSX2-$TAG"
           fi
-          mv build/pcsx2*/PCSX2.app "$APPNAME.app"
+          mv PCSX2.app "$APPNAME.app"
           tar --options xz:compression-level=9 -cvJf "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" "$APPNAME.app"
           mkdir ci-artifacts
           cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz

.github/workflows/macos_build_matrix.yml

@@ -16,4 +16,5 @@ jobs:
     with:
       jobName: "MacOS Build"
       artifactPrefixName: "PCSX2-macos-Qt"
+      sign_and_notarize: true # If we find that notarization takes a long time we should disable that on PR builds
     secrets: inherit

.github/workflows/release_cut_new.yml

@@ -148,6 +148,7 @@ jobs:
       artifactPrefixName: "PCSX2-macos-Qt"
       fetchTags: true
       stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
+      sign_and_notarize: true
     secrets: inherit
 
   # Upload the Artifacts

bin/resources/shaders/opengl/tfx_fs.glsl

@@ -111,7 +111,7 @@ layout(binding = 3) uniform sampler2D img_prim_min;
 //layout(pixel_center_integer) in vec4 gl_FragCoord;
 #endif
 
-vec4 fetch_rt()
+vec4 sample_from_rt()
 {
 #if !NEEDS_RT
 	return vec4(0.0);
@@ -127,7 +127,7 @@ vec4 fetch_rt()
 vec4 sample_c(vec2 uv)
 {
 #if PS_TEX_IS_FB == 1
-	return fetch_rt();
+	return sample_from_rt();
 #elif PS_REGION_RECT
 	return texelFetch(TextureSampler, ivec2(uv), 0);
 #else
@@ -312,7 +312,7 @@ int fetch_raw_depth()
 	float multiplier = exp2(32.0f);
 
 #if PS_TEX_IS_FB == 1
-	return int(fetch_rt().r * multiplier);
+	return int(sample_from_rt().r * multiplier);
 #else
 	return int(texelFetch(TextureSampler, ivec2(gl_FragCoord.xy), 0).r * multiplier);
 #endif
@@ -321,7 +321,7 @@ int fetch_raw_depth()
 vec4 fetch_raw_color()
 {
 #if PS_TEX_IS_FB == 1
-	return fetch_rt();
+	return sample_from_rt();
 #else
 	return texelFetch(TextureSampler, ivec2(gl_FragCoord.xy), 0);
 #endif
@@ -697,8 +697,6 @@ vec4 ps_color()
 	
 	vec4 C = tfx(T, PSin.c);
 
-	atst(C);
-
 	fog(C, PSin.t_float.z);
 
 	return C;
@@ -709,9 +707,9 @@ void ps_fbmask(inout vec4 C)
 	// FIXME do I need special case for 16 bits
 #if PS_FBMASK
 	#if PS_HDR == 1
-		vec4 RT = trunc(fetch_rt() * 65535.0f);
+		vec4 RT = trunc(sample_from_rt() * 65535.0f);
 	#else
-		vec4 RT = trunc(fetch_rt() * 255.0f + 0.1f);
+		vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
 	#endif
 	C = vec4((uvec4(C) & ~FbMask) | (uvec4(RT) & FbMask));
 #endif
@@ -799,7 +797,7 @@ float As = As_rgba.a;
 #endif
 
 #if SW_BLEND_NEEDS_RT
-	vec4 RT = fetch_rt();
+	vec4 RT = sample_from_rt();
 #else
 	// Not used, but we define it to make the selection below simpler.
 	vec4 RT = vec4(0.0f);
@@ -974,9 +972,9 @@ void ps_main()
 
 #if PS_WRITE_RG == 1
 	// Pseudo 16 bits access.
-	float rt_a = fetch_rt().g;
+	float rt_a = sample_from_rt().g;
 #else
-	float rt_a = fetch_rt().a;
+	float rt_a = sample_from_rt().a;
 #endif
 
 #if (PS_DATE & 3) == 1
@@ -1028,9 +1026,9 @@ void ps_main()
 
 #if SW_AD_TO_HW
 	#if PS_RTA_CORRECTION
-		vec4 RT = trunc(fetch_rt() * 128.0f + 0.1f);
+		vec4 RT = trunc(sample_from_rt() * 128.0f + 0.1f);
 	#else
-		vec4 RT = trunc(fetch_rt() * 255.0f + 0.1f);
+		vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
 	#endif
 
 	vec4 alpha_blend = vec4(RT.a / 128.0f);

bin/resources/shaders/vulkan/tfx.glsl

@@ -954,7 +954,7 @@ vec4 ps_color()
 			T.a = float(denorm_c_before.a & 0x80u);
 		#else
 			T.r = float((denorm_c_before.r << 3) & 0xF8u);
-			T.g = float(((denorm_c_before.r >> 2) & 0x38) | ((denorm_c_before.g << 6) & 0xC0u));
+			T.g = float(((denorm_c_before.r >> 2) & 0x38u) | ((denorm_c_before.g << 6) & 0xC0u));
 			T.b = float((denorm_c_before.g << 1) & 0xF8u);
 			T.a = float(denorm_c_before.g & 0x80u);
 		#endif

pcsx2-qt/Translations/pcsx2-qt_en.ts

@@ -16585,7 +16585,7 @@ Close any other instances of PCSX2, or restart your computer.
     </message>
     <message>
         <location filename="../../pcsx2/SIO/Memcard/MemoryCardFile.cpp" line="497"/>
-        <location filename="../../pcsx2/SIO/Memcard/MemoryCardFolder.cpp" line="2344"/>
+        <location filename="../../pcsx2/SIO/Memcard/MemoryCardFolder.cpp" line="2345"/>
         <source>Memory Card &apos;{}&apos; was saved to storage.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,12 +18285,12 @@ Ejecting {3} and replacing it with {2}.</source>
 <context>
     <name>Pcsx2Config</name>
     <message>
-        <location filename="../../pcsx2/Pcsx2Config.cpp" line="1118"/>
+        <location filename="../../pcsx2/Pcsx2Config.cpp" line="1135"/>
         <source>Disabled (Noisy)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../pcsx2/Pcsx2Config.cpp" line="1119"/>
+        <location filename="../../pcsx2/Pcsx2Config.cpp" line="1136"/>
         <source>TimeStretch (Recommended)</source>
         <translation type="unfinished"></translation>
     </message>

pcsx2/CMakeLists.txt

@@ -1347,6 +1347,7 @@ function(setup_main_executable target)
 		set_target_properties(${target} PROPERTIES
 			MACOSX_BUNDLE true
 			MACOSX_BUNDLE_INFO_PLIST "${PCSX2_SOURCE_DIR}/Resources/Info.plist.in"
+			XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${PCSX2_SOURCE_DIR}/Resources/PCSX2.entitlements"
 			OUTPUT_NAME PCSX2
 			# Fixes complaints when Xcode tries to sign for running locally about MoltenVK not being signed
 			XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS --deep

pcsx2/Host/SDLAudioStream.cpp

@@ -37,6 +37,9 @@ static bool InitializeSDLAudio(Error* error)
 	if (initialized)
 		return true;
 
+	// Set the name that shows up in the audio mixers on some platforms
+	SDL_SetHint("SDL_AUDIO_DEVICE_APP_NAME", "PCSX2");
+
 	// May as well keep it alive until the process exits.
 	if (SDL_InitSubSystem(SDL_INIT_AUDIO) != 0)
 	{

pcsx2/Resources/PCSX2.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+	<key>com.apple.security.device.audio-input</key>
+	<true/>
+</dict>
+</plist>

pcsx2/ShaderCacheVersion.h

@@ -3,4 +3,4 @@
 
 /// Version number for GS and other shaders. Increment whenever any of the contents of the
 /// shaders change, to invalidate the cache.
-static constexpr u32 SHADER_CACHE_VERSION = 58;
+static constexpr u32 SHADER_CACHE_VERSION = 59;