From 384b45bec16222d814094675a54f019d3ec139c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 9 Nov 2015 18:32:32 -0800 Subject: [PATCH] Fixed Android build. --- src/glimports.h | 2 ++ src/renderer_gl.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/glimports.h b/src/glimports.h index 0209f0b5f..da67090a5 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -533,6 +533,7 @@ GL_IMPORT_NV___(true, PFNGLBEGINQUERYPROC, glBeginQuery) GL_IMPORT_NV___(true, PFNGLENDQUERYPROC, glEndQuery); GL_IMPORT_NV___(true, PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv); GL_IMPORT_NV___(true, PFNGLGETQUERYOBJECTUI64VPROC, glGetQueryObjectui64v); +GL_IMPORT_NV___(true, PFNGLQUERYCOUNTERPROC, glQueryCounter); GL_IMPORT (true, PFNGLINVALIDATEFRAMEBUFFERPROC, glInvalidateFramebuffer, glDiscardFramebufferEXT); @@ -597,6 +598,7 @@ GL_IMPORT______(true, PFNGLBEGINQUERYPROC, glBeginQuery) GL_IMPORT______(true, PFNGLENDQUERYPROC, glEndQuery); GL_IMPORT______(true, PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectiv); GL_IMPORT______(true, PFNGLGETQUERYOBJECTUI64VPROC, glGetQueryObjectui64v); +GL_IMPORT______(true, PFNGLQUERYCOUNTERPROC, glQueryCounter); GL_IMPORT______(true, PFNGLDRAWARRAYSINDIRECTPROC, glDrawArraysIndirect); GL_IMPORT______(true, PFNGLDRAWELEMENTSINDIRECTPROC, glDrawElementsIndirect); diff --git a/src/renderer_gl.h b/src/renderer_gl.h index 7be0df4c7..06bceb2ee 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -509,6 +509,10 @@ typedef uint64_t GLuint64; # define GL_TIME_ELAPSED 0x88BF #endif // GL_TIME_ELAPSED +#ifndef GL_TIMESTAMP +# define GL_TIMESTAMP 0x8E28 +#endif // GL_TIMESTAMP + #ifndef GL_VBO_FREE_MEMORY_ATI # define GL_VBO_FREE_MEMORY_ATI 0x87FB #endif // GL_VBO_FREE_MEMORY_ATI