Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Prevent segfault in glGetError() during app initialization

Browse Source
This commit is contained in:
Aaron Culliney 2014-11-29 13:31:21 -08:00
parent 4f0814ce42
commit b6e329a3c6
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apple2Mac/Apple2Mac/Classes/OSX/EmulatorDiskController.m
View File

@ -37,6 +37,10 @@
- (void)awakeFromNib
{
#if CRASH_APP_ON_LOAD_BECAUSE_YAY_GJ_APPLE
glGetError();
#endif
[self.diskInA setStringValue:NO_DISK_INSERTED];
[self.diskAProperties setStringValue:@""];
[self.diskInB setStringValue:NO_DISK_INSERTED];

23
src/common.h
View File

@ -57,6 +57,15 @@
#if VIDEO_OPENGL
#include "video_util/glUtil.h"
#define CRASH_APP_ON_LOAD_BECAUSE_YAY_GJ_APPLE 0
// 2014/11/29 -- Yay GJ Apple! ... you would think that early app lifecycle calls to glGetError() would not segfault on Macs
extern bool safe_to_do_opengl_logging;
static inline GLenum safeGLGetError(void) {
if (safe_to_do_opengl_logging) {
return glGetError();
}
return (GLenum)0;
}
#else
#define GLenum int
#define glGetError() 0
@ -109,9 +118,9 @@ extern FILE *error_log;
#define ERRLOG(...) \
if (do_logging) { \
GLenum _glerr = glGetError(); \
GLenum _glerr = safeGLGetError(); \
_LOG(__VA_ARGS__); \
while ( (_glerr = glGetError()) ) { \
while ( (_glerr = safeGLGetError()) ) { \
_LOG(__VA_ARGS__); \
} \
} //
@ -119,16 +128,16 @@ extern FILE *error_log;
#define GL_ERRLOG(...) \
if (do_logging) { \
GLenum _glerr = 0; \
while ( (_glerr = glGetError()) ) { \
while ( (_glerr = safeGLGetError()) ) { \
_LOG(__VA_ARGS__); \
} \
} //
#define ERRQUIT(...) \
do { \
GLenum _glerr = glGetError(); \
GLenum _glerr = safeGLGetError(); \
_LOG(__VA_ARGS__); \
while ( (_glerr = glGetError()) ) { \
while ( (_glerr = safeGLGetError()) ) { \
_LOG(__VA_ARGS__); \
} \
QUIT_FUNCTION(1); \
@ -137,7 +146,7 @@ extern FILE *error_log;
#define GL_ERRQUIT(...) \
do { \
GLenum _glerr = 0; \
while ( (_glerr = glGetError()) ) { \
while ( (_glerr = safeGLGetError()) ) { \
_LOG(__VA_ARGS__); \
QUIT_FUNCTION(_glerr); \
} \
@ -170,7 +179,7 @@ extern FILE *error_log;
#define RELEASE_LOG(...) \
do { \
GLenum _glerr = glGetError(); \
GLenum _glerr = safeGLGetError(); \
errno = 0; \
_LOG(__VA_ARGS__); \
} while (0)

3
src/video/glvideo.c
View File

@ -32,6 +32,8 @@ enum {
TEXCOORD_ATTRIB_IDX
};
bool safe_to_do_opengl_logging = false;
static int windowWidth = SCANWIDTH*1.5;
static int windowHeight = SCANHEIGHT*1.5;
@ -717,6 +719,7 @@ static void gldriver_init_glut(GLuint fbo) {
// renderer API
void video_driver_init(void *fbo) {
safe_to_do_opengl_logging = true;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
defaultFBO = (GLuint)fbo;