Merge branch 'feature/pvlookup' into develop

Provenance-Emu · Dec 18, 2024 · b0b39c4 · b0b39c4
2 parents eb18575 + accb71a
commit b0b39c4
Show file tree

Hide file tree

Showing 120 changed files with 12,209 additions and 2,500 deletions.
diff --git a/Cores/VecX/BuildFlags.xcconfig b/Cores/VecX/BuildFlags.xcconfig
@@ -7,13 +7,17 @@
 //
 
 // All
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) __LIBRETRO__=1 STATIC_LINKING=1 FRONTEND_SUPPORTS_RGB565=1 HAVE_STRINGS=1 HAVE_STDINT_H=1 HAVE_INTTYPES_H=1 INLINE=inline HAVE_OPENGLES=1 HAVE_OPENGLES2=1
-// HAVE_OPENGLES3=1 HAVE_OPENGLES_3_1=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) __LIBRETRO__=1 STATIC_LINKING=1 FRONTEND_SUPPORTS_RGB565=1 HAVE_STRINGS=1 HAVE_STDINT_H=1 HAVE_INTTYPES_H=1 INLINE=inline
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAVE_OPENGLES=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAVE_OPENGLES2=1
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAS_GPU=1
+//GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAVE_OPENGLES3=1
+
+// HAVE_OPENGLES_3_1=1
 // HAVE_LIBNX=1
 // TODO: Fix linking with HAS_GPU
-// HAS_GPU=1
 // C_DYNREC=0
-// HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1
+// HAVE_OPENGLES3_1=1
 //GCC_PREPROCESSOR_DEFINITIONS[configuration=Debug] = $(inherited) DEBUG=1
 //GCC_PREPROCESSOR_DEFINITIONS[configuration=Release] = $(inherited) NDEBUG=1
 

diff --git a/Cores/VecX/PVVecX.xcodeproj/project.pbxproj b/Cores/VecX/PVVecX.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
 		B380C2692894EB37007B76FD /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B380C2682894EB37007B76FD /* OpenGL.framework */; platformFilters = (maccatalyst, macos, ); };
 		B39768F82859E23200558958 /* libvecx-libretro.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B3344BC32859E088006E6B3A /* libvecx-libretro.a */; };
 		B3AFCF842977A72900A01010 /* PVLogging in Frameworks */ = {isa = PBXBuildFile; productRef = B3AFCF832977A72900A01010 /* PVLogging */; };
+		B3B498092D0D72BE00CB02D4 /* glsm.c in Sources */ = {isa = PBXBuildFile; fileRef = B3B498072D0D72B700CB02D4 /* glsm.c */; };
 		B3C7621D20783243009950E4 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3C7621C20783243009950E4 /* OpenGLES.framework */; platformFilters = (ios, tvos, watchos, ); };
 		B3C7621F2078325C009950E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3C7621E2078325C009950E4 /* Foundation.framework */; };
 		B3C8A65F2877D6350037A946 /* PVVecXCore+Controls.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3447E97218B809300557ACE /* PVVecXCore+Controls.mm */; };
