Skip to content

GitLab

Commit a0311cef authored by Robert Menzel's avatar Robert Menzel
Browse files

Merge branch 'master' of file:///data/git-repository/acgl/libraries/acgl

parents 5f4bbdbc 157d4ded
Hide whitespace changes
Inline Side-by-side
src/ACGL/OpenGL/glloaders/gl_core_42.inc
View file @ a0311cef
......@@ -164,8 +164,8 @@ GLuint (CODEGEN_FUNCPTR *_original_glGetDebugMessageLogARB)(GLuint, GLsizei, GLe
GLuint (CODEGEN_FUNCPTR *_ptrc_glGetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = NULL;
// Extension: KHR_debug
void (CODEGEN_FUNCPTR *_original_glDebugMessageCallback)(GLDEBUGPROC, const void *) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, const void *) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageCallback)(GLDEBUGPROC, void *) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, void *) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = NULL;
......@@ -2333,7 +2333,7 @@ static int Load_ARB_debug_output()
static int Load_KHR_debug()
{
int numFailed = 0;
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, const void *))IntGetProcAddress("glDebugMessageCallback");
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, void *))IntGetProcAddress("glDebugMessageCallback");
if(!_original_glDebugMessageCallback) numFailed++;
_original_glDebugMessageControl = (void (CODEGEN_FUNCPTR *)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean))IntGetProcAddress("glDebugMessageControl");
if(!_original_glDebugMessageControl) numFailed++;
......@@ -2694,7 +2694,7 @@ static int Load_NV_copy_image()
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, const void * userParam);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, void * userParam);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled);
......@@ -2831,8 +2831,8 @@ GLuint APIENTRY wrapperglGetDebugMessageLogARB(GLuint count, GLsizei bufsize, GL
// Extension: KHR_debug
// WRAPPER FOR void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, const void *)
void APIENTRY wrapperglDebugMessageCallback(GLDEBUGPROC callback, const void * userParam){
// WRAPPER FOR void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, void *)
void APIENTRY wrapperglDebugMessageCallback(GLDEBUGPROC callback, void * userParam){
_original_glDebugMessageCallback(callback, userParam);
KHR_DEBUG_EMULATOR_CHECK_GL_ERROR();
}
......
src/ACGL/OpenGL/glloaders/gl_core_43.inc
View file @ a0311cef
......@@ -164,8 +164,8 @@ GLuint (CODEGEN_FUNCPTR *_original_glGetDebugMessageLogARB)(GLuint, GLsizei, GLe
GLuint (CODEGEN_FUNCPTR *_ptrc_glGetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = NULL;
// Extension: KHR_debug
void (CODEGEN_FUNCPTR *_original_glDebugMessageCallback)(GLDEBUGPROC, const void *) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, const void *) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageCallback)(GLDEBUGPROC, void *) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, void *) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = NULL;
......@@ -2290,7 +2290,7 @@ static int Load_Version_4_3()
if(!_original_glClearBufferSubData) numFailed++;
_original_glCopyImageSubData = (void (CODEGEN_FUNCPTR *)(GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei))IntGetProcAddress("glCopyImageSubData");
if(!_original_glCopyImageSubData) numFailed++;
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, const void *))IntGetProcAddress("glDebugMessageCallback");
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, void *))IntGetProcAddress("glDebugMessageCallback");
if(!_original_glDebugMessageCallback) numFailed++;
_original_glDebugMessageControl = (void (CODEGEN_FUNCPTR *)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean))IntGetProcAddress("glDebugMessageControl");
if(!_original_glDebugMessageControl) numFailed++;
......@@ -2427,7 +2427,7 @@ static int Load_ARB_debug_output()
static int Load_KHR_debug()
{
int numFailed = 0;
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, const void *))IntGetProcAddress("glDebugMessageCallback");
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, void *))IntGetProcAddress("glDebugMessageCallback");
if(!_original_glDebugMessageCallback) numFailed++;
_original_glDebugMessageControl = (void (CODEGEN_FUNCPTR *)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean))IntGetProcAddress("glDebugMessageControl");
if(!_original_glDebugMessageControl) numFailed++;
......@@ -2788,7 +2788,7 @@ static int Load_NV_copy_image()
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, const void * userParam);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, void * userParam);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled);
......@@ -2925,8 +2925,8 @@ GLuint APIENTRY wrapperglGetDebugMessageLogARB(GLuint count, GLsizei bufsize, GL
// Extension: KHR_debug
// WRAPPER FOR void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, const void *)
void APIENTRY wrapperglDebugMessageCallback(GLDEBUGPROC callback, const void * userParam){
// WRAPPER FOR void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, void *)
void APIENTRY wrapperglDebugMessageCallback(GLDEBUGPROC callback, void * userParam){
_original_glDebugMessageCallback(callback, userParam);
KHR_DEBUG_EMULATOR_CHECK_GL_ERROR();
}
......
src/ACGL/OpenGL/glloaders/gl_core_44.inc
View file @ a0311cef
......@@ -164,8 +164,8 @@ GLuint (CODEGEN_FUNCPTR *_original_glGetDebugMessageLogARB)(GLuint, GLsizei, GLe
GLuint (CODEGEN_FUNCPTR *_ptrc_glGetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *) = NULL;
// Extension: KHR_debug
void (CODEGEN_FUNCPTR *_original_glDebugMessageCallback)(GLDEBUGPROC, const void *) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, const void *) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageCallback)(GLDEBUGPROC, void *) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, void *) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = NULL;
void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean) = NULL;
void (CODEGEN_FUNCPTR *_original_glDebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *) = NULL;
......@@ -2310,7 +2310,7 @@ static int Load_Version_4_4()
if(!_original_glClearBufferSubData) numFailed++;
_original_glCopyImageSubData = (void (CODEGEN_FUNCPTR *)(GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei))IntGetProcAddress("glCopyImageSubData");
if(!_original_glCopyImageSubData) numFailed++;
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, const void *))IntGetProcAddress("glDebugMessageCallback");
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, void *))IntGetProcAddress("glDebugMessageCallback");
if(!_original_glDebugMessageCallback) numFailed++;
_original_glDebugMessageControl = (void (CODEGEN_FUNCPTR *)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean))IntGetProcAddress("glDebugMessageControl");
if(!_original_glDebugMessageControl) numFailed++;
......@@ -2465,7 +2465,7 @@ static int Load_ARB_debug_output()
static int Load_KHR_debug()
{
int numFailed = 0;
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, const void *))IntGetProcAddress("glDebugMessageCallback");
_original_glDebugMessageCallback = (void (CODEGEN_FUNCPTR *)(GLDEBUGPROC, void *))IntGetProcAddress("glDebugMessageCallback");
if(!_original_glDebugMessageCallback) numFailed++;
_original_glDebugMessageControl = (void (CODEGEN_FUNCPTR *)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean))IntGetProcAddress("glDebugMessageControl");
if(!_original_glDebugMessageControl) numFailed++;
......@@ -2826,7 +2826,7 @@ static int Load_NV_copy_image()
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, const void * userParam);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageCallback(GLDEBUGPROC callback, void * userParam);
void APIENTRY KHR_DEBUG_EMULATOR_DebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled);
......@@ -2963,8 +2963,8 @@ GLuint APIENTRY wrapperglGetDebugMessageLogARB(GLuint count, GLsizei bufsize, GL
// Extension: KHR_debug
// WRAPPER FOR void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, const void *)
void APIENTRY wrapperglDebugMessageCallback(GLDEBUGPROC callback, const void * userParam){
// WRAPPER FOR void (CODEGEN_FUNCPTR *_ptrc_glDebugMessageCallback)(GLDEBUGPROC, void *)
void APIENTRY wrapperglDebugMessageCallback(GLDEBUGPROC callback, void * userParam){
_original_glDebugMessageCallback(callback, userParam);
KHR_DEBUG_EMULATOR_CHECK_GL_ERROR();
}
......
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