mirror of
https://github.com/perfect-dark-pc-port/perfect_dark.git
synced 2026-10-23 15:52:41 +02:00
port: also try GL4.1 core; a little bit of cleanup
This commit is contained in:
1 parent
41d5630eec
commit
efda5a5f44
4 files changed
+4
-10
No files matched your search
@@ -90,9 +90,7 @@ extern "C" {
|
|||||||
|
|
||||||
#ifndef PLATFORM_OSX
|
#ifndef PLATFORM_OSX
|
||||||
extern void bcopy(const void *, void *, size_t);
|
extern void bcopy(const void *, void *, size_t);
|
||||||
#endif
|
|
||||||
extern int bcmp(const void *, const void *, size_t);
|
extern int bcmp(const void *, const void *, size_t);
|
||||||
#ifndef PLATFORM_OSX
|
|
||||||
extern void bzero(void *, size_t);
|
extern void bzero(void *, size_t);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,8 @@ static void gfx_sdl_init(const struct GfxWindowInitSettings *set) {
|
|||||||
{ 0, 0, 0 }, // for command line override
|
{ 0, 0, 0 }, // for command line override
|
||||||
{ 3, 0, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY },
|
{ 3, 0, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY },
|
||||||
{ 3, 2, SDL_GL_CONTEXT_PROFILE_CORE },
|
{ 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;
|
u32 glcore = false;
|
||||||
|
|||||||
+2
-6
@@ -468,24 +468,20 @@ OSIntMask osSetIntMask(OSIntMask mask)
|
|||||||
/* libc compatibility wrappers */
|
/* libc compatibility wrappers */
|
||||||
|
|
||||||
#ifndef PLATFORM_OSX
|
#ifndef PLATFORM_OSX
|
||||||
#ifndef HAVE_BZERO
|
|
||||||
void bzero(void *ptr, size_t size)
|
void bzero(void *ptr, size_t size)
|
||||||
{
|
{
|
||||||
memset(ptr, 0, size);
|
memset(ptr, 0, size);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_BCOPY
|
|
||||||
void bcopy(const void *src, void *dst, size_t n)
|
void bcopy(const void *src, void *dst, size_t n)
|
||||||
{
|
{
|
||||||
memcpy(dst, src, n);
|
memcpy(dst, src, n);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_BCMP
|
|
||||||
s32 bcmp(const void *s1, const void *s2, size_t n)
|
s32 bcmp(const void *s1, const void *s2, size_t n)
|
||||||
{
|
{
|
||||||
return memcmp(s1, s2, n);
|
return memcmp(s1, s2, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -10,7 +10,6 @@
|
|||||||
#elif defined(__linux__)
|
#elif defined(__linux__)
|
||||||
#define PLATFORM_POSIX 1
|
#define PLATFORM_POSIX 1
|
||||||
#define PLATFORM_LINUX 1
|
#define PLATFORM_LINUX 1
|
||||||
// add osx
|
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
#define PLATFORM_POSIX 1
|
#define PLATFORM_POSIX 1
|
||||||
#define PLATFORM_OSX 1
|
#define PLATFORM_OSX 1
|
||||||
|
|||||||
Reference in new issue
Block a user