port: also try GL4.1 core; a little bit of cleanup

include/PR/os_libc.h

@@ -90,9 +90,7 @@ extern "C" {
 
 #ifndef PLATFORM_OSX
 extern void     bcopy(const void *, void *, size_t);
-#endif
 extern int      bcmp(const void *, const void *, size_t);
-#ifndef PLATFORM_OSX
 extern void     bzero(void *, size_t);
 #endif
 

port/fast3d/gfx_sdl2.cpp

@@ -130,7 +130,8 @@ static void gfx_sdl_init(const struct GfxWindowInitSettings *set) {
         { 0, 0, 0                                    }, // for command line override
         { 3, 0, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY },
         { 3, 2, SDL_GL_CONTEXT_PROFILE_CORE },
-        { 2, 1, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY },
+        { 4, 1, SDL_GL_CONTEXT_PROFILE_CORE },
+        { 2, 1, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY }, // will still require GLSL130
     };
 
     u32 glcore = false;

port/src/libultra.c

@@ -468,24 +468,20 @@ OSIntMask osSetIntMask(OSIntMask mask)
 /* libc compatibility wrappers */
 
 #ifndef PLATFORM_OSX
-#ifndef HAVE_BZERO
+
 void bzero(void *ptr, size_t size)
 {
 	memset(ptr, 0, size);
 }
-#endif
 
-#ifndef HAVE_BCOPY
 void bcopy(const void *src, void *dst, size_t n)
 {
 	memcpy(dst, src, n);
 }
-#endif
-#endif
 
-#ifndef HAVE_BCMP
 s32 bcmp(const void *s1, const void *s2, size_t n)
 {
 	return memcmp(s1, s2, n);
 }
+
 #endif

src/include/platform.h

@@ -10,7 +10,6 @@
 #elif defined(__linux__)
 	#define PLATFORM_POSIX 1
 	#define PLATFORM_LINUX 1
-// add osx
 #elif defined(__APPLE__)
 	#define PLATFORM_POSIX 1
 	#define PLATFORM_OSX 1