Skip to content

GitLab

Commit 1336ee09 authored by Robert Menzel's avatar Robert Menzel
Browse files

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

parents a548df80 fbcf21e9
Hide whitespace changes
Inline Side-by-side
include/ACGL/HardwareSupport/GamePad.hh
View file @ 1336ee09
......@@ -113,13 +113,13 @@ private:
//
// GLFW specifics: replace this to support joysticks with other APIs
//
#ifdef ACGL_COMPILE_WITH_GLFW
//#ifdef ACGL_COMPILE_WITH_GLFW
const unsigned char *mGLFWButtons;
const float *mGLFWAxes;
unsigned char *mLastGLFWButtonState;
int mGLFWGamePadNumber;
#endif
//#endif
};
ACGL_SMARTPOINTER_TYPEDEFS(GamePad)
......
src/ACGL/OpenGL/glloaders/gl_compatibility_30.inc
View file @ 1336ee09
......@@ -2920,9 +2920,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_31.inc
View file @ 1336ee09
......@@ -1714,9 +1714,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_32.inc
View file @ 1336ee09
......@@ -1780,9 +1780,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_33.inc
View file @ 1336ee09
......@@ -1962,9 +1962,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_40.inc
View file @ 1336ee09
......@@ -2105,9 +2105,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_41.inc
View file @ 1336ee09
......@@ -2292,9 +2292,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_42.inc
View file @ 1336ee09
......@@ -2331,9 +2331,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_compatibility_43.inc
View file @ 1336ee09
......@@ -2436,9 +2436,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_core_32.inc
View file @ 1336ee09
......@@ -1780,9 +1780,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_core_33.inc
View file @ 1336ee09
......@@ -1962,9 +1962,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_core_40.inc
View file @ 1336ee09
......@@ -2105,9 +2105,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_core_41.inc
View file @ 1336ee09
......@@ -2292,9 +2292,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_core_42.inc
View file @ 1336ee09
......@@ -2331,9 +2331,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
src/ACGL/OpenGL/glloaders/gl_core_43.inc
View file @ 1336ee09
......@@ -2436,9 +2436,9 @@ int ogl_LoadFunctions()
int numFailed = 0;
ClearExtensionVars();
_ptrc_glGetIntegerv = (void (*)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
_ptrc_glGetIntegerv = (void (CODEGEN_FUNCPTR *)(GLenum,GLint*)) IntGetProcAddress("glGetIntegerv");
if(!_ptrc_glGetIntegerv) return ogl_LOAD_FAILED;
_ptrc_glGetStringi = (const GLubyte* (*)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
_ptrc_glGetStringi = (const GLubyte* (CODEGEN_FUNCPTR *)(GLenum,GLuint)) IntGetProcAddress("glGetStringi");
if(!_ptrc_glGetStringi) return ogl_LOAD_FAILED;
ProcExtsFromExtList();
......
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