Merge branch 'release/3.0.3' into develop

Provenance-Emu · Jan 24, 2025 · e604473 · e604473
2 parents c672964 + d2e0d49
commit e604473
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -129,8 +129,12 @@ jobs:
 
       - name: Fakesign app
         run: |
-          echo "Checking entitlements file..."
+          echo "Contents of Provenance directory:"
           ls -la "Provenance/"
+          echo "Contents of ./ directory:"
+          ls -la "./"
+          echo "Contents of archive.xcarchive/Products/Applications/ directory:"
+          ls -la "archive.xcarchive/Products/Applications/"
           echo "Checking app binary..."
           ls -la "archive.xcarchive/Products/Applications/${{ matrix.APP_NAME }}.app/"
           ldid -S"Provenance/Provenance-AppStore.entitlements" "archive.xcarchive/Products/Applications/${{ matrix.APP_NAME }}.app/${{ matrix.APP_NAME }}" || echo "::warning::Fakesign failed but continuing build"

diff --git a/Cores/emuThree/PVEmuThreeCore/emuThree/CitraWrapper.mm b/Cores/emuThree/PVEmuThreeCore/emuThree/CitraWrapper.mm
@@ -153,8 +153,10 @@ -(void) setButtons {
 }
 
 -(void) setShaderOption {
-    Settings::values.use_hw_shader.SetValue([[NSUserDefaults standardUserDefaults] boolForKey:@"use_hw_shader"]);
-    Settings::values.shader_type.SetValue([[NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"shader_type"]] unsignedIntValue]);
+    unsigned int shaderType = [[NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"PVEmuThreeCore.Shader Acceleration / Graphic Accuracy"]] unsignedIntValue];
+
+    Settings::values.use_hw_shader.SetValue(shaderType >= 2);
+    Settings::values.shader_type.SetValue(shaderType);
     Settings::Apply();
 }