Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X)

Browse source
This commit is contained in:
kervala 2014-08-27 11:19:20 +02:00
parent 8d3ea38ffc
commit bb324e80b4
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -450,14 +450,14 @@ PFNGLGETOCCLUSIONQUERYIVNVPROC nglGetOcclusionQueryivNV;
PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV;
// ARB_occlusion_query
PFNGLGENQUERIESPROC nglGenQueriesARB;
PFNGLDELETEQUERIESPROC nglDeleteQueriesARB;
PFNGLISQUERYPROC nglIsQueryARB;
PFNGLBEGINQUERYPROC nglBeginQueryARB;
PFNGLENDQUERYPROC nglEndQueryARB;
PFNGLGETQUERYIVPROC nglGetQueryivARB;
PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectivARB;
PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuivARB;
PFNGLGENQUERIESARBPROC nglGenQueriesARB;
PFNGLDELETEQUERIESARBPROC nglDeleteQueriesARB;
PFNGLISQUERYARBPROC nglIsQueryARB;
PFNGLBEGINQUERYARBPROC nglBeginQueryARB;
PFNGLENDQUERYARBPROC nglEndQueryARB;
PFNGLGETQUERYIVARBPROC nglGetQueryivARB;
PFNGLGETQUERYOBJECTIVARBPROC nglGetQueryObjectivARB;
PFNGLGETQUERYOBJECTUIVARBPROC nglGetQueryObjectuivARB;
// GL_EXT_framebuffer_object
PFNGLISRENDERBUFFEREXTPROC nglIsRenderbufferEXT;
@ -1397,14 +1397,14 @@ static bool setupARBOcclusionQuery(const char *glext)
CHECK_EXT("ARB_occlusion_query");
#ifndef USE_OPENGLES
CHECK_ADDRESS(PFNGLGENQUERIESPROC, glGenQueriesARB);
CHECK_ADDRESS(PFNGLDELETEQUERIESPROC, glDeleteQueriesARB);
CHECK_ADDRESS(PFNGLISQUERYPROC, glIsQueryARB);
CHECK_ADDRESS(PFNGLBEGINQUERYPROC, glBeginQueryARB);
CHECK_ADDRESS(PFNGLENDQUERYPROC, glEndQueryARB);
CHECK_ADDRESS(PFNGLGETQUERYIVPROC, glGetQueryivARB);
CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVPROC, glGetQueryObjectivARB);
CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVPROC, glGetQueryObjectuivARB);
CHECK_ADDRESS(PFNGLGENQUERIESARBPROC, glGenQueriesARB);
CHECK_ADDRESS(PFNGLDELETEQUERIESARBPROC, glDeleteQueriesARB);
CHECK_ADDRESS(PFNGLISQUERYARBPROC, glIsQueryARB);
CHECK_ADDRESS(PFNGLBEGINQUERYARBPROC, glBeginQueryARB);
CHECK_ADDRESS(PFNGLENDQUERYARBPROC, glEndQueryARB);
CHECK_ADDRESS(PFNGLGETQUERYIVARBPROC, glGetQueryivARB);
CHECK_ADDRESS(PFNGLGETQUERYOBJECTIVARBPROC, glGetQueryObjectivARB);
CHECK_ADDRESS(PFNGLGETQUERYOBJECTUIVARBPROC, glGetQueryObjectuivARB);
#endif
return true;

16
code/nel/src/3d/driver/opengl/driver_opengl_extension.h
View file

@ -744,14 +744,14 @@ extern PFNGLGETOCCLUSIONQUERYUIVNVPROC nglGetOcclusionQueryuivNV;
// ARB_occlusion_query
//==================================
extern PFNGLGENQUERIESPROC nglGenQueriesARB;
extern PFNGLDELETEQUERIESPROC nglDeleteQueriesARB;
extern PFNGLISQUERYPROC nglIsQueryARB;
extern PFNGLBEGINQUERYPROC nglBeginQueryARB;
extern PFNGLENDQUERYPROC nglEndQueryARB;
extern PFNGLGETQUERYIVPROC nglGetQueryivARB;
extern PFNGLGETQUERYOBJECTIVPROC nglGetQueryObjectivARB;
extern PFNGLGETQUERYOBJECTUIVPROC nglGetQueryObjectuivARB;
extern PFNGLGENQUERIESARBPROC nglGenQueriesARB;
extern PFNGLDELETEQUERIESARBPROC nglDeleteQueriesARB;
extern PFNGLISQUERYARBPROC nglIsQueryARB;
extern PFNGLBEGINQUERYARBPROC nglBeginQueryARB;
extern PFNGLENDQUERYARBPROC nglEndQueryARB;
extern PFNGLGETQUERYIVARBPROC nglGetQueryivARB;
extern PFNGLGETQUERYOBJECTIVARBPROC nglGetQueryObjectivARB;
extern PFNGLGETQUERYOBJECTUIVARBPROC nglGetQueryObjectuivARB;
#ifdef NL_OS_WINDOWS