Merge branch 'release/2.0.4'

CHANGELOG.md

@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.3] - 2021-12-16
+## [2.0.4] - 2021-12-24
+
+### Fixed
+
+- #1651 Fixed N64 / Mupen blank video @mrjschulte
+- #1652 Update TVL in crt_fragment.glsl to reduce moirée effects at UHD @mrjschulte
+- #1654 Remove absolute path to file from .xcodeproj @davidmuzi
+- mupen replace consts with define, whole module for archive builds @JoeMatt
+
+## [2.0.3] - 2021-12-22
 
 ### Added
 

Cores/Mednafen/MednafenGameCore.mm

@@ -130,6 +130,8 @@ @interface MednafenGameCore () <PVPSXSystemResponderClient, PVWonderSwanSystemRe
 static __weak MednafenGameCore *_current;
 
 @implementation MednafenGameCore
+@dynamic mednafen_pceFast;
+@dynamic mednafen_snesFast;
 
 -(uint32_t*) getInputBuffer:(int)bufferId
 {

Cores/Mednafen/MednafenGameCore.swift

@@ -110,6 +110,6 @@ extension MednafenGameCore: CoreOptional {
 }
 
 @objc public extension MednafenGameCore {
-    @objc var mednafen_pceFast: Bool { MednafenGameCore.valueForOption(MednafenGameCore.pceFastOption).asBool }
-    @objc var mednafen_snesFast: Bool { MednafenGameCore.valueForOption(MednafenGameCore.snesFastOption).asBool }
+    @objc(mednafen_pceFast) var mednafen_pceFast: Bool { MednafenGameCore.valueForOption(MednafenGameCore.pceFastOption).asBool }
+    @objc(mednafen_snesFast) var mednafen_snesFast: Bool { MednafenGameCore.valueForOption(MednafenGameCore.snesFastOption).asBool }
 }

Cores/Mupen64Plus/MupenGameCore.m

@@ -53,6 +53,12 @@
 @import GLKit;
 #endif
 
+#define WIDTH 640
+#define HEIGHT 480
+#define WIDTHf 640.0f
+#define HEIGHTf 480.0f
+
+
 #if TARGET_OS_TV
 #define RESIZE_TO_FULLSCREEN TRUE
 #else
@@ -135,15 +141,15 @@ - (instancetype)init
         coreWaitToEndFrameSemaphore    = dispatch_semaphore_create(0);
         if(RESIZE_TO_FULLSCREEN) {
             CGSize size = UIApplication.sharedApplication.keyWindow.bounds.size;
-            float widthScale = floor(size.height / 640.0);
-            float heightScale = floor(size.height / 480.0);
+            float widthScale = floor(size.height / WIDTHf);
+            float heightScale = floor(size.height / HEIGHTf);
             float scale = MAX(MIN(widthScale, heightScale), 1);
-            _videoWidth =  scale * 640.0;
-            _videoHeight = scale * 480.0;
+            _videoWidth =  scale * WIDTHf;
+            _videoHeight = scale * HEIGHTf;
             DLOG(@"Upscaling on: scale rounded to (%f)",scale);
         } else {
-            _videoWidth  = 640;
-            _videoHeight = 480;
+            _videoWidth  = WIDTH;
+            _videoHeight = HEIGHT;
         }
 
         _videoBitDepth = 32; // ignored
@@ -639,15 +645,15 @@ static void ConfigureVideoGeneral() {
 	int useFullscreen = 1;
 	ConfigSetParameter(general, "Fullscreen", M64TYPE_BOOL, &useFullscreen);
 
-    int screenWidth = 640;
-    int screenHeight = 480;
+    int screenWidth = WIDTH;
+    int screenHeight = HEIGHT;
     if(RESIZE_TO_FULLSCREEN) {
         CGSize size = UIApplication.sharedApplication.keyWindow.bounds.size;
-        float widthScale = floor(size.height / 640.0);
-        float heightScale = floor(size.height / 480.0);
+        float widthScale = floor(size.height / WIDTHf);
+        float heightScale = floor(size.height / HEIGHTf);
         float scale = MAX(MIN(widthScale, heightScale), 1);
-        screenWidth =  scale * 640.0;
-        screenHeight = scale * 480.0;
+        screenWidth =  scale * WIDTHf;
+        screenHeight = scale * HEIGHTf;
     }
 
 	// Screen width
@@ -1021,7 +1027,7 @@ - (BOOL)loadFileAtPath:(NSString *)path error:(NSError**)error {
 
 	BOOL success = NO;
 
-#if !TARGET_OS_MAC
+#if !TARGET_OS_MACCATALYST
 	EAGLContext* context = [self bestContext];
 #endif
 
@@ -1111,11 +1117,11 @@ - (BOOL)loadFileAtPath:(NSString *)path error:(NSError**)error {
         UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
         if(keyWindow != nil) {
             CGSize fullScreenSize = keyWindow.bounds.size;
-            float widthScale = floor(fullScreenSize.height / 640.0);
-            float heightScale = floor(fullScreenSize.height / 480.0);
+            float widthScale = floor(fullScreenSize.height / WIDTHf);
+            float heightScale = floor(fullScreenSize.height / WIDTHf);
             float scale = MAX(MIN(widthScale, heightScale), 1);
-            float widthScaled =  scale * 640.0;
-            float heightScaled = scale * 480.0;
+            float widthScaled =  scale * WIDTHf;
+            float heightScaled = scale * HEIGHTf;
 
             [self tryToResizeVideoTo:CGSizeMake(widthScaled, heightScaled)];
         }
@@ -1127,7 +1133,7 @@ - (BOOL)loadFileAtPath:(NSString *)path error:(NSError**)error {
     return YES;
 }
 
-#if !TARGET_OS_MAC
+#if !TARGET_OS_MACCATALYST
 -(EAGLContext*)bestContext {
 	EAGLContext* context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
 	self.glesVersion = GLESVersion3;

Cores/Mupen64Plus/PVMupen64Plus.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		B30BF1AE2775320F00FF9E07 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B30BF1AD2775320F00FF9E07 /* libz.tbd */; };
 		B316B4E9219275A800693472 /* GLideN64.custom.ini in Resources */ = {isa = PBXBuildFile; fileRef = DFB601CA2038AE78001E70F1 /* GLideN64.custom.ini */; };
 		B316B4EA219275A800693472 /* GLideN64.ini in Resources */ = {isa = PBXBuildFile; fileRef = DFB601CB2038AE78001E70F1 /* GLideN64.ini */; };
 		B316B4EB219275A800693472 /* RiceVideoLinux.ini in Resources */ = {isa = PBXBuildFile; fileRef = B3A302912073F2AA008C1955 /* RiceVideoLinux.ini */; };
@@ -1443,6 +1444,7 @@
 		B3055AD82072FEE9001212D2 /* sdl_key_converter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_key_converter.c; sourceTree = "<group>"; };
 		B3055AD92072FEE9001212D2 /* eventloop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eventloop.h; sourceTree = "<group>"; };
 		B3055BEE20730B60001212D2 /* PVSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B30BF1AD2775320F00FF9E07 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
 		B3303E4C1DED23C600896D96 /* libpng-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libpng-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3303E551DED23EE00896D96 /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = png.h; path = png/png.h; sourceTree = SOURCE_ROOT; };
 		B3303E561DED23EE00896D96 /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = png/pngconf.h; sourceTree = SOURCE_ROOT; };
@@ -2173,6 +2175,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B30BF1AE2775320F00FF9E07 /* libz.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3463,6 +3466,7 @@
 		B3B3B8551DECE9D800602746 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B30BF1AD2775320F00FF9E07 /* libz.tbd */,
 				B3F2058226FBCBC600A4196B /* OpenGL.framework */,
 				B3962AEB26FBD89A00FAEFC0 /* OpenGL.framework */,
 				B37263B626EA164E00E95488 /* libdl.tbd */,
@@ -6193,6 +6197,7 @@
 					"-fvisibility-inlines-hidden",
 				);
 				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 12.1;
 				VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;

Cores/PPSSPP/PVPPSSPP.xcodeproj/project.pbxproj

@@ -436,7 +436,7 @@
 		B3054321272022C800F5257D /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ppsspp/ffmpeg/ios/universal/lib/libavutil.a; sourceTree = "<group>"; };
 		B3054322272022C800F5257D /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ppsspp/ffmpeg/ios/universal/lib/libavformat.a; sourceTree = "<group>"; };
 		B305436B2720232900F5257D /* PVPPSSPP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PVPPSSPP.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		B305436C2720232900F5257D /* PVPPSSPP copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "PVPPSSPP copy-Info.plist"; path = "/Users/jmattiello/Workspace/Provenance/Provenance/Cores/PPSSPP/PVPPSSPP copy-Info.plist"; sourceTree = "<absolute>"; };
+		B305436C2720232900F5257D /* PVPPSSPP copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PVPPSSPP copy-Info.plist"; sourceTree = "<group>"; };
 		B305437727202A7200F5257D /* Core.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Core.plist; sourceTree = "<group>"; };
 		B30C6D96271D74EB0025DD88 /* PVPPSSPP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVPPSSPP.h; sourceTree = SOURCE_ROOT; };
 		B30C6D99271D773D0025DD88 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };

PVLibrary/PVLibrary.xcodeproj/project.pbxproj

@@ -2721,6 +2721,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2743,7 +2744,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2761,6 +2762,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2783,7 +2785,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2801,6 +2803,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2823,7 +2826,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2904,6 +2907,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = S32Z3HMYVQ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2926,7 +2930,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2946,6 +2950,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2968,7 +2973,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3138,6 +3143,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = S32Z3HMYVQ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3161,7 +3167,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3183,6 +3189,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = S32Z3HMYVQ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3205,7 +3212,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3224,6 +3231,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3246,7 +3254,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3264,6 +3272,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2779;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3286,7 +3295,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVLibrary";
 				PRODUCT_NAME = PVLibrary;
 				PROVISIONING_PROFILE_SPECIFIER = "";