Commit eb4468a9 authored by Philip Trettner's avatar Philip Trettner
Browse files

Merge commit 'ee7199d7'

parents 16ae5ae8 ee7199d7
......@@ -65,7 +65,7 @@ void ACGLRegisterDefaultDebugCallback()
}
//! place a brakepoint in here to find the source of a problem!
void APIENTRY ACGL_KHR_default_debug_callback( GLenum _source, GLenum _type, GLuint _id, GLenum _severity, GLsizei /*_length*/, const GLchar *_message, const void* /* _userParam*/ )
void APIENTRY ACGL_KHR_default_debug_callback( GLenum _source, GLenum _type, GLuint _id, GLenum _severity, GLsizei /*_length*/, const GLchar *_message, void* /* _userParam*/ )
{
// yes, this could be implemented with less dublicated code, but the
// point here is to have one code path which gets only called in case of an error
......
......@@ -64,7 +64,7 @@
// GL state:
GLDEBUGPROC KHR_DEBUG_EMULATOR_callback = NULL;
const void *KHR_DEBUG_EMULATOR_userParam = NULL;
void * KHR_DEBUG_EMULATOR_userParam = NULL;
int KHR_DEBUG_EMULATOR_isEnabled = 1;
int KHR_DEBUG_EMULATOR_isSynchronous = 0;
GLenum KHR_DEBUG_EMULATOR_lastGLError = GL_NO_ERROR;
......@@ -84,10 +84,10 @@ extern GLboolean (CODEGEN_FUNCPTR *_original_glIsEnabled)( GLenum );
extern GLvoid (CODEGEN_FUNCPTR *_original_glGetIntegerv)( GLenum, GLint * );
extern GLvoid (CODEGEN_FUNCPTR *_original_glGetPointerv)( GLenum, GLvoid ** );
// not used in here, just used to check if glClear redirects to the original function ;-)
extern GLvoid (CODEGEN_FUNCPTR *_original_glClear)(GLbitfield);
extern GLvoid(CODEGEN_FUNCPTR *_original_glClear)(GLbitfield);
// shortcut to add OpenGL errors detected by this emulation:
#define INSERT_API_ERROR( e, m ) KHR_DEBUG_EMULATOR_lastGLError = e; KHR_DEBUG_EMULATOR_DebugMessageInsert_internal(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR, e, GL_DEBUG_SEVERITY_HIGH, -1, m );
#define INSERT_API_ERROR( e, m ) do { KHR_DEBUG_EMULATOR_lastGLError = e; KHR_DEBUG_EMULATOR_DebugMessageInsert_internal(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR, e, GL_DEBUG_SEVERITY_HIGH, -1, m ); } while(0)
//
// support to query debug messages (only one):
......@@ -246,7 +246,7 @@ void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageInsert_internal(GLenum source, GLen
/////////////////////////////
GLboolean debugContextIsSimulated();
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, const void * userParam)
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, void * userParam)
{
KHR_DEBUG_EMULATOR_callback = callback;
KHR_DEBUG_EMULATOR_userParam = userParam;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment