CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-05 17:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(APPLE) Take out SDL/GL context parts for OSX

Browse Source
This commit is contained in:
twinaphex 2013-07-16 23:17:55 +02:00
parent d3acd123f1
commit a5e4b5e7f8
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/context/sdl_ctx.c
View File

@ -21,13 +21,7 @@
#include "x11_common.h" #include "x11_common.h"
#endif #endif
#ifdef __APPLE__
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#else
#include "SDL/SDL_syswm.h" #include "SDL/SDL_syswm.h"
#endif
#include "SDL.h" #include "SDL.h"
#include "../math/matrix.h" #include "../math/matrix.h"
@ -61,9 +55,6 @@ static void gfx_ctx_swap_interval(unsigned interval)
GL_SYM_WRAP(wgl_swap_interval, "wglSwapIntervalEXT"); GL_SYM_WRAP(wgl_swap_interval, "wglSwapIntervalEXT");
if (wgl_swap_interval) if (wgl_swap_interval)
success = wgl_swap_interval(g_interval); success = wgl_swap_interval(g_interval);
#elif defined(__APPLE__) && defined(HAVE_OPENGL)
GLint val = g_interval;
success = CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &val) == 0;
#else #else
static int (*glx_swap_interval)(int) = NULL; static int (*glx_swap_interval)(int) = NULL;
if (!glx_swap_interval) if (!glx_swap_interval)
@ -150,11 +141,7 @@ static bool gfx_ctx_set_video_mode(
unsigned width, unsigned height, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
#ifndef __APPLE__ // Resizing on OSX is broken in 1.2 it seems :)
static const int resizable = SDL_RESIZABLE; static const int resizable = SDL_RESIZABLE;
#else
static const int resizable = 0;
#endif
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, g_interval); SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, g_interval);
@ -195,13 +182,7 @@ static bool gfx_ctx_set_video_mode(
// SDL 1.2 has an awkward model where you need to "confirm" window resizing. // SDL 1.2 has an awkward model where you need to "confirm" window resizing.
static void gfx_ctx_set_resize(unsigned width, unsigned height) static void gfx_ctx_set_resize(unsigned width, unsigned height)
{ {
#ifndef __APPLE__ // Resizing on OSX is broken in 1.2 it seems :)
SDL_SetVideoMode(width, height, 0, SDL_OPENGL | (g_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE)); SDL_SetVideoMode(width, height, 0, SDL_OPENGL | (g_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE));
#else
// Resize on OSX is broken.
(void)width;
(void)height;
#endif
} }
static void gfx_ctx_swap_buffers(void) static void gfx_ctx_swap_buffers(void)

2
gfx/sdl_gfx.c
View File

@ -31,9 +31,7 @@
#include "config.h" #include "config.h"
#endif #endif
#ifndef __APPLE__ // Broken on OSX.
#include "SDL/SDL_syswm.h" #include "SDL/SDL_syswm.h"
#endif
typedef struct sdl_video typedef struct sdl_video
{ {