@@ -111,6 +112,7 @@
 		B3A41BEC286E76330054E9A5 /* PVLibRetro.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVLibRetro.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3A41BEF286E76490054E9A5 /* PVLibRetro.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVLibRetro.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3B104B8218F281B00210C39 /* PVSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PVSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B3B498072D0D72B700CB02D4 /* glsm.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = glsm.c; sourceTree = "<group>"; };
 		B3C7621020783162009950E4 /* PVVecX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PVVecX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B3C7621320783162009950E4 /* PVVecX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PVVecX.h; sourceTree = "<group>"; };
 		B3C7621420783162009950E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -235,6 +237,14 @@
 			name = Core;
 			sourceTree = "<group>";
 		};
+		B3B498082D0D72B700CB02D4 /* glsm */ = {
+			isa = PBXGroup;
+			children = (
+				B3B498072D0D72B700CB02D4 /* glsm.c */,
+			);
+			path = glsm;
+			sourceTree = "<group>";
+		};
 		B3C7620620783162009950E4 = {
 			isa = PBXGroup;
 			children = (
@@ -340,6 +350,7 @@
 		B3E6C1A92894D32A00CF98C7 /* libretro-common */ = {
 			isa = PBXGroup;
 			children = (
+				B3B498082D0D72B700CB02D4 /* glsm */,
 				B3E6C1AA2894D32A00CF98C7 /* glsym */,
 				B3E6C1B22894D32A00CF98C7 /* include */,
 			);
@@ -602,6 +613,7 @@
 			files = (
 				B380C2592894E846007B76FD /* libretro.c in Sources */,
 				B353CC06293F86B900124F12 /* glsym_es2.c in Sources */,
+				B3B498092D0D72BE00CB02D4 /* glsm.c in Sources */,
 				B3EB8B28293F835000BCCBAE /* rglgen.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -808,7 +820,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "vecx-libretro";
@@ -829,7 +841,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "vecx-libretro";
@@ -850,7 +862,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "vecx-libretro";

diff --git a/Cores/VecX/Sources/PVVecX/PVVecXCore+Video.m b/Cores/VecX/Sources/PVVecX/PVVecXCore+Video.m
@@ -50,23 +50,23 @@ @implementation PVVecXCoreBridge (Video)
 
 # pragma mark - Properties
 
-- (CGSize)bufferSize {
-    CGSize size = CGSizeMake(av_info.geometry.max_width, av_info.geometry.max_height);
-    DLOG(@"<%i, %i>", size.width, size.height);
-    return size;
-}
-
-- (CGRect)screenRect {
-    CGRect rect = CGRectMake(0, 0, av_info.geometry.base_width, av_info.geometry.base_height);
-    DLOG(@"<%i, %i>", rect.size.width, rect.size.height);
-    return rect;
-}
-
-- (CGSize)aspectSize {
-    CGSize size = CGSizeMake(1, av_info.geometry.aspect_ratio);
-    DLOG(@"<%i, %i>", size.width, size.height);
-    return size;
-}
+//- (CGSize)bufferSize {
+//    CGSize size = CGSizeMake(av_info.geometry.max_width, av_info.geometry.max_height);
+//    DLOG(@"<%i, %i>", size.width, size.height);
+//    return size;
+//}
+//
+//- (CGRect)screenRect {
+//    CGRect rect = CGRectMake(0, 0, av_info.geometry.base_width, av_info.geometry.base_height);
+//    DLOG(@"<%i, %i>", rect.size.width, rect.size.height);
+//    return rect;
+//}
+//
+//- (CGSize)aspectSize {
+//    CGSize size = CGSizeMake(1, av_info.geometry.aspect_ratio);
+//    DLOG(@"<%i, %i>", size.width, size.height);
+//    return size;
+//}
 
 //- (BOOL)rendersToOpenGL {
 //    return YES;
@@ -97,22 +97,22 @@ - (CGSize)aspectSize {
  info->geometry.aspect_ratio = 33.0 / 41.0;
  */
 
-- (GLenum)pixelFormat {
-    return GL_RGB;
-}
-
-- (GLenum)pixelType {
-    return GL_UNSIGNED_SHORT_1_5_5_5_REV;
-}
-
-- (GLenum)internalPixelFormat {
-    // TODO: use struct retro_pixel_format var, set with, RETRO_ENVIRONMENT_SET_PIXEL_FORMAT
-#if !TARGET_OS_OSX && !TARGET_OS_MACCATALYST
-        return GL_RGB565;
-#else
-         return GL_UNSIGNED_SHORT_5_6_5;
-#endif
-}
+//- (GLenum)pixelFormat {
+//    return GL_RGB;
+//}
+//
+//- (GLenum)pixelType {
+//    return GL_UNSIGNED_SHORT_1_5_5_5_REV;
+//}
+//
+//- (GLenum)internalPixelFormat {
+//    // TODO: use struct retro_pixel_format var, set with, RETRO_ENVIRONMENT_SET_PIXEL_FORMAT
+//#if !TARGET_OS_OSX && !TARGET_OS_MACCATALYST
+//        return GL_RGB565;
+//#else
+//         return GL_UNSIGNED_SHORT_5_6_5;
+//#endif
+//}
 
 //
 //- (GLenum)depthFormat {

diff --git a/Cores/VecX/Sources/PVVecX/PVVecXCore.h b/Cores/VecX/Sources/PVVecX/PVVecXCore.h
@@ -17,7 +17,7 @@
 #define GET_CURRENT_OR_RETURN(...)  __strong __typeof__(_current) current = _current; if(current == nil) return __VA_ARGS__;
 
 __attribute__((visibility("default")))
-@interface PVVecXCoreBridge : PVLibRetroCoreBridge <PVVectrexSystemResponderClient> {
+@interface PVVecXCoreBridge : PVLibRetroGLESCoreBridge <PVVectrexSystemResponderClient> {
 //	uint8_t padData[4][PVDOSButtonCount];
 //	int8_t xAxis[4];
 //	int8_t yAxis[4];

diff --git a/Cores/VecX/Sources/PVVecX/PVVecXCore.mm b/Cores/VecX/Sources/PVVecX/PVVecXCore.mm
@@ -118,7 +118,7 @@ - (void *)getVariable:(const char *)variable {
     } else if (V("vecx_res_multi")) {
         // Internal Resolution Multiplier
         // 1,2,3,4
-        char *value = strdup("4");
+        char *value = strdup("2");
         return value;
     } else if (V("vecx_res_hw")) {
         // Hardware Rendering Resolution