diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-06-22 01:16:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-06-22 01:16:02 +0300 |
commit | 42670ec6e26e0659b885cbdea2af6a9c71049971 (patch) | |
tree | 17cee65b1d719c572e1afb2a20f92db043eef712 /src/render | |
parent | a50b110c1d5a347158cdb8d28a68237b816797ac (diff) | |
download | manaplus-42670ec6e26e0659b885cbdea2af6a9c71049971.tar.gz manaplus-42670ec6e26e0659b885cbdea2af6a9c71049971.tar.bz2 manaplus-42670ec6e26e0659b885cbdea2af6a9c71049971.tar.xz manaplus-42670ec6e26e0659b885cbdea2af6a9c71049971.zip |
Add OpenGL extension GL_EXT_timer_query.
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/mgl.cpp | 6 | ||||
-rw-r--r-- | src/render/mgl.h | 6 | ||||
-rw-r--r-- | src/render/mgltypes.h | 14 |
3 files changed, 26 insertions, 0 deletions
diff --git a/src/render/mgl.cpp b/src/render/mgl.cpp index 65064ae84..875c291f8 100644 --- a/src/render/mgl.cpp +++ b/src/render/mgl.cpp @@ -101,6 +101,12 @@ defName(glPushDebugGroup); defName(glPopDebugGroup); defName(glObjectLabel); defName(glTexStorage2D); +defName(glGenQueries); +defName(glBeginQuery); +defName(glEndQuery); +defName(glDeleteQueries); +defName(glGetQueryObjectiv); +defName(glGetQueryObjectui64v); #ifdef WIN32 defName(wglGetExtensionsString); diff --git a/src/render/mgl.h b/src/render/mgl.h index 32d27515f..f7579ad1f 100644 --- a/src/render/mgl.h +++ b/src/render/mgl.h @@ -104,6 +104,12 @@ defNameE(glPushDebugGroup); defNameE(glPopDebugGroup); defNameE(glObjectLabel); defNameE(glTexStorage2D); +defNameE(glGenQueries); +defNameE(glBeginQuery); +defNameE(glEndQuery); +defNameE(glDeleteQueries); +defNameE(glGetQueryObjectiv); +defNameE(glGetQueryObjectui64v); #ifdef WIN32 defNameE(wglGetExtensionsString); diff --git a/src/render/mgltypes.h b/src/render/mgltypes.h index f8f26c978..c95b88dae 100644 --- a/src/render/mgltypes.h +++ b/src/render/mgltypes.h @@ -38,6 +38,12 @@ #include <GL/glext.h> #endif +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <cstdint> +#else +#include <stdint.h> +#endif + typedef void (APIENTRY *glGenRenderbuffers_t)(GLsizei, GLuint *); typedef void (APIENTRY *glBindRenderbuffer_t)(GLenum target, GLuint renderbuffer); @@ -158,6 +164,14 @@ typedef void (APIENTRY *glObjectLabel_t) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); typedef void (APIENTRY *glTexStorage2D_t) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRY *glGenQueries_t) (GLsizei n, GLuint *ids); +typedef void (APIENTRY *glBeginQuery_t) (GLenum target, GLuint id); +typedef void (APIENTRY *glEndQuery_t) (GLenum target); +typedef void (APIENTRY *glDeleteQueries_t) (GLsizei n, const GLuint *ids); +typedef void (APIENTRY *glGetQueryObjectiv_t) (GLuint id, + GLenum pname, GLint *params); +typedef void (APIENTRY *glGetQueryObjectui64v_t) (GLuint id, + GLenum pname, uint64_t *params); // callback typedef void (APIENTRY *GLDEBUGPROC_t) (GLenum source, GLenum type, GLuint id, |