mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-11 01:40:13 +00:00
Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X)
This commit is contained in:
parent
3777d38bcb
commit
81d9ccb3cc
2 changed files with 24 additions and 24 deletions
|
@ -450,14 +450,14 @@ PFNGLGETOCCLUSIONQUERYIVNVPROC nglGetOcclusionQueryivNV;
|
||||||
PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV;
|
PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV;
|
||||||
|
|
||||||
// ARB_occlusion_query
|
// ARB_occlusion_query
|
||||||
PFNGLGENQUERIESPROC nglGenQueriesARB;
|
PFNGLGENQUERIESARBPROC nglGenQueriesARB;
|
||||||
PFNGLDELETEQUERIESPROC nglDeleteQueriesARB;
|
PFNGLDELETEQUERIESARBPROC nglDeleteQueriesARB;
|
||||||
PFNGLISQUERYPROC nglIsQueryARB;
|
PFNGLISQUERYARBPROC nglIsQueryARB;
|
||||||
PFNGLBEGINQUERYPROC nglBeginQueryARB;
|
PFNGLBEGINQUERYARBPROC nglBeginQueryARB;
|
||||||
PFNGLENDQUERYPROC nglEndQueryARB;
|
PFNGLENDQUERYARBPROC nglEndQueryARB;
|
||||||
PFNGLGETQUERYIVPROC nglGetQueryivARB;
|
PFNGLGETQUERYIVARBPROC nglGetQueryivARB;
|
||||||
PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectivARB;
|
PFNGLGETQUERYOBJECTIVARBPROC nglGetQueryObjectivARB;
|
||||||
PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuivARB;
|
PFNGLGETQUERYOBJECTUIVARBPROC nglGetQueryObjectuivARB;
|
||||||
|
|
||||||
// GL_EXT_framebuffer_object
|
// GL_EXT_framebuffer_object
|
||||||
PFNGLISRENDERBUFFEREXTPROC nglIsRenderbufferEXT;
|
PFNGLISRENDERBUFFEREXTPROC nglIsRenderbufferEXT;
|
||||||
|
@ -1397,14 +1397,14 @@ static bool setupARBOcclusionQuery(const char *glext)
|
||||||
CHECK_EXT("ARB_occlusion_query");
|
CHECK_EXT("ARB_occlusion_query");
|
||||||
|
|
||||||
#ifndef USE_OPENGLES
|
#ifndef USE_OPENGLES
|
||||||
CHECK_ADDRESS(PFNGLGENQUERIESPROC, glGenQueriesARB);
|
CHECK_ADDRESS(PFNGLGENQUERIESARBPROC, glGenQueriesARB);
|
||||||
CHECK_ADDRESS(PFNGLDELETEQUERIESPROC, glDeleteQueriesARB);
|
CHECK_ADDRESS(PFNGLDELETEQUERIESARBPROC, glDeleteQueriesARB);
|
||||||
CHECK_ADDRESS(PFNGLISQUERYPROC, glIsQueryARB);
|
CHECK_ADDRESS(PFNGLISQUERYARBPROC, glIsQueryARB);
|
||||||
CHECK_ADDRESS(PFNGLBEGINQUERYPROC, glBeginQueryARB);
|
CHECK_ADDRESS(PFNGLBEGINQUERYARBPROC, glBeginQueryARB);
|
||||||
CHECK_ADDRESS(PFNGLENDQUERYPROC, glEndQueryARB);
|
CHECK_ADDRESS(PFNGLENDQUERYARBPROC, glEndQueryARB);
|
||||||
CHECK_ADDRESS(PFNGLGETQUERYIVPROC, glGetQueryivARB);
|
CHECK_ADDRESS(PFNGLGETQUERYIVARBPROC, glGetQueryivARB);
|
||||||
CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectivARB);
|
CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVARBPROC, glGetQueryObjectivARB);
|
||||||
CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuivARB);
|
CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVARBPROC, glGetQueryObjectuivARB);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -744,14 +744,14 @@ extern PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV;
|
||||||
|
|
||||||
// ARB_occlusion_query
|
// ARB_occlusion_query
|
||||||
//==================================
|
//==================================
|
||||||
extern PFNGLGENQUERIESPROC nglGenQueriesARB;
|
extern PFNGLGENQUERIESARBPROC nglGenQueriesARB;
|
||||||
extern PFNGLDELETEQUERIESPROC nglDeleteQueriesARB;
|
extern PFNGLDELETEQUERIESARBPROC nglDeleteQueriesARB;
|
||||||
extern PFNGLISQUERYPROC nglIsQueryARB;
|
extern PFNGLISQUERYARBPROC nglIsQueryARB;
|
||||||
extern PFNGLBEGINQUERYPROC nglBeginQueryARB;
|
extern PFNGLBEGINQUERYARBPROC nglBeginQueryARB;
|
||||||
extern PFNGLENDQUERYPROC nglEndQueryARB;
|
extern PFNGLENDQUERYARBPROC nglEndQueryARB;
|
||||||
extern PFNGLGETQUERYIVPROC nglGetQueryivARB;
|
extern PFNGLGETQUERYIVARBPROC nglGetQueryivARB;
|
||||||
extern PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectivARB;
|
extern PFNGLGETQUERYOBJECTIVARBPROC nglGetQueryObjectivARB;
|
||||||
extern PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuivARB;
|
extern PFNGLGETQUERYOBJECTUIVARBPROC nglGetQueryObjectuivARB;
|
||||||
|
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue