diff --git a/panda/src/androiddisplay/androidGraphicsStateGuardian.cxx b/panda/src/androiddisplay/androidGraphicsStateGuardian.cxx index d987cbe0fc..aa6b502e0b 100644 --- a/panda/src/androiddisplay/androidGraphicsStateGuardian.cxx +++ b/panda/src/androiddisplay/androidGraphicsStateGuardian.cxx @@ -405,8 +405,6 @@ get_extra_extensions() { // not defined. //////////////////////////////////////////////////////////////////// void *AndroidGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - string fullname = string(prefix) + string(name); - - return (void *)eglGetProcAddress(fullname.c_str()); +do_get_extension_func(const char *name) { + return (void *)eglGetProcAddress(name); } diff --git a/panda/src/androiddisplay/androidGraphicsStateGuardian.h b/panda/src/androiddisplay/androidGraphicsStateGuardian.h index 5e82cf3159..d9824ff6fd 100644 --- a/panda/src/androiddisplay/androidGraphicsStateGuardian.h +++ b/panda/src/androiddisplay/androidGraphicsStateGuardian.h @@ -61,7 +61,7 @@ protected: virtual void query_gl_version(); virtual void get_extra_extensions(); - virtual void *do_get_extension_func(const char *prefix, const char *name); + virtual void *do_get_extension_func(const char *name); private: int _egl_version_major, _egl_version_minor; diff --git a/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.h b/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.h index d70061a813..2d88c9753d 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.h +++ b/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.h @@ -46,7 +46,7 @@ public: protected: virtual void query_gl_version(); - virtual void *do_get_extension_func(const char *prefix, const char *name); + virtual void *do_get_extension_func(const char *name); public: static TypeHandle get_class_type() { diff --git a/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm b/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm index 01301c4847..d16b5795c1 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm +++ b/panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm @@ -276,10 +276,9 @@ query_gl_version() { // not defined. //////////////////////////////////////////////////////////////////// void *CocoaGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - char* fullname = (char*) malloc(strlen(prefix) + strlen(name) + 2); - strcpy(fullname + 1, prefix); - strcpy(fullname + 1 + strlen(prefix), name); +do_get_extension_func(const char *name) { + char* fullname = (char*) malloc(strlen(name) + 2); + strcpy(fullname + 1, name); fullname[0] = '_'; // Believe it or not, but this is actually the @@ -292,7 +291,7 @@ do_get_extension_func(const char *prefix, const char *name) { } cocoadisplay_cat.warning() << - "do_get_extension_func failed for " << prefix << name << "!\n"; + "do_get_extension_func failed for " << fullname << "!\n"; free(fullname); return NULL; diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx index e89a7df768..487828afcb 100644 --- a/panda/src/display/config_display.cxx +++ b/panda/src/display/config_display.cxx @@ -405,6 +405,13 @@ ConfigVariableBool framebuffer_stereo PRC_DESC("True if FM_stereo should be added to the default framebuffer " "properties, which requests a stereo-capable display, if " "supported by the graphics driver.")); +ConfigVariableBool framebuffer_srgb +("framebuffer-srgb", false, + PRC_DESC("Set this to request an sRGB framebuffer, which will " + "convert all values to linear space before blending. This " + "means that the output will be properly gamma-corrected, as " + "long as all the input textures are either converted from " + "original sRGB to linear or sRGB textures are used.")); ConfigVariableInt depth_bits ("depth-bits", 0, diff --git a/panda/src/display/config_display.h b/panda/src/display/config_display.h index 2cd7569f02..eec3b50c56 100644 --- a/panda/src/display/config_display.h +++ b/panda/src/display/config_display.h @@ -92,6 +92,7 @@ extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_alpha; extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_stencil; extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_accum; extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_stereo; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_srgb; extern EXPCL_PANDA_DISPLAY ConfigVariableInt depth_bits; extern EXPCL_PANDA_DISPLAY ConfigVariableInt color_bits; extern EXPCL_PANDA_DISPLAY ConfigVariableInt alpha_bits; diff --git a/panda/src/egldisplay/eglGraphicsStateGuardian.cxx b/panda/src/egldisplay/eglGraphicsStateGuardian.cxx index 7c5d5d5303..1209a8a482 100644 --- a/panda/src/egldisplay/eglGraphicsStateGuardian.cxx +++ b/panda/src/egldisplay/eglGraphicsStateGuardian.cxx @@ -390,8 +390,6 @@ get_extra_extensions() { // not defined. //////////////////////////////////////////////////////////////////// void *eglGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - string fullname = string(prefix) + string(name); - - return (void *)eglGetProcAddress(fullname.c_str()); +do_get_extension_func(const char *name) { + return (void *)eglGetProcAddress(name); } diff --git a/panda/src/egldisplay/eglGraphicsStateGuardian.h b/panda/src/egldisplay/eglGraphicsStateGuardian.h index e44ff01d73..ebf00b87e9 100644 --- a/panda/src/egldisplay/eglGraphicsStateGuardian.h +++ b/panda/src/egldisplay/eglGraphicsStateGuardian.h @@ -64,7 +64,7 @@ protected: virtual void query_gl_version(); virtual void get_extra_extensions(); - virtual void *do_get_extension_func(const char *prefix, const char *name); + virtual void *do_get_extension_func(const char *name); private: int _egl_version_major, _egl_version_minor; diff --git a/panda/src/glstuff/glGeomContext_src.cxx b/panda/src/glstuff/glGeomContext_src.cxx index 410f997d2d..272d9727bf 100644 --- a/panda/src/glstuff/glGeomContext_src.cxx +++ b/panda/src/glstuff/glGeomContext_src.cxx @@ -46,7 +46,7 @@ get_display_list(GLuint &index, const CLP(GeomMunger) *munger, DisplayList &dl = _display_lists[(CLP(GeomMunger) *)munger]; bool list_current = (dl._modified == modified); if (dl._index == 0) { - dl._index = GLP(GenLists)(1); + dl._index = glGenLists(1); list_current = false; if (munger != (CLP(GeomMunger) *)NULL) { ((CLP(GeomMunger) *)munger)->_geom_contexts.insert(this); @@ -87,7 +87,7 @@ release_display_lists() { GLCAT.debug() << "releasing index " << (int)dl._index << "\n"; } - GLP(DeleteLists)(dl._index, 1); + glDeleteLists(dl._index, 1); } _display_lists.clear(); diff --git a/panda/src/glstuff/glGraphicsBuffer_src.cxx b/panda/src/glstuff/glGraphicsBuffer_src.cxx index 0e094f4eef..64cdbc8058 100644 --- a/panda/src/glstuff/glGraphicsBuffer_src.cxx +++ b/panda/src/glstuff/glGraphicsBuffer_src.cxx @@ -638,7 +638,7 @@ bind_slot(int layer, bool rb_resize, Texture **attach, RenderTexturePlane slot, #ifndef OPENGLES GLint depth_size = 0; - GLP(GetTexLevelParameteriv)(target, 0, GL_TEXTURE_DEPTH_SIZE, &depth_size); + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_DEPTH_SIZE, &depth_size); _fb_properties.set_depth_bits(depth_size); #endif @@ -649,7 +649,7 @@ bind_slot(int layer, bool rb_resize, Texture **attach, RenderTexturePlane slot, #ifndef OPENGLES GLint stencil_size = 0; - GLP(GetTexLevelParameteriv)(target, 0, GL_TEXTURE_STENCIL_SIZE, &stencil_size); + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_STENCIL_SIZE, &stencil_size); _fb_properties.set_stencil_bits(stencil_size); #endif } @@ -662,10 +662,10 @@ bind_slot(int layer, bool rb_resize, Texture **attach, RenderTexturePlane slot, #ifndef OPENGLES if (attachpoint == GL_COLOR_ATTACHMENT0_EXT) { GLint red_size = 0, green_size = 0, blue_size = 0, alpha_size = 0; - GLP(GetTexLevelParameteriv)(target, 0, GL_TEXTURE_RED_SIZE, &red_size); - GLP(GetTexLevelParameteriv)(target, 0, GL_TEXTURE_GREEN_SIZE, &green_size); - GLP(GetTexLevelParameteriv)(target, 0, GL_TEXTURE_BLUE_SIZE, &blue_size); - GLP(GetTexLevelParameteriv)(target, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size); + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_RED_SIZE, &red_size); + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_GREEN_SIZE, &green_size); + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_BLUE_SIZE, &blue_size); + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size); _fb_properties.set_color_bits(red_size + green_size + blue_size); _fb_properties.set_alpha_bits(alpha_size); @@ -1049,9 +1049,9 @@ generate_mipmaps() { CLP(TextureContext) *gtc = DCAST(CLP(TextureContext), tc); glgsg->update_texture(tc, true); GLenum target = glgsg->get_texture_target(tex->get_texture_type()); - GLP(BindTexture)(target, gtc->_index); + glBindTexture(target, gtc->_index); glgsg->_glGenerateMipmap(target); - GLP(BindTexture)(target, 0); + glBindTexture(target, 0); } } report_my_gl_errors(); diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.I b/panda/src/glstuff/glGraphicsStateGuardian_src.I index 6d33da158b..0a260d32ae 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.I +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.I @@ -27,7 +27,7 @@ INLINE bool CLP(GraphicsStateGuardian):: report_errors(int line, const char *source_file) { #ifndef NDEBUG - GLenum error_code = GLP(GetError)(); + GLenum error_code = glGetError(); if (error_code != GL_NO_ERROR) { int error_count = 0; return report_errors_loop(line, source_file, error_code, error_count); @@ -46,7 +46,7 @@ INLINE void CLP(GraphicsStateGuardian):: report_my_errors(int line, const char *source_file) { #ifndef NDEBUG if (_track_errors) { - GLenum error_code = GLP(GetError)(); + GLenum error_code = glGetError(); if (error_code != GL_NO_ERROR) { if (!report_errors_loop(line, source_file, error_code, _error_count)) { panic_deactivate(); @@ -69,7 +69,7 @@ report_my_errors(int line, const char *source_file) { //////////////////////////////////////////////////////////////////// INLINE bool CLP(GraphicsStateGuardian):: clear_errors(int line, const char *source_file) { - GLenum error_code = GLP(GetError)(); + GLenum error_code = glGetError(); if (error_code != GL_NO_ERROR) { int error_count = 0; return report_errors_loop(line, source_file, error_code, error_count); @@ -92,7 +92,7 @@ clear_errors(int line, const char *source_file) { INLINE void CLP(GraphicsStateGuardian):: clear_my_errors(int line, const char *source_file) { if (_track_errors) { - GLenum error_code = GLP(GetError)(); + GLenum error_code = glGetError(); if (error_code != GL_NO_ERROR) { int error_count = 0; report_errors_loop(line, source_file, error_code, error_count); @@ -162,7 +162,7 @@ INLINE void CLP(GraphicsStateGuardian):: maybe_gl_finish() const { #ifdef DO_PSTATS if (CLP(finish)) { - GLP(Finish)(); + glFinish(); } #endif } @@ -231,12 +231,12 @@ enable_multisample_antialias(bool val) { // Turn off antialias multisample. _multisample_mode &= ~MM_antialias; if (_multisample_mode == 0) { - GLP(Disable)(GL_MULTISAMPLE); + glDisable(GL_MULTISAMPLE); } } else if ((_multisample_mode & MM_antialias) == 0 && val) { // Turn on antialias multisample. if (_multisample_mode == 0) { - GLP(Enable)(GL_MULTISAMPLE); + glEnable(GL_MULTISAMPLE); } _multisample_mode |= MM_antialias; } @@ -258,16 +258,16 @@ enable_multisample_alpha_one(bool val) { if ((_multisample_mode & MM_alpha_one) != 0 && !val) { // Turn off sample_alpha_to_one multisample. _multisample_mode &= ~MM_alpha_one; - GLP(Disable)(GL_SAMPLE_ALPHA_TO_ONE); + glDisable(GL_SAMPLE_ALPHA_TO_ONE); if (_multisample_mode == 0) { - GLP(Disable)(GL_MULTISAMPLE); + glDisable(GL_MULTISAMPLE); } } else if ((_multisample_mode & MM_alpha_one) == 0 && val) { // Turn on sample_alpha_to_one multisample. if (_multisample_mode == 0) { - GLP(Enable)(GL_MULTISAMPLE); + glEnable(GL_MULTISAMPLE); } - GLP(Enable)(GL_SAMPLE_ALPHA_TO_ONE); + glEnable(GL_SAMPLE_ALPHA_TO_ONE); _multisample_mode |= MM_alpha_one; } } @@ -288,16 +288,16 @@ enable_multisample_alpha_mask(bool val) { if ((_multisample_mode & MM_alpha_mask) != 0 && !val) { // Turn off sample_alpha_to_mask multisample. _multisample_mode &= ~MM_alpha_mask; - GLP(Disable)(GL_SAMPLE_ALPHA_TO_COVERAGE); + glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); if (_multisample_mode == 0) { - GLP(Disable)(GL_MULTISAMPLE); + glDisable(GL_MULTISAMPLE); } } else if ((_multisample_mode & MM_alpha_mask) == 0 && val) { // Turn on sample_alpha_to_mask multisample. if (_multisample_mode == 0) { - GLP(Enable)(GL_MULTISAMPLE); + glEnable(GL_MULTISAMPLE); } - GLP(Enable)(GL_SAMPLE_ALPHA_TO_COVERAGE); + glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); _multisample_mode |= MM_alpha_mask; } } @@ -316,9 +316,9 @@ enable_line_smooth(bool val) { _state_mask.clear_bit(TransparencyAttrib::get_class_slot()); _line_smooth_enabled = val; if (val) { - GLP(Enable)(GL_LINE_SMOOTH); + glEnable(GL_LINE_SMOOTH); } else { - GLP(Disable)(GL_LINE_SMOOTH); + glDisable(GL_LINE_SMOOTH); } } #endif @@ -336,9 +336,9 @@ enable_point_smooth(bool val) { _state_mask.clear_bit(TransparencyAttrib::get_class_slot()); _point_smooth_enabled = val; if (val) { - GLP(Enable)(GL_POINT_SMOOTH); + glEnable(GL_POINT_SMOOTH); } else { - GLP(Disable)(GL_POINT_SMOOTH); + glDisable(GL_POINT_SMOOTH); } } #endif @@ -355,9 +355,9 @@ enable_polygon_smooth(bool val) { if (_polygon_smooth_enabled != val) { _polygon_smooth_enabled = val; if (val) { - GLP(Enable)(GL_POLYGON_SMOOTH); + glEnable(GL_POLYGON_SMOOTH); } else { - GLP(Disable)(GL_POLYGON_SMOOTH); + glDisable(GL_POLYGON_SMOOTH); } } #endif // OPENGLES @@ -448,13 +448,13 @@ enable_stencil_test(bool val) { GLCAT.spam() << "glEnable(GL_STENCIL_TEST)" << endl; #endif - GLP(Enable)(GL_STENCIL_TEST); + glEnable(GL_STENCIL_TEST); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDisable(GL_STENCIL_TEST)" << endl; #endif - GLP(Disable)(GL_STENCIL_TEST); + glDisable(GL_STENCIL_TEST); } } } @@ -473,13 +473,13 @@ enable_blend(bool val) { GLCAT.spam() << "glEnable(GL_BLEND)" << endl; #endif - GLP(Enable)(GL_BLEND); + glEnable(GL_BLEND); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDisable(GL_BLEND)" << endl; #endif - GLP(Disable)(GL_BLEND); + glDisable(GL_BLEND); } } } @@ -498,13 +498,13 @@ enable_depth_test(bool val) { GLCAT.spam() << "glEnable(GL_DEPTH_TEST)" << endl; #endif - GLP(Enable)(GL_DEPTH_TEST); + glEnable(GL_DEPTH_TEST); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDisable(GL_DEPTH_TEST)" << endl; #endif - GLP(Disable)(GL_DEPTH_TEST); + glDisable(GL_DEPTH_TEST); } } } @@ -524,13 +524,13 @@ enable_fog(bool val) { GLCAT.spam() << "glEnable(GL_FOG)" << endl; #endif - GLP(Enable)(GL_FOG); + glEnable(GL_FOG); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDisable(GL_FOG)" << endl; #endif - GLP(Disable)(GL_FOG); + glDisable(GL_FOG); } } #endif @@ -551,13 +551,13 @@ enable_alpha_test(bool val) { GLCAT.spam() << "glEnable(GL_ALPHA_TEST)" << endl; #endif - GLP(Enable)(GL_ALPHA_TEST); + glEnable(GL_ALPHA_TEST); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDisable(GL_ALPHA_TEST)" << endl; #endif - GLP(Disable)(GL_ALPHA_TEST); + glDisable(GL_ALPHA_TEST); } } #endif // OPENGLES_2 @@ -578,17 +578,17 @@ enable_polygon_offset(bool val) { GLCAT.spam() << "glEnable(GL_POLYGON_OFFSET_*)" << endl; #endif - GLP(Enable)(GL_POLYGON_OFFSET_FILL); - //GLP(Enable)(GL_POLYGON_OFFSET_LINE); // not widely supported anyway - //GLP(Enable)(GL_POLYGON_OFFSET_POINT); + glEnable(GL_POLYGON_OFFSET_FILL); + //glEnable(GL_POLYGON_OFFSET_LINE); // not widely supported anyway + //glEnable(GL_POLYGON_OFFSET_POINT); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDisable(GL_POLYGON_OFFSET_*)" << endl; #endif - GLP(Disable)(GL_POLYGON_OFFSET_FILL); - //GLP(Disable)(GL_POLYGON_OFFSET_LINE); // not widely supported anyway - //GLP(Disable)(GL_POLYGON_OFFSET_POINT); + glDisable(GL_POLYGON_OFFSET_FILL); + //glDisable(GL_POLYGON_OFFSET_LINE); // not widely supported anyway + //glDisable(GL_POLYGON_OFFSET_POINT); } } } @@ -603,10 +603,10 @@ INLINE void CLP(GraphicsStateGuardian):: call_glFogfv(GLenum pname, const LColor &color) { #ifndef OPENGLES_2 #ifndef STDFLOAT_DOUBLE - GLP(Fogfv)(pname, color.get_data()); + glFogfv(pname, color.get_data()); #else // STDFLOAT_DOUBLE LColorf fcolor = LCAST(float, color); - GLP(Fogfv)(pname, fcolor.get_data()); + glFogfv(pname, fcolor.get_data()); #endif // STDFLOAT_DOUBLE #endif } @@ -621,10 +621,10 @@ INLINE void CLP(GraphicsStateGuardian):: call_glMaterialfv(GLenum face, GLenum pname, const LColor &color) { #ifndef OPENGLES_2 #ifndef STDFLOAT_DOUBLE - GLP(Materialfv)(face, pname, color.get_data()); + glMaterialfv(face, pname, color.get_data()); #else // STDFLOAT_DOUBLE LColorf fcolor = LCAST(float, color); - GLP(Materialfv)(face, pname, fcolor.get_data()); + glMaterialfv(face, pname, fcolor.get_data()); #endif // STDFLOAT_DOUBLE #endif } @@ -639,10 +639,10 @@ INLINE void CLP(GraphicsStateGuardian):: call_glLightfv(GLenum light, GLenum pname, const LVecBase4 &value) { #ifndef OPENGLES_2 #ifndef STDFLOAT_DOUBLE - GLP(Lightfv)(light, pname, value.get_data()); + glLightfv(light, pname, value.get_data()); #else // STDFLOAT_DOUBLE LVecBase4f fvalue = LCAST(float, value); - GLP(Lightfv)(light, pname, fvalue.get_data()); + glLightfv(light, pname, fvalue.get_data()); #endif // STDFLOAT_DOUBLE #endif } @@ -657,10 +657,10 @@ INLINE void CLP(GraphicsStateGuardian):: call_glLightfv(GLenum light, GLenum pname, const LVecBase3 &value) { #ifndef OPENGLES_2 #ifndef STDFLOAT_DOUBLE - GLP(Lightfv)(light, pname, value.get_data()); + glLightfv(light, pname, value.get_data()); #else // STDFLOAT_DOUBLE LVecBase3f fvalue = LCAST(float, value); - GLP(Lightfv)(light, pname, fvalue.get_data()); + glLightfv(light, pname, fvalue.get_data()); #endif // STDFLOAT_DOUBLE #endif } @@ -675,10 +675,10 @@ INLINE void CLP(GraphicsStateGuardian):: call_glLightModelfv(GLenum pname, const LVecBase4 &value) { #ifndef OPENGLES_2 #ifndef STDFLOAT_DOUBLE - GLP(LightModelfv)(pname, value.get_data()); + glLightModelfv(pname, value.get_data()); #else // STDFLOAT_DOUBLE LVecBase4f fvalue = LCAST(float, value); - GLP(LightModelfv)(pname, fvalue.get_data()); + glLightModelfv(pname, fvalue.get_data()); #endif // STDFLOAT_DOUBLE #endif // OPENGLES_2 } @@ -693,10 +693,10 @@ INLINE void CLP(GraphicsStateGuardian):: call_glTexEnvfv(GLenum target, GLenum pname, const LVecBase4 &value) { #ifndef OPENGLES_2 #ifndef STDFLOAT_DOUBLE - GLP(TexEnvfv)(target, pname, value.get_data()); + glTexEnvfv(target, pname, value.get_data()); #else // STDFLOAT_DOUBLE LVecBase4f fvalue = LCAST(float, value); - GLP(TexEnvfv)(target, pname, fvalue.get_data()); + glTexEnvfv(target, pname, fvalue.get_data()); #endif // STDFLOAT_DOUBLE #endif } @@ -710,10 +710,10 @@ call_glTexEnvfv(GLenum target, GLenum pname, const LVecBase4 &value) { INLINE void CLP(GraphicsStateGuardian):: call_glTexParameterfv(GLenum target, GLenum pname, const LVecBase4 &value) { #ifndef STDFLOAT_DOUBLE - GLP(TexParameterfv)(target, pname, value.get_data()); + glTexParameterfv(target, pname, value.get_data()); #else // STDFLOAT_DOUBLE LVecBase4f fvalue = LCAST(float, value); - GLP(TexParameterfv)(target, pname, fvalue.get_data()); + glTexParameterfv(target, pname, fvalue.get_data()); #endif // STDFLOAT_DOUBLE } diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 42334583c2..af2329da04 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -96,7 +96,7 @@ null_glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) { // If we don't support glDrawRangeElements(), just use the original // glDrawElements() instead. - GLP(DrawElements)(mode, count, type, indices); + glDrawElements(mode, count, type, indices); } static void APIENTRY @@ -386,7 +386,7 @@ reset() { } // Save the extensions tokens. - save_extensions((const char *)GLP(GetString)(GL_EXTENSIONS)); + save_extensions((const char *)glGetString(GL_EXTENSIONS)); get_extra_extensions(); report_extensions(); @@ -402,12 +402,12 @@ reset() { if (is_at_least_gl_version(1, 4)) { _supports_point_parameters = true; _glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC) - get_extension_func(GLPREFIX_QUOTED, "PointParameterfv"); + get_extension_func("glPointParameterfv"); } else if (has_extension("GL_ARB_point_parameters")) { _supports_point_parameters = true; _glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC) - get_extension_func(GLPREFIX_QUOTED, "PointParameterfvARB"); + get_extension_func("glPointParameterfvARB"); } if (_supports_point_parameters) { if (_glPointParameterfv == NULL) { @@ -435,13 +435,13 @@ reset() { if (_supports_vertex_blend) { _glWeightPointer = (PFNGLWEIGHTPOINTERARBPROC) - get_extension_func(GLPREFIX_QUOTED, "WeightPointerARB"); + get_extension_func("glWeightPointerARB"); _glVertexBlend = (PFNGLVERTEXBLENDARBPROC) - get_extension_func(GLPREFIX_QUOTED, "VertexBlendARB"); + get_extension_func("glVertexBlendARB"); _glWeightfv = (PFNGLWEIGHTFVARBPROC) - get_extension_func(GLPREFIX_QUOTED, "WeightfvARB"); + get_extension_func("glWeightfvARB"); _glWeightdv = (PFNGLWEIGHTDVARBPROC) - get_extension_func(GLPREFIX_QUOTED, "WeightdvARB"); + get_extension_func("glWeightdvARB"); if (_glWeightPointer == NULL || _glVertexBlend == NULL || GLfv(_glWeight) == NULL) { @@ -453,10 +453,10 @@ reset() { #ifndef OPENGLES if (_supports_vertex_blend) { - GLP(Enable)(GL_WEIGHT_SUM_UNITY_ARB); + glEnable(GL_WEIGHT_SUM_UNITY_ARB); GLint max_vertex_units = 0; - GLP(GetIntegerv)(GL_MAX_VERTEX_UNITS_ARB, &max_vertex_units); + glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &max_vertex_units); _max_vertex_transforms = max_vertex_units; if (GLCAT.is_debug()) { GLCAT.debug() @@ -470,11 +470,11 @@ reset() { if (has_extension("GL_ARB_matrix_palette")) { _supports_matrix_palette = true; _glCurrentPaletteMatrix = (PFNGLCURRENTPALETTEMATRIXARBPROC) - get_extension_func(GLPREFIX_QUOTED, "CurrentPaletteMatrixARB"); + get_extension_func("glCurrentPaletteMatrixARB"); _glMatrixIndexPointer = (PFNGLMATRIXINDEXPOINTERARBPROC) - get_extension_func(GLPREFIX_QUOTED, "MatrixIndexPointerARB"); + get_extension_func("glMatrixIndexPointerARB"); _glMatrixIndexuiv = (PFNGLMATRIXINDEXUIVARBPROC) - get_extension_func(GLPREFIX_QUOTED, "MatrixIndexuivARB"); + get_extension_func("glMatrixIndexuivARB"); if (_glCurrentPaletteMatrix == NULL || _glMatrixIndexPointer == NULL || @@ -488,9 +488,9 @@ reset() { if (has_extension("GL_OES_matrix_palette")) { _supports_matrix_palette = true; _glCurrentPaletteMatrix = (PFNGLCURRENTPALETTEMATRIXOESPROC) - get_extension_func(GLPREFIX_QUOTED, "CurrentPaletteMatrixOES"); + get_extension_func("glCurrentPaletteMatrixOES"); _glMatrixIndexPointer = (PFNGLMATRIXINDEXPOINTEROESPROC) - get_extension_func(GLPREFIX_QUOTED, "MatrixIndexPointerOES"); + get_extension_func("glMatrixIndexPointerOES"); if (_glCurrentPaletteMatrix == NULL || _glMatrixIndexPointer == NULL) { @@ -522,10 +522,10 @@ reset() { if (_supports_matrix_palette) { GLint max_palette_matrices = 0; #ifdef OPENGLES_1 - GLP(GetIntegerv)(GL_MAX_PALETTE_MATRICES_OES, &max_palette_matrices); + glGetIntegerv(GL_MAX_PALETTE_MATRICES_OES, &max_palette_matrices); #endif #ifndef OPENGLES - GLP(GetIntegerv)(GL_MAX_PALETTE_MATRICES_ARB, &max_palette_matrices); + glGetIntegerv(GL_MAX_PALETTE_MATRICES_ARB, &max_palette_matrices); #endif _max_vertex_transform_indices = max_palette_matrices; if (GLCAT.is_debug()) { @@ -539,12 +539,12 @@ reset() { if (is_at_least_gl_version(1, 2)) { _supports_draw_range_elements = true; _glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawRangeElements"); + get_extension_func("glDrawRangeElements"); } else if (has_extension("GL_EXT_draw_range_elements")) { _supports_draw_range_elements = true; _glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawRangeElementsEXT"); + get_extension_func("glDrawRangeElementsEXT"); } if (_supports_draw_range_elements) { if (_glDrawRangeElements == NULL) { @@ -578,39 +578,39 @@ reset() { _supports_3d_texture = true; _glTexImage3D = (PFNGLTEXIMAGE3DPROC_P) - get_extension_func(GLPREFIX_QUOTED, "TexImage3D"); + get_extension_func("glTexImage3D"); _glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "TexSubImage3D"); + get_extension_func("glTexSubImage3D"); _glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CopyTexSubImage3D"); + get_extension_func("glCopyTexSubImage3D"); } else if (has_extension("GL_EXT_texture3D")) { _supports_3d_texture = true; _glTexImage3D = (PFNGLTEXIMAGE3DPROC_P) - get_extension_func(GLPREFIX_QUOTED, "TexImage3DEXT"); + get_extension_func("glTexImage3DEXT"); _glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "TexSubImage3DEXT"); + get_extension_func("glTexSubImage3DEXT"); _glCopyTexSubImage3D = NULL; if (has_extension("GL_EXT_copy_texture")) { _glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CopyTexSubImage3DEXT"); + get_extension_func("glCopyTexSubImage3DEXT"); } } else if (has_extension("GL_OES_texture_3D")) { _supports_3d_texture = true; _glTexImage3D = (PFNGLTEXIMAGE3DPROC_P) - get_extension_func(GLPREFIX_QUOTED, "TexImage3DOES"); + get_extension_func("glTexImage3DOES"); _glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "TexSubImage3DOES"); + get_extension_func("glTexSubImage3DOES"); _glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CopyTexSubImage3DOES"); + get_extension_func("glCopyTexSubImage3DOES"); #ifdef OPENGLES_2 _glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DOES) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTexture3DOES"); + get_extension_func("glFramebufferTexture3DOES"); #endif } @@ -627,7 +627,7 @@ reset() { _supports_2d_texture_array = has_extension("GL_EXT_texture_array"); if (_supports_2d_texture_array) { _glFramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTextureLayerEXT"); + get_extension_func("glFramebufferTextureLayerEXT"); } else { // ARB_geometry_shader4 also provides a version. _glFramebufferTextureLayer = NULL; @@ -659,9 +659,9 @@ reset() { #ifdef OPENGLES_2 if (_supports_3d_texture) { _glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage3DOES"); + get_extension_func("glCompressedTexImage3DOES"); _glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImageOES"); + get_extension_func("glCompressedTexSubImageOES"); } #endif @@ -670,37 +670,37 @@ reset() { _supports_compressed_texture = true; _glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage1D"); + get_extension_func("glCompressedTexImage1D"); _glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage2D"); + get_extension_func("glCompressedTexImage2D"); _glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage3D"); + get_extension_func("glCompressedTexImage3D"); _glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImage1D"); + get_extension_func("glCompressedTexSubImage1D"); _glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImage2D"); + get_extension_func("glCompressedTexSubImage2D"); _glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImage3D"); + get_extension_func("glCompressedTexSubImage3D"); _glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC) - get_extension_func(GLPREFIX_QUOTED, "GetCompressedTexImage"); + get_extension_func("glGetCompressedTexImage"); } else if (has_extension("GL_ARB_texture_compression")) { _supports_compressed_texture = true; _glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage1DARB"); + get_extension_func("glCompressedTexImage1DARB"); _glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage2DARB"); + get_extension_func("glCompressedTexImage2DARB"); _glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexImage3DARB"); + get_extension_func("glCompressedTexImage3DARB"); _glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImage1DARB"); + get_extension_func("glCompressedTexSubImage1DARB"); _glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImage2DARB"); + get_extension_func("glCompressedTexSubImage2DARB"); _glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) - get_extension_func(GLPREFIX_QUOTED, "CompressedTexSubImage3DARB"); + get_extension_func("glCompressedTexSubImage3DARB"); _glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC) - get_extension_func(GLPREFIX_QUOTED, "GetCompressedTexImageARB"); + get_extension_func("glGetCompressedTexImageARB"); } if (_supports_compressed_texture) { @@ -724,9 +724,9 @@ reset() { #endif GLint num_compressed_formats = 0; - GLP(GetIntegerv)(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &num_compressed_formats); + glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &num_compressed_formats); GLint *formats = (GLint *)PANDA_MALLOC_ARRAY(num_compressed_formats * sizeof(GLint)); - GLP(GetIntegerv)(GL_COMPRESSED_TEXTURE_FORMATS, formats); + glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, formats); for (int i = 0; i < num_compressed_formats; ++i) { switch (formats[i]) { #ifndef OPENGLES_1 @@ -808,49 +808,49 @@ reset() { _supports_multitexture = true; _glActiveTexture = (PFNGLACTIVETEXTUREPROC) - get_extension_func(GLPREFIX_QUOTED, "ActiveTexture"); + get_extension_func("glActiveTexture"); _glClientActiveTexture = (PFNGLACTIVETEXTUREPROC) - get_extension_func(GLPREFIX_QUOTED, "ClientActiveTexture"); + get_extension_func("glClientActiveTexture"); _glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord1f"); + get_extension_func("glMultiTexCoord1f"); _glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord2f"); + get_extension_func("glMultiTexCoord2f"); _glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord3f"); + get_extension_func("glMultiTexCoord3f"); _glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord4f"); + get_extension_func("glMultiTexCoord4f"); _glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord1d"); + get_extension_func("glMultiTexCoord1d"); _glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord2d"); + get_extension_func("glMultiTexCoord2d"); _glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord3d"); + get_extension_func("glMultiTexCoord3d"); _glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord4d"); + get_extension_func("glMultiTexCoord4d"); } else if (has_extension("GL_ARB_multitexture")) { _supports_multitexture = true; _glActiveTexture = (PFNGLACTIVETEXTUREPROC) - get_extension_func(GLPREFIX_QUOTED, "ActiveTextureARB"); + get_extension_func("glActiveTextureARB"); _glClientActiveTexture = (PFNGLACTIVETEXTUREPROC) - get_extension_func(GLPREFIX_QUOTED, "ClientActiveTextureARB"); + get_extension_func("glClientActiveTextureARB"); _glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord1fARB"); + get_extension_func("glMultiTexCoord1fARB"); _glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord2fARB"); + get_extension_func("glMultiTexCoord2fARB"); _glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord3fARB"); + get_extension_func("glMultiTexCoord3fARB"); _glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord4fARB"); + get_extension_func("glMultiTexCoord4fARB"); _glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord1dARB"); + get_extension_func("glMultiTexCoord1dARB"); _glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord2dARB"); + get_extension_func("glMultiTexCoord2dARB"); _glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord3dARB"); + get_extension_func("glMultiTexCoord3dARB"); _glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC) - get_extension_func(GLPREFIX_QUOTED, "MultiTexCoord4dARB"); + get_extension_func("glMultiTexCoord4dARB"); } if (_supports_multitexture) { @@ -899,29 +899,29 @@ reset() { _supports_buffers = true; _glGenBuffers = (PFNGLGENBUFFERSPROC) - get_extension_func(GLPREFIX_QUOTED, "GenBuffers"); + get_extension_func("glGenBuffers"); _glBindBuffer = (PFNGLBINDBUFFERPROC) - get_extension_func(GLPREFIX_QUOTED, "BindBuffer"); + get_extension_func("glBindBuffer"); _glBufferData = (PFNGLBUFFERDATAPROC) - get_extension_func(GLPREFIX_QUOTED, "BufferData"); + get_extension_func("glBufferData"); _glBufferSubData = (PFNGLBUFFERSUBDATAPROC) - get_extension_func(GLPREFIX_QUOTED, "BufferSubData"); + get_extension_func("glBufferSubData"); _glDeleteBuffers = (PFNGLDELETEBUFFERSPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteBuffers"); + get_extension_func("glDeleteBuffers"); } else if (has_extension("GL_ARB_vertex_buffer_object")) { _supports_buffers = true; _glGenBuffers = (PFNGLGENBUFFERSPROC) - get_extension_func(GLPREFIX_QUOTED, "GenBuffersARB"); + get_extension_func("glGenBuffersARB"); _glBindBuffer = (PFNGLBINDBUFFERPROC) - get_extension_func(GLPREFIX_QUOTED, "BindBufferARB"); + get_extension_func("glBindBufferARB"); _glBufferData = (PFNGLBUFFERDATAPROC) - get_extension_func(GLPREFIX_QUOTED, "BufferDataARB"); + get_extension_func("glBufferDataARB"); _glBufferSubData = (PFNGLBUFFERSUBDATAPROC) - get_extension_func(GLPREFIX_QUOTED, "BufferSubDataARB"); + get_extension_func("glBufferSubDataARB"); _glDeleteBuffers = (PFNGLDELETEBUFFERSPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteBuffersARB"); + get_extension_func("glDeleteBuffersARB"); } if (_supports_buffers) { @@ -972,7 +972,7 @@ reset() { _shader_caps._ultimate_gprofile = (int)CG_PROFILE_GPU_GP; _glBindProgram = (PFNGLBINDPROGRAMARBPROC) - get_extension_func(GLPREFIX_QUOTED, "BindProgramARB"); + get_extension_func("glBindProgramARB"); // Bug workaround for radeons. if (_shader_caps._active_fprofile == CG_PROFILE_ARBFP1) { @@ -1002,82 +1002,82 @@ reset() { #ifndef OPENGLES if (_supports_glsl) { _glAttachShader = (PFNGLATTACHSHADERPROC) - get_extension_func(GLPREFIX_QUOTED, "AttachShader"); + get_extension_func("glAttachShader"); _glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC) - get_extension_func(GLPREFIX_QUOTED, "BindAttribLocation"); + get_extension_func("glBindAttribLocation"); _glCompileShader = (PFNGLCOMPILESHADERPROC) - get_extension_func(GLPREFIX_QUOTED, "CompileShader"); + get_extension_func("glCompileShader"); _glCreateProgram = (PFNGLCREATEPROGRAMPROC) - get_extension_func(GLPREFIX_QUOTED, "CreateProgram"); + get_extension_func("glCreateProgram"); _glCreateShader = (PFNGLCREATESHADERPROC) - get_extension_func(GLPREFIX_QUOTED, "CreateShader"); + get_extension_func("glCreateShader"); _glDeleteProgram = (PFNGLDELETEPROGRAMPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteProgram"); + get_extension_func("glDeleteProgram"); _glDeleteShader = (PFNGLDELETESHADERPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteShader"); + get_extension_func("glDeleteShader"); _glDetachShader = (PFNGLDETACHSHADERPROC) - get_extension_func(GLPREFIX_QUOTED, "DetachShader"); + get_extension_func("glDetachShader"); _glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC) - get_extension_func(GLPREFIX_QUOTED, "DisableVertexAttribArray"); + get_extension_func("glDisableVertexAttribArray"); _glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC) - get_extension_func(GLPREFIX_QUOTED, "EnableVertexAttribArray"); + get_extension_func("glEnableVertexAttribArray"); _glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC) - get_extension_func(GLPREFIX_QUOTED, "GetActiveAttrib"); + get_extension_func("glGetActiveAttrib"); _glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC) - get_extension_func(GLPREFIX_QUOTED, "GetActiveUniform"); + get_extension_func("glGetActiveUniform"); _glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC) - get_extension_func(GLPREFIX_QUOTED, "GetAttribLocation"); + get_extension_func("glGetAttribLocation"); _glGetProgramiv = (PFNGLGETPROGRAMIVPROC) - get_extension_func(GLPREFIX_QUOTED, "GetProgramiv"); + get_extension_func("glGetProgramiv"); _glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) - get_extension_func(GLPREFIX_QUOTED, "GetProgramInfoLog"); + get_extension_func("glGetProgramInfoLog"); _glGetShaderiv = (PFNGLGETSHADERIVPROC) - get_extension_func(GLPREFIX_QUOTED, "GetShaderiv"); + get_extension_func("glGetShaderiv"); _glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) - get_extension_func(GLPREFIX_QUOTED, "GetShaderInfoLog"); + get_extension_func("glGetShaderInfoLog"); _glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) - get_extension_func(GLPREFIX_QUOTED, "GetUniformLocation"); + get_extension_func("glGetUniformLocation"); _glLinkProgram = (PFNGLLINKPROGRAMPROC) - get_extension_func(GLPREFIX_QUOTED, "LinkProgram"); + get_extension_func("glLinkProgram"); _glShaderSource = (PFNGLSHADERSOURCEPROC_P) - get_extension_func(GLPREFIX_QUOTED, "ShaderSource"); + get_extension_func("glShaderSource"); _glUseProgram = (PFNGLUSEPROGRAMPROC) - get_extension_func(GLPREFIX_QUOTED, "UseProgram"); + get_extension_func("glUseProgram"); _glUniform4f = (PFNGLUNIFORM4FPROC) - get_extension_func(GLPREFIX_QUOTED, "Uniform4f"); + get_extension_func("glUniform4f"); _glUniform1i = (PFNGLUNIFORM1IPROC) - get_extension_func(GLPREFIX_QUOTED, "Uniform1i"); + get_extension_func("glUniform1i"); _glUniform1fv = (PFNGLUNIFORM1FVPROC) - get_extension_func(GLPREFIX_QUOTED, "Uniform1fv"); + get_extension_func("glUniform1fv"); _glUniform2fv = (PFNGLUNIFORM2FVPROC) - get_extension_func(GLPREFIX_QUOTED, "Uniform2fv"); + get_extension_func("glUniform2fv"); _glUniform3fv = (PFNGLUNIFORM3FVPROC) - get_extension_func(GLPREFIX_QUOTED, "Uniform3fv"); + get_extension_func("glUniform3fv"); _glUniform4fv = (PFNGLUNIFORM4FVPROC) - get_extension_func(GLPREFIX_QUOTED, "Uniform4fv"); + get_extension_func("glUniform4fv"); _glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC) - get_extension_func(GLPREFIX_QUOTED, "UniformMatrix3fv"); + get_extension_func("glUniformMatrix3fv"); _glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC) - get_extension_func(GLPREFIX_QUOTED, "UniformMatrix4fv"); + get_extension_func("glUniformMatrix4fv"); _glValidateProgram = (PFNGLVALIDATEPROGRAMPROC) - get_extension_func(GLPREFIX_QUOTED, "ValidateProgram"); + get_extension_func("glValidateProgram"); _glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC) - get_extension_func(GLPREFIX_QUOTED, "VertexAttribPointer"); + get_extension_func("glVertexAttribPointer"); if (_supports_geometry_shaders) { _glProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC) - get_extension_func(GLPREFIX_QUOTED, "ProgramParameteri"); + get_extension_func("glProgramParameteri"); _glFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREARBPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTextureARB"); + get_extension_func("glFramebufferTextureARB"); if (_glFramebufferTextureLayer == NULL) { _glFramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTextureLayerARB"); + get_extension_func("glFramebufferTextureLayerARB"); } } if (_supports_tessellation_shaders) { _glPatchParameteri = (PFNGLPATCHPARAMETERIPROC) - get_extension_func(GLPREFIX_QUOTED, "PatchParameteri"); + get_extension_func("glPatchParameteri"); } } #endif @@ -1148,74 +1148,74 @@ reset() { if (has_extension("GL_EXT_framebuffer_object")) { _supports_framebuffer_object = true; _glIsRenderbuffer = (PFNGLISRENDERBUFFEREXTPROC) - get_extension_func(GLPREFIX_QUOTED, "IsRenderbufferEXT"); + get_extension_func("glIsRenderbufferEXT"); _glBindRenderbuffer = (PFNGLBINDRENDERBUFFEREXTPROC) - get_extension_func(GLPREFIX_QUOTED, "BindRenderbufferEXT"); + get_extension_func("glBindRenderbufferEXT"); _glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteRenderbuffersEXT"); + get_extension_func("glDeleteRenderbuffersEXT"); _glGenRenderbuffers = (PFNGLGENRENDERBUFFERSEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "GenRenderbuffersEXT"); + get_extension_func("glGenRenderbuffersEXT"); _glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "RenderbufferStorageEXT"); + get_extension_func("glRenderbufferStorageEXT"); _glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "GetRenderbufferParameterivEXT"); + get_extension_func("glGetRenderbufferParameterivEXT"); _glIsFramebuffer = (PFNGLISFRAMEBUFFEREXTPROC) - get_extension_func(GLPREFIX_QUOTED, "IsFramebufferEXT"); + get_extension_func("glIsFramebufferEXT"); _glBindFramebuffer = (PFNGLBINDFRAMEBUFFEREXTPROC) - get_extension_func(GLPREFIX_QUOTED, "BindFramebufferEXT"); + get_extension_func("glBindFramebufferEXT"); _glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteFramebuffersEXT"); + get_extension_func("glDeleteFramebuffersEXT"); _glGenFramebuffers = (PFNGLGENFRAMEBUFFERSEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "GenFramebuffersEXT"); + get_extension_func("glGenFramebuffersEXT"); _glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "CheckFramebufferStatusEXT"); + get_extension_func("glCheckFramebufferStatusEXT"); _glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTexture1DEXT"); + get_extension_func("glFramebufferTexture1DEXT"); _glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTexture2DEXT"); + get_extension_func("glFramebufferTexture2DEXT"); _glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTexture3DEXT"); + get_extension_func("glFramebufferTexture3DEXT"); _glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferRenderbufferEXT"); + get_extension_func("glFramebufferRenderbufferEXT"); _glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "GetFramebufferAttachmentParameterivEXT"); + get_extension_func("glGetFramebufferAttachmentParameterivEXT"); _glGenerateMipmap = (PFNGLGENERATEMIPMAPEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "GenerateMipmapEXT"); + get_extension_func("glGenerateMipmapEXT"); } #ifdef OPENGLES else if (has_extension("GL_OES_framebuffer_object")) { _supports_framebuffer_object = true; _glIsRenderbuffer = (PFNGLISRENDERBUFFEROESPROC) - get_extension_func(GLPREFIX_QUOTED, "IsRenderbufferOES"); + get_extension_func("glIsRenderbufferOES"); _glBindRenderbuffer = (PFNGLBINDRENDERBUFFEROESPROC) - get_extension_func(GLPREFIX_QUOTED, "BindRenderbufferOES"); + get_extension_func("glBindRenderbufferOES"); _glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSOESPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteRenderbuffersOES"); + get_extension_func("glDeleteRenderbuffersOES"); _glGenRenderbuffers = (PFNGLGENRENDERBUFFERSOESPROC) - get_extension_func(GLPREFIX_QUOTED, "GenRenderbuffersOES"); + get_extension_func("glGenRenderbuffersOES"); _glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEOESPROC) - get_extension_func(GLPREFIX_QUOTED, "RenderbufferStorageOES"); + get_extension_func("glRenderbufferStorageOES"); _glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVOESPROC) - get_extension_func(GLPREFIX_QUOTED, "GetRenderbufferParameterivOES"); + get_extension_func("glGetRenderbufferParameterivOES"); _glIsFramebuffer = (PFNGLISFRAMEBUFFEROESPROC) - get_extension_func(GLPREFIX_QUOTED, "IsFramebufferOES"); + get_extension_func("glIsFramebufferOES"); _glBindFramebuffer = (PFNGLBINDFRAMEBUFFEROESPROC) - get_extension_func(GLPREFIX_QUOTED, "BindFramebufferOES"); + get_extension_func("glBindFramebufferOES"); _glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSOESPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteFramebuffersOES"); + get_extension_func("glDeleteFramebuffersOES"); _glGenFramebuffers = (PFNGLGENFRAMEBUFFERSOESPROC) - get_extension_func(GLPREFIX_QUOTED, "GenFramebuffersOES"); + get_extension_func("glGenFramebuffersOES"); _glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSOESPROC) - get_extension_func(GLPREFIX_QUOTED, "CheckFramebufferStatusOES"); + get_extension_func("glCheckFramebufferStatusOES"); _glFramebufferTexture1D = NULL; _glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DOESPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferTexture2DOES"); + get_extension_func("glFramebufferTexture2DOES"); _glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFEROESPROC) - get_extension_func(GLPREFIX_QUOTED, "FramebufferRenderbufferOES"); + get_extension_func("glFramebufferRenderbufferOES"); _glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESPROC) - get_extension_func(GLPREFIX_QUOTED, "GetFramebufferAttachmentParameterivOES"); + get_extension_func("glGetFramebufferAttachmentParameterivOES"); _glGenerateMipmap = (PFNGLGENERATEMIPMAPOESPROC) - get_extension_func(GLPREFIX_QUOTED, "GenerateMipmapOES"); + get_extension_func("glGenerateMipmapOES"); } #endif // OPENGLES #endif @@ -1224,37 +1224,37 @@ reset() { if ( has_extension("GL_EXT_framebuffer_multisample") ) { _supports_framebuffer_multisample = true; _glRenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "RenderbufferStorageMultisampleEXT"); + get_extension_func("glRenderbufferStorageMultisampleEXT"); } _supports_framebuffer_multisample_coverage_nv = false; if ( has_extension("GL_NV_framebuffer_multisample_coverage") ) { _supports_framebuffer_multisample_coverage_nv = true; _glRenderbufferStorageMultisampleCoverage = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) - get_extension_func(GLPREFIX_QUOTED, "RenderbufferStorageMultisampleCoverageNV"); + get_extension_func("glRenderbufferStorageMultisampleCoverageNV"); } _supports_framebuffer_blit = false; if ( has_extension("GL_EXT_framebuffer_blit") ) { _supports_framebuffer_blit = true; _glBlitFramebuffer = (PFNGLBLITFRAMEBUFFEREXTPROC) - get_extension_func(GLPREFIX_QUOTED, "BlitFramebufferEXT"); + get_extension_func("glBlitFramebufferEXT"); } _glDrawBuffers = NULL; #ifndef OPENGLES if (is_at_least_gl_version(2, 0)) { _glDrawBuffers = (PFNGLDRAWBUFFERSPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawBuffers"); + get_extension_func("glDrawBuffers"); } else if (has_extension("GL_ARB_draw_buffers")) { _glDrawBuffers = (PFNGLDRAWBUFFERSPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawBuffersARB"); + get_extension_func("glDrawBuffersARB"); } _max_color_targets = 1; if (_glDrawBuffers != 0) { GLint max_draw_buffers = 0; - GLP(GetIntegerv)(GL_MAX_DRAW_BUFFERS, &max_draw_buffers); + glGetIntegerv(GL_MAX_DRAW_BUFFERS, &max_draw_buffers); _max_color_targets = max_draw_buffers; } #endif // OPENGLES @@ -1263,7 +1263,7 @@ reset() { #ifndef OPENGLES if (_supports_framebuffer_multisample) { GLint max_samples; - GLP(GetIntegerv)(GL_MAX_SAMPLES_EXT, &max_samples); + glGetIntegerv(GL_MAX_SAMPLES_EXT, &max_samples); _max_fb_samples = max_samples; } #endif @@ -1274,32 +1274,32 @@ reset() { _supports_occlusion_query = true; _glGenQueries = (PFNGLGENQUERIESPROC) - get_extension_func(GLPREFIX_QUOTED, "GenQueries"); + get_extension_func("glGenQueries"); _glBeginQuery = (PFNGLBEGINQUERYPROC) - get_extension_func(GLPREFIX_QUOTED, "BeginQuery"); + get_extension_func("glBeginQuery"); _glEndQuery = (PFNGLENDQUERYPROC) - get_extension_func(GLPREFIX_QUOTED, "EndQuery"); + get_extension_func("glEndQuery"); _glDeleteQueries = (PFNGLDELETEQUERIESPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteQueries"); + get_extension_func("glDeleteQueries"); _glGetQueryiv = (PFNGLGETQUERYIVPROC) - get_extension_func(GLPREFIX_QUOTED, "GetQueryiv"); + get_extension_func("glGetQueryiv"); _glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC) - get_extension_func(GLPREFIX_QUOTED, "GetQueryObjectuiv"); + get_extension_func("glGetQueryObjectuiv"); } else if (has_extension("GL_ARB_occlusion_query")) { _supports_occlusion_query = true; _glGenQueries = (PFNGLGENQUERIESPROC) - get_extension_func(GLPREFIX_QUOTED, "GenQueriesARB"); + get_extension_func("glGenQueriesARB"); _glBeginQuery = (PFNGLBEGINQUERYPROC) - get_extension_func(GLPREFIX_QUOTED, "BeginQueryARB"); + get_extension_func("glBeginQueryARB"); _glEndQuery = (PFNGLENDQUERYPROC) - get_extension_func(GLPREFIX_QUOTED, "EndQueryARB"); + get_extension_func("glEndQueryARB"); _glDeleteQueries = (PFNGLDELETEQUERIESPROC) - get_extension_func(GLPREFIX_QUOTED, "DeleteQueriesARB"); + get_extension_func("glDeleteQueriesARB"); _glGetQueryiv = (PFNGLGETQUERYIVPROC) - get_extension_func(GLPREFIX_QUOTED, "GetQueryivARB"); + get_extension_func("glGetQueryivARB"); _glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC) - get_extension_func(GLPREFIX_QUOTED, "GetQueryObjectuivARB"); + get_extension_func("glGetQueryObjectuivARB"); } } @@ -1334,15 +1334,15 @@ reset() { if (is_at_least_gl_version(1, 2)) { supports_blend_equation = true; _glBlendEquation = (PFNGLBLENDEQUATIONPROC) - get_extension_func(GLPREFIX_QUOTED, "BlendEquation"); + get_extension_func("glBlendEquation"); } else if (has_extension("GL_OES_blend_subtract")) { supports_blend_equation = true; _glBlendEquation = (PFNGLBLENDEQUATIONPROC) - get_extension_func(GLPREFIX_QUOTED, "BlendEquationOES"); + get_extension_func("glBlendEquationOES"); } else if (has_extension("GL_EXT_blend_minmax")) { supports_blend_equation = true; _glBlendEquation = (PFNGLBLENDEQUATIONPROC) - get_extension_func(GLPREFIX_QUOTED, "BlendEquationEXT"); + get_extension_func("glBlendEquationEXT"); } if (supports_blend_equation && _glBlendEquation == NULL) { GLCAT.warning() @@ -1362,11 +1362,11 @@ reset() { if (is_at_least_gl_version(1, 2)) { supports_blend_color = true; _glBlendColor = (PFNGLBLENDCOLORPROC) - get_extension_func(GLPREFIX_QUOTED, "BlendColor"); + get_extension_func("glBlendColor"); } else if (has_extension("GL_EXT_blend_color")) { supports_blend_color = true; _glBlendColor = (PFNGLBLENDCOLORPROC) - get_extension_func(GLPREFIX_QUOTED, "BlendColorEXT"); + get_extension_func("glBlendColorEXT"); } if (supports_blend_color && _glBlendColor == NULL) { GLCAT.warning() @@ -1416,7 +1416,7 @@ reset() { if (_supports_multisample) { GLint sample_buffers = 0; - GLP(GetIntegerv)(GL_SAMPLE_BUFFERS, &sample_buffers); + glGetIntegerv(GL_SAMPLE_BUFFERS, &sample_buffers); if (sample_buffers != 1) { // Even if the API supports multisample, we might have ended up // with a framebuffer that doesn't have any multisample bits. @@ -1433,12 +1433,12 @@ reset() { GLint max_2d_texture_array_layers = 0; GLint max_cube_map_size = 0; - GLP(GetIntegerv)(GL_MAX_TEXTURE_SIZE, &max_texture_size); + glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size); _max_texture_dimension = max_texture_size; if (_supports_3d_texture) { #ifndef OPENGLES_1 - GLP(GetIntegerv)(GL_MAX_3D_TEXTURE_SIZE, &max_3d_texture_size); + glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &max_3d_texture_size); #endif _max_3d_texture_dimension = max_3d_texture_size; } else { @@ -1446,12 +1446,12 @@ reset() { } #ifndef OPENGLES if(_supports_2d_texture_array) { - GLP(GetIntegerv)(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, &max_2d_texture_array_layers); + glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, &max_2d_texture_array_layers); _max_2d_texture_array_layers = max_2d_texture_array_layers; } #endif if (_supports_cube_map) { - GLP(GetIntegerv)(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &max_cube_map_size); + glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &max_cube_map_size); _max_cube_map_dimension = max_cube_map_size; } else { _max_cube_map_dimension = 0; @@ -1459,8 +1459,8 @@ reset() { GLint max_elements_vertices = 0, max_elements_indices = 0; #ifndef OPENGLES - GLP(GetIntegerv)(GL_MAX_ELEMENTS_VERTICES, &max_elements_vertices); - GLP(GetIntegerv)(GL_MAX_ELEMENTS_INDICES, &max_elements_indices); + glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &max_elements_vertices); + glGetIntegerv(GL_MAX_ELEMENTS_INDICES, &max_elements_indices); if (max_elements_vertices > 0) { _max_vertices_per_array = max_elements_vertices; } @@ -1504,7 +1504,7 @@ reset() { } else { GLint num_compressed_formats = 0; - GLP(GetIntegerv)(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &num_compressed_formats); + glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &num_compressed_formats); if (num_compressed_formats == 0) { GLCAT.debug() << "No specific compressed texture formats are supported.\n"; @@ -1512,7 +1512,7 @@ reset() { GLCAT.debug() << "Supported compressed texture formats:\n"; GLint *formats = (GLint *)PANDA_MALLOC_ARRAY(num_compressed_formats * sizeof(GLint)); - GLP(GetIntegerv)(GL_COMPRESSED_TEXTURE_FORMATS, formats); + glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, formats); for (int i = 0; i < num_compressed_formats; ++i) { switch (formats[i]) { #ifndef OPENGLES_1 @@ -1576,7 +1576,7 @@ reset() { _max_anisotropy = 1.0; if (has_extension("GL_EXT_texture_filter_anisotropic")) { GLfloat max_anisotropy; - GLP(GetFloatv)(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy); + glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy); _max_anisotropy = (PN_stdfloat)max_anisotropy; _supports_anisotropy = true; } @@ -1586,15 +1586,15 @@ reset() { #ifndef OPENGLES if (is_at_least_gl_version(4, 2) || has_extension("GL_ARB_shader_image_load_store")) { _glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC) - get_extension_func(GLPREFIX_QUOTED, "BindImageTexture"); + get_extension_func("glBindImageTexture"); - GLP(GetIntegerv)(GL_MAX_IMAGE_UNITS, &_max_image_units); + glGetIntegerv(GL_MAX_IMAGE_UNITS, &_max_image_units); } else if (has_extension("GL_EXT_shader_image_load_store")) { _glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC) - get_extension_func(GLPREFIX_QUOTED, "BindImageTextureEXT"); + get_extension_func("glBindImageTextureEXT"); - GLP(GetIntegerv)(GL_MAX_IMAGE_UNITS_EXT, &_max_image_units); + glGetIntegerv(GL_MAX_IMAGE_UNITS_EXT, &_max_image_units); } #endif @@ -1602,7 +1602,7 @@ reset() { _supports_multi_bind = false; if (is_at_least_gl_version(4, 4) || has_extension("GL_ARB_multi_bind")) { _glBindImageTextures = (PFNGLBINDIMAGETEXTURESPROC) - get_extension_func(GLPREFIX_QUOTED, "BindImageTextures"); + get_extension_func("glBindImageTextures"); if (_glBindImageTextures != NULL) { _supports_multi_bind = true; @@ -1616,7 +1616,7 @@ reset() { if (support_stencil) { GLint num_stencil_bits; - GLP(GetIntegerv)(GL_STENCIL_BITS, &num_stencil_bits); + glGetIntegerv(GL_STENCIL_BITS, &num_stencil_bits); _supports_stencil = (num_stencil_bits != 0); } @@ -1625,7 +1625,7 @@ reset() { _supports_two_sided_stencil = has_extension("GL_EXT_stencil_two_side"); if (_supports_two_sided_stencil) { _glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC) - get_extension_func(GLPREFIX_QUOTED, "ActiveStencilFaceEXT"); + get_extension_func("glActiveStencilFaceEXT"); } else { _glActiveStencilFaceEXT = 0; @@ -1635,15 +1635,15 @@ reset() { // Some drivers expose one, some expose the other. ARB seems to be the newer one. if (has_extension("GL_ARB_draw_instanced")) { _glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawArraysInstancedARB"); + get_extension_func("glDrawArraysInstancedARB"); _glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawElementsInstancedARB"); + get_extension_func("glDrawElementsInstancedARB"); _supports_geometry_instancing = true; } else if (has_extension("GL_EXT_draw_instanced")) { _glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawArraysInstancedEXT"); + get_extension_func("glDrawArraysInstancedEXT"); _glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC) - get_extension_func(GLPREFIX_QUOTED, "DrawElementsInstancedEXT"); + get_extension_func("glDrawElementsInstancedEXT"); _supports_geometry_instancing = true; } else { _glDrawElementsInstanced = 0; @@ -1657,16 +1657,16 @@ reset() { // cases, we don't want the GL default settings; in others, we have // to force the point with some drivers that aren't strictly // compliant w.r.t. initial settings). - GLP(FrontFace)(GL_CCW); + glFrontFace(GL_CCW); #ifndef OPENGLES_2 - GLP(Disable)(GL_LINE_SMOOTH); - GLP(Disable)(GL_POINT_SMOOTH); + glDisable(GL_LINE_SMOOTH); + glDisable(GL_POINT_SMOOTH); #ifndef OPENGLES - GLP(Disable)(GL_POLYGON_SMOOTH); + glDisable(GL_POLYGON_SMOOTH); #endif // OPENGLES if (_supports_multisample) { - GLP(Disable)(GL_MULTISAMPLE); + glDisable(GL_MULTISAMPLE); } #endif @@ -1688,7 +1688,7 @@ reset() { #ifndef OPENGLES // Dither is on by default in GL; let's turn it off - GLP(Disable)(GL_DITHER); + glDisable(GL_DITHER); #endif // OPENGLES _dithering_enabled = false; @@ -1706,7 +1706,7 @@ reset() { #else // Count the max number of lights GLint max_lights = 0; - GLP(GetIntegerv)(GL_MAX_LIGHTS, &max_lights); + glGetIntegerv(GL_MAX_LIGHTS, &max_lights); _max_lights = max_lights; if (GLCAT.is_debug()) { @@ -1720,7 +1720,7 @@ reset() { #else // Count the max number of clipping planes GLint max_clip_planes = 0; - GLP(GetIntegerv)(GL_MAX_CLIP_PLANES, &max_clip_planes); + glGetIntegerv(GL_MAX_CLIP_PLANES, &max_clip_planes); _max_clip_planes = max_clip_planes; if (GLCAT.is_debug()) { @@ -1732,9 +1732,9 @@ reset() { if (_supports_multitexture) { GLint max_texture_stages = 0; #ifdef OPENGLES_2 - GLP(GetIntegerv)(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_stages); + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_stages); #else - GLP(GetIntegerv)(GL_MAX_TEXTURE_UNITS, &max_texture_stages); + glGetIntegerv(GL_MAX_TEXTURE_UNITS, &max_texture_stages); #endif _max_texture_stages = max_texture_stages; @@ -1758,18 +1758,18 @@ reset() { #ifndef OPENGLES_2 if (CLP(cheap_textures)) { GLCAT.info() - << "Setting GLP(Hint)() for fastest textures.\n"; - GLP(Hint)(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); + << "Setting glHint() for fastest textures.\n"; + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); } // Use per-vertex fog if per-pixel fog requires SW renderer - GLP(Hint)(GL_FOG_HINT, GL_DONT_CARE); + glHint(GL_FOG_HINT, GL_DONT_CARE); #endif GLint num_red_bits = 0; - GLP(GetIntegerv)(GL_RED_BITS, &num_red_bits); + glGetIntegerv(GL_RED_BITS, &num_red_bits); if (num_red_bits < 8) { - GLP(Enable)(GL_DITHER); + glEnable(GL_DITHER); _dithering_enabled = true; if (GLCAT.is_debug()) { GLCAT.debug() @@ -1906,8 +1906,8 @@ finish() { // from the frame. That will force the graphics card to finish // drawing before it is called char data[4]; - GLP(ReadPixels)(0,0,1,1,GL_RGBA,GL_UNSIGNED_BYTE,&data); - //GLP(Finish); + glReadPixels(0,0,1,1,GL_RGBA,GL_UNSIGNED_BYTE,&data); + //glFinish(); } //////////////////////////////////////////////////////////////////// @@ -1941,9 +1941,9 @@ clear(DrawableRegion *clearable) { int layerbit = RenderBuffer::T_aux_rgba_0 << i; if (clearable->get_clear_active(layerid)) { LColor v = clearable->get_clear_value(layerid); - GLP(ClearColor)(v[0],v[1],v[2],v[3]); + glClearColor(v[0],v[1],v[2],v[3]); set_draw_buffer(layerbit); - GLP(Clear)(GL_COLOR_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT); } } for (int i=0; i<_current_properties->get_aux_hrgba(); i++) { @@ -1951,9 +1951,9 @@ clear(DrawableRegion *clearable) { int layerbit = RenderBuffer::T_aux_hrgba_0 << i; if (clearable->get_clear_active(layerid)) { LColor v = clearable->get_clear_value(layerid); - GLP(ClearColor)(v[0],v[1],v[2],v[3]); + glClearColor(v[0],v[1],v[2],v[3]); set_draw_buffer(layerbit); - GLP(Clear)(GL_COLOR_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT); } } for (int i=0; i<_current_properties->get_aux_float(); i++) { @@ -1961,9 +1961,9 @@ clear(DrawableRegion *clearable) { int layerbit = RenderBuffer::T_aux_float_0 << i; if (clearable->get_clear_active(layerid)) { LColor v = clearable->get_clear_value(layerid); - GLP(ClearColor)(v[0],v[1],v[2],v[3]); + glClearColor(v[0],v[1],v[2],v[3]); set_draw_buffer(layerbit); - GLP(Clear)(GL_COLOR_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT); } } @@ -1980,9 +1980,9 @@ clear(DrawableRegion *clearable) { if (_current_properties->get_color_bits() > 0) { if (clearable->get_clear_color_active()) { LColor v = clearable->get_clear_color(); - GLP(ClearColor)(v[0],v[1],v[2],v[3]); + glClearColor(v[0],v[1],v[2],v[3]); if (CLP(color_mask)) { - GLP(ColorMask)(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } _state_mask.clear_bit(ColorWriteAttrib::get_class_slot()); mask |= GL_COLOR_BUFFER_BIT; @@ -1991,25 +1991,25 @@ clear(DrawableRegion *clearable) { if (clearable->get_clear_depth_active()) { #ifdef OPENGLES - GLP(ClearDepthf)(clearable->get_clear_depth()); + glClearDepthf(clearable->get_clear_depth()); #else - GLP(ClearDepth)(clearable->get_clear_depth()); + glClearDepth(clearable->get_clear_depth()); #endif // OPENGLES #ifdef GSG_VERBOSE GLCAT.spam() << "glDepthMask(GL_TRUE)" << endl; #endif - GLP(DepthMask)(GL_TRUE); + glDepthMask(GL_TRUE); _state_mask.clear_bit(DepthWriteAttrib::get_class_slot()); mask |= GL_DEPTH_BUFFER_BIT; } if (clearable->get_clear_stencil_active()) { - GLP(ClearStencil)(clearable->get_clear_stencil()); + glClearStencil(clearable->get_clear_stencil()); mask |= GL_STENCIL_BUFFER_BIT; } - GLP(Clear)(mask); + glClear(mask); if (GLCAT.is_spam()) { GLCAT.spam() << "glClear("; @@ -2059,9 +2059,9 @@ prepare_display_region(DisplayRegionPipelineReader *dr) { _draw_buffer_type |= _current_properties->get_aux_mask(); set_draw_buffer(_draw_buffer_type); - GLP(Enable)(GL_SCISSOR_TEST); - GLP(Scissor)(x, y, width, height); - GLP(Viewport)(x, y, width, height); + glEnable(GL_SCISSOR_TEST); + glScissor(x, y, width, height); + glViewport(x, y, width, height); report_my_gl_errors(); do_point_size(); @@ -2149,7 +2149,7 @@ prepare_lens() { << "glMatrixMode(GL_PROJECTION): " << _projection_mat->get_mat() << endl; } - GLP(MatrixMode)(GL_PROJECTION); + glMatrixMode(GL_PROJECTION); GLPf(LoadMatrix)(_projection_mat->get_mat().get_data()); report_my_gl_errors(); @@ -2205,7 +2205,7 @@ begin_frame(Thread *current_thread) { ui != _usage_textures.end(); ++ui) { GLuint index = (*ui).second; - GLP(DeleteTextures)(1, &index); + glDeleteTextures(1, &index); } _usage_textures.clear(); _show_texture_usage_max_size = max_size; @@ -2322,7 +2322,7 @@ end_frame(Thread *current_thread) { GLCAT.debug() << "releasing display list index " << (int)(*ddli) << "\n"; } - GLP(DeleteLists)((*ddli), 1); + glDeleteLists((*ddli), 1); } _deleted_display_lists.clear(); } @@ -2419,7 +2419,7 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, if (hardware_animation) { // Set up the transform matrices for vertex blending. nassertr(_supports_vertex_blend, false); - GLP(Enable)(GL_VERTEX_BLEND_ARB); + glEnable(GL_VERTEX_BLEND_ARB); _glVertexBlend(animation.get_num_transforms()); const TransformTable *table = _data_reader->get_transform_table(); @@ -2430,9 +2430,9 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, // to change this interface from that for the list of // nonindexed matrices, to make it easier to load an arbitrary // number of matrices. - GLP(Enable)(GL_MATRIX_PALETTE_ARB); + glEnable(GL_MATRIX_PALETTE_ARB); - GLP(MatrixMode)(GL_MATRIX_PALETTE_ARB); + glMatrixMode(GL_MATRIX_PALETTE_ARB); for (int i = 0; i < table->get_num_transforms(); ++i) { LMatrix4 mat; @@ -2449,7 +2449,7 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, // little clumsier. if (_supports_matrix_palette) { - GLP(Disable)(GL_MATRIX_PALETTE_ARB); + glDisable(GL_MATRIX_PALETTE_ARB); } // GL_MODELVIEW0 and 1 are different than the rest. @@ -2457,21 +2457,21 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, if (i < table->get_num_transforms()) { LMatrix4 mat; table->get_transform(i)->mult_matrix(mat, _internal_transform->get_mat()); - GLP(MatrixMode)(GL_MODELVIEW0_ARB); + glMatrixMode(GL_MODELVIEW0_ARB); GLPf(LoadMatrix)(mat.get_data()); ++i; } if (i < table->get_num_transforms()) { LMatrix4 mat; table->get_transform(i)->mult_matrix(mat, _internal_transform->get_mat()); - GLP(MatrixMode)(GL_MODELVIEW1_ARB); + glMatrixMode(GL_MODELVIEW1_ARB); GLPf(LoadMatrix)(mat.get_data()); ++i; } while (i < table->get_num_transforms()) { LMatrix4 mat; table->get_transform(i)->mult_matrix(mat, _internal_transform->get_mat()); - GLP(MatrixMode)(GL_MODELVIEW2_ARB + i - 2); + glMatrixMode(GL_MODELVIEW2_ARB + i - 2); GLPf(LoadMatrix)(mat.get_data()); ++i; } @@ -2486,15 +2486,15 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, } else { // We're not using vertex blending. if (_vertex_blending_enabled) { - GLP(Disable)(GL_VERTEX_BLEND_ARB); + glDisable(GL_VERTEX_BLEND_ARB); if (_supports_matrix_palette) { - GLP(Disable)(GL_MATRIX_PALETTE_ARB); + glDisable(GL_MATRIX_PALETTE_ARB); } _vertex_blending_enabled = false; } if (_transform_stale) { - GLP(MatrixMode)(GL_MODELVIEW); + glMatrixMode(GL_MODELVIEW); GLPf(LoadMatrix)(_internal_transform->get_mat().get_data()); } } @@ -2505,12 +2505,12 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, // If the vertex data claims to be already transformed into clip // coordinates, wipe out the current projection and modelview // matrix (so we don't attempt to transform it again). - GLP(MatrixMode)(GL_PROJECTION); - GLP(PushMatrix)(); - GLP(LoadIdentity)(); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PushMatrix)(); - GLP(LoadIdentity)(); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); } #endif @@ -2538,7 +2538,7 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, << "calling display list " << (int)_geom_display_list << "\n"; } - GLP(CallList)(_geom_display_list); + glCallList(_geom_display_list); #ifdef DO_PSTATS _vertices_display_list_pcollector.add_level(ggc->_num_verts); _primitive_batches_display_list_pcollector.add_level(1); @@ -2562,9 +2562,9 @@ begin_draw_primitives(const GeomPipelineReader *geom_reader, // If it has been modified, or this is the first time, then we // need to build the display list up. if (CLP(compile_and_execute)) { - GLP(NewList)(_geom_display_list, GL_COMPILE_AND_EXECUTE); + glNewList(_geom_display_list, GL_COMPILE_AND_EXECUTE); } else { - GLP(NewList)(_geom_display_list, GL_COMPILE); + glNewList(_geom_display_list, GL_COMPILE); } #ifdef DO_PSTATS @@ -2700,7 +2700,7 @@ update_standard_vertex_arrays(bool force) { // Be sure also to disable any texture stages we had enabled before. while (stage_index < _last_max_stage_index) { _glClientActiveTexture(GL_TEXTURE0 + stage_index); - GLP(DisableClientState)(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); ++stage_index; } _last_max_stage_index = max_stage_index; @@ -2740,18 +2740,18 @@ update_standard_vertex_arrays(bool force) { if (!setup_array_data(client_pointer, array_reader, force)) { return false; } - GLP(NormalPointer)(get_numeric_type(numeric_type), stride, + glNormalPointer(get_numeric_type(numeric_type), stride, client_pointer + start); - GLP(EnableClientState)(GL_NORMAL_ARRAY); + glEnableClientState(GL_NORMAL_ARRAY); } else { - GLP(DisableClientState)(GL_NORMAL_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); } #ifndef NDEBUG if (_show_texture_usage) { // In show_texture_usage mode, all colors are white, so as not // to contaminate the texture color. - GLP(DisableClientState)(GL_COLOR_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); GLPf(Color4)(1.0f, 1.0f, 1.0f, 1.0f); } else #endif // NDEBUG @@ -2761,11 +2761,11 @@ update_standard_vertex_arrays(bool force) { if (!setup_array_data(client_pointer, array_reader, force)) { return false; } - GLP(ColorPointer)(num_values, get_numeric_type(numeric_type), + glColorPointer(num_values, get_numeric_type(numeric_type), stride, client_pointer + start); - GLP(EnableClientState)(GL_COLOR_ARRAY); + glEnableClientState(GL_COLOR_ARRAY); } else { - GLP(DisableClientState)(GL_COLOR_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); // Since we don't have per-vertex color, the implicit color is // white. @@ -2791,18 +2791,18 @@ update_standard_vertex_arrays(bool force) { if (!setup_array_data(client_pointer, array_reader, force)) { return false; } - GLP(TexCoordPointer)(num_values, get_numeric_type(numeric_type), + glTexCoordPointer(num_values, get_numeric_type(numeric_type), stride, client_pointer + start); - GLP(EnableClientState)(GL_TEXTURE_COORD_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); } else { // The vertex data doesn't have texcoords for this stage (even // though they're needed). - GLP(DisableClientState)(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); } } else { // No texcoords are needed for this stage. - GLP(DisableClientState)(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); } ++stage_index; @@ -2811,7 +2811,7 @@ update_standard_vertex_arrays(bool force) { // Be sure also to disable any texture stages we had enabled before. while (stage_index < _last_max_stage_index) { _glClientActiveTexture(GL_TEXTURE0 + stage_index); - GLP(DisableClientState)(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); ++stage_index; } _last_max_stage_index = max_stage_index; @@ -2828,9 +2828,9 @@ update_standard_vertex_arrays(bool force) { } _glWeightPointer(num_values, get_numeric_type(numeric_type), stride, client_pointer + start); - GLP(EnableClientState)(GL_WEIGHT_ARRAY_ARB); + glEnableClientState(GL_WEIGHT_ARRAY_ARB); } else { - GLP(DisableClientState)(GL_WEIGHT_ARRAY_ARB); + glDisableClientState(GL_WEIGHT_ARRAY_ARB); } if (animation.get_indexed_transforms()) { @@ -2843,16 +2843,16 @@ update_standard_vertex_arrays(bool force) { } _glMatrixIndexPointer(num_values, get_numeric_type(numeric_type), stride, client_pointer + start); - GLP(EnableClientState)(GL_MATRIX_INDEX_ARRAY_ARB); + glEnableClientState(GL_MATRIX_INDEX_ARRAY_ARB); } else { - GLP(DisableClientState)(GL_MATRIX_INDEX_ARRAY_ARB); + glDisableClientState(GL_MATRIX_INDEX_ARRAY_ARB); } } } else { - GLP(DisableClientState)(GL_WEIGHT_ARRAY_ARB); + glDisableClientState(GL_WEIGHT_ARRAY_ARB); if (_supports_matrix_palette) { - GLP(DisableClientState)(GL_MATRIX_INDEX_ARRAY_ARB); + glDisableClientState(GL_MATRIX_INDEX_ARRAY_ARB); } } } @@ -2865,9 +2865,9 @@ update_standard_vertex_arrays(bool force) { if (!setup_array_data(client_pointer, array_reader, force)) { return false; } - GLP(VertexPointer)(num_values, get_numeric_type(numeric_type), + glVertexPointer(num_values, get_numeric_type(numeric_type), stride, client_pointer + start); - GLP(EnableClientState)(GL_VERTEX_ARRAY); + glEnableClientState(GL_VERTEX_ARRAY); } } #endif // OPENGLES_2 @@ -2921,28 +2921,28 @@ disable_standard_vertex_arrays() if (_use_sender) return; #endif - GLP(DisableClientState)(GL_NORMAL_ARRAY); - GLP(DisableClientState)(GL_COLOR_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); GLPf(Color4)(1.0f, 1.0f, 1.0f, 1.0f); report_my_gl_errors(); for (int stage_index=0; stage_index < _last_max_stage_index; stage_index++) { _glClientActiveTexture(GL_TEXTURE0 + stage_index); - GLP(DisableClientState)(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); } _last_max_stage_index = 0; report_my_gl_errors(); #ifndef OPENGLES if (_supports_vertex_blend) { - GLP(DisableClientState)(GL_WEIGHT_ARRAY_ARB); + glDisableClientState(GL_WEIGHT_ARRAY_ARB); if (_supports_matrix_palette) { - GLP(DisableClientState)(GL_MATRIX_INDEX_ARRAY_ARB); + glDisableClientState(GL_MATRIX_INDEX_ARRAY_ARB); } } #endif - GLP(DisableClientState)(GL_VERTEX_ARRAY); + glDisableClientState(GL_VERTEX_ARRAY); report_my_gl_errors(); #endif } @@ -3003,7 +3003,7 @@ draw_triangles(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_TRIANGLES, + glDrawArrays(GL_TRIANGLES, reader->get_first_vertex(), num_vertices); } @@ -3073,7 +3073,7 @@ draw_tristrips(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_TRIANGLE_STRIP, + glDrawArrays(GL_TRIANGLE_STRIP, reader->get_first_vertex(), num_vertices); } @@ -3128,7 +3128,7 @@ draw_tristrips(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_TRIANGLE_STRIP, first_vertex + start, + glDrawArrays(GL_TRIANGLE_STRIP, first_vertex + start, ends[i] - start); } start = ends[i] + 2; @@ -3208,7 +3208,7 @@ draw_trifans(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_TRIANGLE_FAN, first_vertex + start, + glDrawArrays(GL_TRIANGLE_FAN, first_vertex + start, ends[i] - start); } start = ends[i]; @@ -3284,7 +3284,7 @@ draw_patches(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_PATCHES, + glDrawArrays(GL_PATCHES, reader->get_first_vertex(), num_vertices); } @@ -3350,7 +3350,7 @@ draw_lines(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_LINES, + glDrawArrays(GL_LINES, reader->get_first_vertex(), num_vertices); } @@ -3424,7 +3424,7 @@ draw_points(const GeomPrimitivePipelineReader *reader, bool force) { } else #endif { - GLP(DrawArrays)(GL_POINTS, + glDrawArrays(GL_POINTS, reader->get_first_vertex(), num_vertices); } @@ -3447,11 +3447,11 @@ end_draw_primitives() { #ifndef OPENGLES // Display lists not supported by OpenGL ES. if (_geom_display_list != 0) { // If we were building a display list, close it now. - GLP(EndList)(); + glEndList(); _load_display_list_pcollector.stop(); if (!CLP(compile_and_execute)) { - GLP(CallList)(_geom_display_list); + glCallList(_geom_display_list); } _primitive_batches_display_list_pcollector.add_level(1); } @@ -3459,9 +3459,9 @@ end_draw_primitives() { // Clean up the vertex blending state. if (_vertex_blending_enabled) { - GLP(Disable)(GL_VERTEX_BLEND_ARB); + glDisable(GL_VERTEX_BLEND_ARB); if (_supports_matrix_palette) { - GLP(Disable)(GL_MATRIX_PALETTE_ARB); + glDisable(GL_MATRIX_PALETTE_ARB); } _vertex_blending_enabled = false; } @@ -3469,16 +3469,16 @@ end_draw_primitives() { #ifndef OPENGLES_2 if (_transform_stale) { - GLP(MatrixMode)(GL_MODELVIEW); + glMatrixMode(GL_MODELVIEW); GLPf(LoadMatrix)(_internal_transform->get_mat().get_data()); } if (_data_reader->is_vertex_transformed()) { // Restore the matrices that we pushed above. - GLP(MatrixMode)(GL_PROJECTION); - GLP(PopMatrix)(); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PopMatrix)(); + glMatrixMode(GL_PROJECTION); + glPopMatrix(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); } #endif @@ -3534,7 +3534,7 @@ prepare_texture(Texture *tex, int view) { } CLP(TextureContext) *gtc = new CLP(TextureContext)(_prepared_objects, tex, view); - GLP(GenTextures)(1, >c->_index); + glGenTextures(1, >c->_index); report_my_gl_errors(); apply_texture(gtc); @@ -3612,7 +3612,7 @@ release_texture(TextureContext *tc) { report_my_gl_errors(); CLP(TextureContext) *gtc = DCAST(CLP(TextureContext), tc); - GLP(DeleteTextures)(1, >c->_index); + glDeleteTextures(1, >c->_index); report_my_gl_errors(); gtc->_index = 0; @@ -4225,7 +4225,7 @@ framebuffer_copy_to_texture(Texture *tex, int view, int z, nassertr(tex != NULL && dr != NULL, false); set_read_buffer(rb._buffer_type); if (CLP(color_mask)) { - GLP(ColorMask)(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } int xo, yo, w, h; @@ -4319,11 +4319,11 @@ framebuffer_copy_to_texture(Texture *tex, int view, int z, if (uses_mipmaps) { #ifndef OPENGLES_2 if (_supports_generate_mipmap) { - GLP(TexParameteri)(target, GL_GENERATE_MIPMAP, true); + glTexParameteri(target, GL_GENERATE_MIPMAP, true); } else { #endif // If we can't auto-generate mipmaps, do without mipmaps. - GLP(TexParameteri)(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); uses_mipmaps = false; #ifndef OPENGLES_2 } @@ -4372,10 +4372,10 @@ framebuffer_copy_to_texture(Texture *tex, int view, int z, // It seems that OpenGL accepts a size higher than the framebuffer, // but if we run into trouble we'll have to replace this with // something smarter. - GLP(CopyTexImage2D)(target, 0, internal_format, xo, yo, width, height, 0); + glCopyTexImage2D(target, 0, internal_format, xo, yo, width, height, 0); } else { // We can overlay the existing image. - GLP(CopyTexSubImage2D)(target, 0, 0, 0, xo, yo, w, h); + glCopyTexSubImage2D(target, 0, 0, 0, xo, yo, w, h); } } @@ -4413,13 +4413,13 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z, const DisplayRegion *dr, const RenderBuffer &rb) { nassertr(tex != NULL && dr != NULL, false); set_read_buffer(rb._buffer_type); - GLP(PixelStorei)(GL_PACK_ALIGNMENT, 1); + glPixelStorei(GL_PACK_ALIGNMENT, 1); if (CLP(color_mask)) { - GLP(ColorMask)(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } // Bug fix for RE, RE2, and VTX - need to disable texturing in order - // for GLP(ReadPixels)() to work + // for glReadPixels() to work // NOTE: reading the depth buffer is *much* slower than reading the // color buffer set_state_and_transform(RenderState::make_empty(), _internal_transform); @@ -4544,7 +4544,7 @@ framebuffer_copy_to_ram(Texture *tex, int view, int z, } } - GLP(ReadPixels)(xo, yo, w, h, + glReadPixels(xo, yo, w, h, external_format, get_component_type(component_type), image_ptr); @@ -4573,17 +4573,17 @@ void CLP(GraphicsStateGuardian):: apply_fog(Fog *fog) { #ifndef OPENGLES_2 Fog::Mode fmode = fog->get_mode(); - GLP(Fogf)(GL_FOG_MODE, get_fog_mode_type(fmode)); + glFogf(GL_FOG_MODE, get_fog_mode_type(fmode)); if (fmode == Fog::M_linear) { PN_stdfloat onset, opaque; fog->get_linear_range(onset, opaque); - GLP(Fogf)(GL_FOG_START, onset); - GLP(Fogf)(GL_FOG_END, opaque); + glFogf(GL_FOG_START, onset); + glFogf(GL_FOG_END, opaque); } else { // Exponential fog is always camera-relative. - GLP(Fogf)(GL_FOG_DENSITY, fog->get_exp_density()); + glFogf(GL_FOG_DENSITY, fog->get_exp_density()); } call_glFogfv(GL_FOG_COLOR, fog->get_color()); @@ -4612,7 +4612,7 @@ do_issue_transform() { } DO_PSTATS_STUFF(_transform_state_pcollector.add_level(1)); - GLP(MatrixMode)(GL_MODELVIEW); + glMatrixMode(GL_MODELVIEW); GLPf(LoadMatrix)(transform->get_mat().get_data()); if (_auto_rescale_normal) { @@ -4641,12 +4641,12 @@ do_issue_shade_model() { const ShadeModelAttrib *target_shade_model = DCAST(ShadeModelAttrib, _target_rs->get_attrib_def(ShadeModelAttrib::get_class_slot())); switch (target_shade_model->get_mode()) { case ShadeModelAttrib::M_smooth: - GLP(ShadeModel)(GL_SMOOTH); + glShadeModel(GL_SMOOTH); _flat_shade_model = false; break; case ShadeModelAttrib::M_flat: - GLP(ShadeModel)(GL_FLAT); + glShadeModel(GL_FLAT); _flat_shade_model = true; break; } @@ -4731,15 +4731,15 @@ do_issue_render_mode() { case RenderModeAttrib::M_unchanged: case RenderModeAttrib::M_filled: case RenderModeAttrib::M_filled_flat: - GLP(PolygonMode)(GL_FRONT_AND_BACK, GL_FILL); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break; case RenderModeAttrib::M_wireframe: - GLP(PolygonMode)(GL_FRONT_AND_BACK, GL_LINE); + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break; case RenderModeAttrib::M_point: - GLP(PolygonMode)(GL_FRONT_AND_BACK, GL_POINT); + glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break; default: @@ -4749,9 +4749,9 @@ do_issue_render_mode() { #endif // OPENGLES // The thickness affects both the line width and the point size. - GLP(LineWidth)(_point_size); + glLineWidth(_point_size); #ifndef OPENGLES_2 - GLP(PointSize)(_point_size); + glPointSize(_point_size); #endif report_my_gl_errors(); @@ -4795,26 +4795,26 @@ do_issue_antialias() { #ifndef OPENGLES_2 switch (target_antialias->get_mode_quality()) { case AntialiasAttrib::M_faster: - GLP(Hint)(GL_LINE_SMOOTH_HINT, GL_FASTEST); - GLP(Hint)(GL_POINT_SMOOTH_HINT, GL_FASTEST); + glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST); + glHint(GL_POINT_SMOOTH_HINT, GL_FASTEST); #ifndef OPENGLES - GLP(Hint)(GL_POLYGON_SMOOTH_HINT, GL_FASTEST); + glHint(GL_POLYGON_SMOOTH_HINT, GL_FASTEST); #endif // OPENGLES break; case AntialiasAttrib::M_better: - GLP(Hint)(GL_LINE_SMOOTH_HINT, GL_NICEST); - GLP(Hint)(GL_POINT_SMOOTH_HINT, GL_NICEST); + glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); + glHint(GL_POINT_SMOOTH_HINT, GL_NICEST); #ifndef OPENGLES - GLP(Hint)(GL_POLYGON_SMOOTH_HINT, GL_NICEST); + glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); #endif // OPENGLES break; default: - GLP(Hint)(GL_LINE_SMOOTH_HINT, GL_DONT_CARE); - GLP(Hint)(GL_POINT_SMOOTH_HINT, GL_DONT_CARE); + glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE); + glHint(GL_POINT_SMOOTH_HINT, GL_DONT_CARE); #ifndef OPENGLES - GLP(Hint)(GL_POLYGON_SMOOTH_HINT, GL_DONT_CARE); + glHint(GL_POLYGON_SMOOTH_HINT, GL_DONT_CARE); #endif // OPENGLES break; } @@ -4838,25 +4838,25 @@ do_issue_rescale_normal() { switch (mode) { case RescaleNormalAttrib::M_none: - GLP(Disable)(GL_NORMALIZE); + glDisable(GL_NORMALIZE); if (_supports_rescale_normal && support_rescale_normal) { - GLP(Disable)(GL_RESCALE_NORMAL); + glDisable(GL_RESCALE_NORMAL); } break; case RescaleNormalAttrib::M_rescale: if (_supports_rescale_normal && support_rescale_normal) { - GLP(Enable)(GL_RESCALE_NORMAL); - GLP(Disable)(GL_NORMALIZE); + glEnable(GL_RESCALE_NORMAL); + glDisable(GL_NORMALIZE); } else { - GLP(Enable)(GL_NORMALIZE); + glEnable(GL_NORMALIZE); } break; case RescaleNormalAttrib::M_normalize: - GLP(Enable)(GL_NORMALIZE); + glEnable(GL_NORMALIZE); if (_supports_rescale_normal && support_rescale_normal) { - GLP(Disable)(GL_RESCALE_NORMAL); + glDisable(GL_RESCALE_NORMAL); } break; @@ -4889,7 +4889,7 @@ do_issue_depth_test() { enable_depth_test(false); } else { enable_depth_test(true); - GLP(DepthFunc)(PANDA_TO_GL_COMPAREFUNC(mode)); + glDepthFunc(PANDA_TO_GL_COMPAREFUNC(mode)); } report_my_gl_errors(); } @@ -4911,7 +4911,7 @@ do_issue_alpha_test() { } else { nassertv(GL_NEVER == (AlphaTestAttrib::M_never-1+0x200)); #ifndef OPENGLES_2 - GLP(AlphaFunc)(PANDA_TO_GL_COMPAREFUNC(mode), target_alpha_test->get_reference_alpha()); + glAlphaFunc(PANDA_TO_GL_COMPAREFUNC(mode), target_alpha_test->get_reference_alpha()); #endif enable_alpha_test(true); } @@ -4932,13 +4932,13 @@ do_issue_depth_write() { GLCAT.spam() << "glDepthMask(GL_FALSE)" << endl; #endif - GLP(DepthMask)(GL_FALSE); + glDepthMask(GL_FALSE); } else { #ifdef GSG_VERBOSE GLCAT.spam() << "glDepthMask(GL_TRUE)" << endl; #endif - GLP(DepthMask)(GL_TRUE); + glDepthMask(GL_TRUE); } report_my_gl_errors(); } @@ -4955,15 +4955,15 @@ do_issue_cull_face() { switch (mode) { case CullFaceAttrib::M_cull_none: - GLP(Disable)(GL_CULL_FACE); + glDisable(GL_CULL_FACE); break; case CullFaceAttrib::M_cull_clockwise: - GLP(Enable)(GL_CULL_FACE); - GLP(CullFace)(GL_BACK); + glEnable(GL_CULL_FACE); + glCullFace(GL_BACK); break; case CullFaceAttrib::M_cull_counter_clockwise: - GLP(Enable)(GL_CULL_FACE); - GLP(CullFace)(GL_FRONT); + glEnable(GL_CULL_FACE); + glCullFace(GL_FRONT); break; default: GLCAT.error() @@ -5005,7 +5005,7 @@ do_issue_depth_offset() { if (offset != 0) { // The relationship between these two parameters is a little // unclear and poorly explained in the GL man pages. - GLP(PolygonOffset)((GLfloat) -offset, (GLfloat) -offset); + glPolygonOffset((GLfloat) -offset, (GLfloat) -offset); enable_polygon_offset(true); } else { @@ -5020,10 +5020,10 @@ do_issue_depth_offset() { #endif #ifdef OPENGLES // OpenGL ES uses a single-precision call. - GLP(DepthRangef)((GLclampf)min_value, (GLclampf)max_value); + glDepthRangef((GLclampf)min_value, (GLclampf)max_value); #else // Mainline OpenGL uses a double-precision call. - GLP(DepthRange)((GLclampd)min_value, (GLclampd)max_value); + glDepthRange((GLclampd)min_value, (GLclampd)max_value); #endif // OPENGLES report_my_gl_errors(); @@ -5065,12 +5065,12 @@ do_issue_material() { call_glMaterialfv(face, GL_SPECULAR, material->get_specular()); call_glMaterialfv(face, GL_EMISSION, material->get_emission()); - GLP(Materialf)(face, GL_SHININESS, min(material->get_shininess(), (PN_stdfloat)128.0)); + glMaterialf(face, GL_SHININESS, min(material->get_shininess(), (PN_stdfloat)128.0)); if (material->has_ambient() && material->has_diffuse()) { // The material has both an ambient and diffuse specified. This // means we do not need glMaterialColor(). - GLP(Disable)(GL_COLOR_MATERIAL); + glDisable(GL_COLOR_MATERIAL); call_glMaterialfv(face, GL_AMBIENT, material->get_ambient()); call_glMaterialfv(face, GL_DIFFUSE, material->get_diffuse()); @@ -5079,13 +5079,13 @@ do_issue_material() { // The diffuse component comes from the object's color. call_glMaterialfv(face, GL_AMBIENT, material->get_ambient()); if (has_material_force_color) { - GLP(Disable)(GL_COLOR_MATERIAL); + glDisable(GL_COLOR_MATERIAL); call_glMaterialfv(face, GL_DIFFUSE, _material_force_color); } else { #ifndef OPENGLES - GLP(ColorMaterial)(face, GL_DIFFUSE); + glColorMaterial(face, GL_DIFFUSE); #endif // OPENGLES - GLP(Enable)(GL_COLOR_MATERIAL); + glEnable(GL_COLOR_MATERIAL); } } else if (material->has_diffuse()) { @@ -5093,38 +5093,38 @@ do_issue_material() { // The ambient component comes from the object's color. call_glMaterialfv(face, GL_DIFFUSE, material->get_diffuse()); if (has_material_force_color) { - GLP(Disable)(GL_COLOR_MATERIAL); + glDisable(GL_COLOR_MATERIAL); call_glMaterialfv(face, GL_AMBIENT, _material_force_color); } else { #ifndef OPENGLES - GLP(ColorMaterial)(face, GL_AMBIENT); + glColorMaterial(face, GL_AMBIENT); #endif // OPENGLES - GLP(Enable)(GL_COLOR_MATERIAL); + glEnable(GL_COLOR_MATERIAL); } } else { // The material specifies neither a diffuse nor an ambient // component. Both components come from the object's color. if (has_material_force_color) { - GLP(Disable)(GL_COLOR_MATERIAL); + glDisable(GL_COLOR_MATERIAL); call_glMaterialfv(face, GL_AMBIENT, _material_force_color); call_glMaterialfv(face, GL_DIFFUSE, _material_force_color); } else { #ifndef OPENGLES - GLP(ColorMaterial)(face, GL_AMBIENT_AND_DIFFUSE); + glColorMaterial(face, GL_AMBIENT_AND_DIFFUSE); #endif // OPENGLES - GLP(Enable)(GL_COLOR_MATERIAL); + glEnable(GL_COLOR_MATERIAL); } } #ifndef OPENGLES - GLP(LightModeli)(GL_LIGHT_MODEL_LOCAL_VIEWER, material->get_local()); - GLP(LightModeli)(GL_LIGHT_MODEL_TWO_SIDE, material->get_twoside()); + glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, material->get_local()); + glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, material->get_twoside()); if (CLP(separate_specular_color)) { - GLP(LightModeli)(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR); + glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR); } else { - GLP(LightModeli)(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR); + glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR); } #endif @@ -5156,16 +5156,16 @@ do_issue_blending() { enable_multisample_alpha_mask(false); if (CLP(color_mask)) { enable_blend(false); - GLP(ColorMask)(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); } else { enable_blend(true); _glBlendEquation(GL_FUNC_ADD); - GLP(BlendFunc)(GL_ZERO, GL_ONE); + glBlendFunc(GL_ZERO, GL_ONE); } return; } else { if (CLP(color_mask)) { - GLP(ColorMask)((color_channels & ColorWriteAttrib::C_red) != 0, + glColorMask((color_channels & ColorWriteAttrib::C_red) != 0, (color_channels & ColorWriteAttrib::C_green) != 0, (color_channels & ColorWriteAttrib::C_blue) != 0, (color_channels & ColorWriteAttrib::C_alpha) != 0); @@ -5188,7 +5188,7 @@ do_issue_blending() { enable_multisample_alpha_mask(false); enable_blend(true); _glBlendEquation(get_blend_equation_type(color_blend_mode)); - GLP(BlendFunc)(get_blend_func(color_blend->get_operand_a()), + glBlendFunc(get_blend_func(color_blend->get_operand_a()), get_blend_func(color_blend->get_operand_b())); if (_color_blend_involves_color_scale) { @@ -5215,7 +5215,7 @@ do_issue_blending() { enable_multisample_alpha_mask(false); enable_blend(true); _glBlendEquation(GL_FUNC_ADD); - GLP(BlendFunc)(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); return; case TransparencyAttrib::M_multisample: @@ -5244,7 +5244,7 @@ do_issue_blending() { enable_multisample_alpha_mask(false); enable_blend(true); _glBlendEquation(GL_FUNC_ADD); - GLP(BlendFunc)(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); return; } @@ -5295,15 +5295,15 @@ bind_light(PointLight *light_obj, const NodePath &light, int light_id) { // GL_SPOT_DIRECTION is not significant when cutoff == 180 // Exponent == 0 implies uniform light distribution - GLP(Lightf)(id, GL_SPOT_EXPONENT, 0.0f); + glLightf(id, GL_SPOT_EXPONENT, 0.0f); // Cutoff == 180 means uniform point light source - GLP(Lightf)(id, GL_SPOT_CUTOFF, 180.0f); + glLightf(id, GL_SPOT_CUTOFF, 180.0f); const LVecBase3 &att = light_obj->get_attenuation(); - GLP(Lightf)(id, GL_CONSTANT_ATTENUATION, att[0]); - GLP(Lightf)(id, GL_LINEAR_ATTENUATION, att[1]); - GLP(Lightf)(id, GL_QUADRATIC_ATTENUATION, att[2]); + glLightf(id, GL_CONSTANT_ATTENUATION, att[0]); + glLightf(id, GL_LINEAR_ATTENUATION, att[1]); + glLightf(id, GL_QUADRATIC_ATTENUATION, att[2]); report_my_gl_errors(); #endif @@ -5346,16 +5346,16 @@ bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) { // In this case, position x, y, z specifies direction // Exponent == 0 implies uniform light distribution - GLP(Lightf)(id, GL_SPOT_EXPONENT, 0.0f); + glLightf(id, GL_SPOT_EXPONENT, 0.0f); // Cutoff == 180 means uniform point light source - GLP(Lightf)(id, GL_SPOT_CUTOFF, 180.0f); + glLightf(id, GL_SPOT_CUTOFF, 180.0f); // Default attenuation values (only spotlight and point light can // modify these) - GLP(Lightf)(id, GL_CONSTANT_ATTENUATION, 1.0f); - GLP(Lightf)(id, GL_LINEAR_ATTENUATION, 0.0f); - GLP(Lightf)(id, GL_QUADRATIC_ATTENUATION, 0.0f); + glLightf(id, GL_CONSTANT_ATTENUATION, 1.0f); + glLightf(id, GL_LINEAR_ATTENUATION, 0.0f); + glLightf(id, GL_QUADRATIC_ATTENUATION, 0.0f); report_my_gl_errors(); #endif @@ -5395,13 +5395,13 @@ bind_light(Spotlight *light_obj, const NodePath &light, int light_id) { call_glLightfv(id, GL_POSITION, fpos); call_glLightfv(id, GL_SPOT_DIRECTION, dir); - GLP(Lightf)(id, GL_SPOT_EXPONENT, light_obj->get_exponent()); - GLP(Lightf)(id, GL_SPOT_CUTOFF, lens->get_hfov() * 0.5f); + glLightf(id, GL_SPOT_EXPONENT, light_obj->get_exponent()); + glLightf(id, GL_SPOT_CUTOFF, lens->get_hfov() * 0.5f); const LVecBase3 &att = light_obj->get_attenuation(); - GLP(Lightf)(id, GL_CONSTANT_ATTENUATION, att[0]); - GLP(Lightf)(id, GL_LINEAR_ATTENUATION, att[1]); - GLP(Lightf)(id, GL_QUADRATIC_ATTENUATION, att[2]); + glLightf(id, GL_CONSTANT_ATTENUATION, att[0]); + glLightf(id, GL_LINEAR_ATTENUATION, att[1]); + glLightf(id, GL_QUADRATIC_ATTENUATION, att[2]); report_my_gl_errors(); #endif @@ -5418,7 +5418,7 @@ void CLP(GraphicsStateGuardian):: draw_immediate_simple_primitives(const GeomPrimitivePipelineReader *reader, GLenum mode) { int num_vertices = reader->get_num_vertices(); _vertices_immediate_pcollector.add_level(num_vertices); - GLP(Begin)(mode); + glBegin(mode); if (reader->is_indexed()) { for (int v = 0; v < num_vertices; ++v) { @@ -5433,7 +5433,7 @@ draw_immediate_simple_primitives(const GeomPrimitivePipelineReader *reader, GLen } } - GLP(End)(); + glEnd(); } #endif // SUPPORT_IMMEDIATE_MODE @@ -5459,12 +5459,12 @@ draw_immediate_composite_primitives(const GeomPrimitivePipelineReader *reader, G for (ei = ends.begin(); ei != ends.end(); ++ei) { int end = (*ei); - GLP(Begin)(mode); + glBegin(mode); for (int v = begin; v < end; ++v) { _sender.set_vertex(reader->get_vertex(v)); _sender.issue_vertex(); } - GLP(End)(); + glEnd(); begin = end + num_unused_vertices_per_primitive; } @@ -5476,11 +5476,11 @@ draw_immediate_composite_primitives(const GeomPrimitivePipelineReader *reader, G for (ei = ends.begin(); ei != ends.end(); ++ei) { int end = (*ei); - GLP(Begin)(mode); + glBegin(mode); for (int v = begin; v < end; ++v) { _sender.issue_vertex(); } - GLP(End)(); + glEnd(); begin = end + num_unused_vertices_per_primitive; } @@ -5497,7 +5497,7 @@ void CLP(GraphicsStateGuardian):: gl_flush() const { PStatTimer timer(_flush_pcollector); if (_allow_flush) { - GLP(Flush)(); + glFlush(); } } @@ -5509,7 +5509,7 @@ gl_flush() const { GLenum CLP(GraphicsStateGuardian):: gl_get_error() const { if (_track_errors) { - return GLP(GetError)(); + return glGetError(); } else { return GL_NO_ERROR; } @@ -5532,7 +5532,7 @@ report_errors_loop(int line, const char *source_file, GLenum error_code, << "at " << line << " of " << source_file << " : " << get_error_string(error_code) << "\n"; - error_code = GLP(GetError)(); + error_code = glGetError(); error_count++; } @@ -5585,7 +5585,7 @@ string CLP(GraphicsStateGuardian):: show_gl_string(const string &name, GLenum id) { string result; - const GLubyte *text = GLP(GetString)(id); + const GLubyte *text = glGetString(id); if (text == (const GLubyte *)NULL) { if (GLCAT.is_debug()) { @@ -5616,7 +5616,7 @@ query_gl_version() { _gl_version_major = 0; _gl_version_minor = 0; - const GLubyte *text = GLP(GetString)(GL_VERSION); + const GLubyte *text = glGetString(GL_VERSION); if (text == (const GLubyte *)NULL) { GLCAT.debug() << "Unable to query GL_VERSION\n"; @@ -5662,7 +5662,7 @@ query_gl_version() { } #ifndef OPENGLES if (_gl_version_major==1) { - const char *extstr = (const char *) GLP(GetString)(GL_EXTENSIONS); + const char *extstr = (const char *) glGetString(GL_EXTENSIONS); if (extstr != NULL) { if (strstr( extstr, "GL_ARB_shading_language_100") != NULL) { @@ -5672,7 +5672,7 @@ query_gl_version() { } } else if (_gl_version_major >= 2) { - const char *verstr = (const char *) GLP(GetString)(GL_SHADING_LANGUAGE_VERSION); + const char *verstr = (const char *) glGetString(GL_SHADING_LANGUAGE_VERSION); if ((verstr == NULL) || (sscanf(verstr, "%d.%d", &_gl_shadlang_ver_major, &_gl_shadlang_ver_minor) != 2)) { GLCAT.warning() << "Invalid GL_SHADING_LANGUAGE_VERSION format.\n"; @@ -5761,7 +5761,7 @@ has_extension(const string &extension) const { // available. //////////////////////////////////////////////////////////////////// void *CLP(GraphicsStateGuardian):: -get_extension_func(const char *prefix, const char *name) { +get_extension_func(const char *name) { // First, look in the static-compiled namespace. If we were // compiled to expect at least a certain minimum runtime version of // OpenGL, then we can expect those extension functions to be @@ -5772,54 +5772,54 @@ get_extension_func(const char *prefix, const char *name) { void *fptr; } compiled_function_table[] = { #ifdef EXPECT_GL_VERSION_1_2 - { "BlendColor", (void *)&GLP(BlendColor) }, - { "BlendEquation", (void *)&GLP(BlendEquation) }, - { "DrawRangeElements", (void *)&GLP(DrawRangeElements) }, - { "TexImage3D", (void *)&GLP(TexImage3D) }, - { "TexSubImage3D", (void *)&GLP(TexSubImage3D) }, - { "CopyTexSubImage3D", (void *)&GLP(CopyTexSubImage3D) }, + { "glBlendColor", (void *)&glBlendColor }, + { "glBlendEquation", (void *)&glBlendEquation }, + { "glDrawRangeElements", (void *)&glDrawRangeElements }, + { "glTexImage3D", (void *)&glTexImage3D }, + { "glTexSubImage3D", (void *)&glTexSubImage3D }, + { "glCopyTexSubImage3D", (void *)&glCopyTexSubImage3D }, #endif #ifdef EXPECT_GL_VERSION_1_3 - { "ActiveTexture", (void *)&GLP(ActiveTexture) }, - { "ClientActiveTexture", (void *)&GLP(ClientActiveTexture) }, - { "CompressedTexImage1D", (void *)&GLP(CompressedTexImage1D) }, - { "CompressedTexImage2D", (void *)&GLP(CompressedTexImage2D) }, - { "CompressedTexImage3D", (void *)&GLP(CompressedTexImage3D) }, - { "CompressedTexSubImage1D", (void *)&GLP(CompressedTexSubImage1D) }, - { "CompressedTexSubImage2D", (void *)&GLP(CompressedTexSubImage2D) }, - { "CompressedTexSubImage3D", (void *)&GLP(CompressedTexSubImage3D) }, - { "GetCompressedTexImage", (void *)&GLP(GetCompressedTexImage) }, - { "MultiTexCoord1f", (void *)&GLP(MultiTexCoord1f) }, - { "MultiTexCoord2", (void *)&GLP(MultiTexCoord2) }, - { "MultiTexCoord3", (void *)&GLP(MultiTexCoord3) }, - { "MultiTexCoord4", (void *)&GLP(MultiTexCoord4) }, + { "glActiveTexture", (void *)&glActiveTexture }, + { "glClientActiveTexture", (void *)&glClientActiveTexture }, + { "glCompressedTexImage1D", (void *)&glCompressedTexImage1D }, + { "glCompressedTexImage2D", (void *)&glCompressedTexImage2D }, + { "glCompressedTexImage3D", (void *)&glCompressedTexImage3D }, + { "glCompressedTexSubImage1D", (void *)&glCompressedTexSubImage1D }, + { "glCompressedTexSubImage2D", (void *)&glCompressedTexSubImage2D }, + { "glCompressedTexSubImage3D", (void *)&glCompressedTexSubImage3D }, + { "glGetCompressedTexImage", (void *)&glGetCompressedTexImage }, + { "glMultiTexCoord1f", (void *)&glMultiTexCoord1f }, + { "glMultiTexCoord2", (void *)&glMultiTexCoord2 }, + { "glMultiTexCoord3", (void *)&glMultiTexCoord3 }, + { "glMultiTexCoord4", (void *)&glMultiTexCoord4 }, #endif #ifdef EXPECT_GL_VERSION_1_4 - { "PointParameterfv", (void *)&GLP(PointParameterfv) }, + { "glPointParameterfv", (void *)&glPointParameterfv }, #endif #ifdef EXPECT_GL_VERSION_1_5 - { "BeginQuery", (void *)&GLP(BeginQuery) }, - { "BindBuffer", (void *)&GLP(BindBuffer) }, - { "BufferData", (void *)&GLP(BufferData) }, - { "BufferSubData", (void *)&GLP(BufferSubData) }, - { "DeleteBuffers", (void *)&GLP(DeleteBuffers) }, - { "DeleteQueries", (void *)&GLP(DeleteQueries) }, - { "EndQuery", (void *)&GLP(EndQuery) }, - { "GenBuffers", (void *)&GLP(GenBuffers) }, - { "GenQueries", (void *)&GLP(GenQueries) }, - { "GetQueryObjectuiv", (void *)&GLP(GetQueryObjectuiv) }, - { "GetQueryiv", (void *)&GLP(GetQueryiv) }, + { "glBeginQuery", (void *)&glBeginQuery }, + { "glBindBuffer", (void *)&glBindBuffer }, + { "glBufferData", (void *)&glBufferData }, + { "glBufferSubData", (void *)&glBufferSubData }, + { "glDeleteBuffers", (void *)&glDeleteBuffers }, + { "glDeleteQueries", (void *)&glDeleteQueries }, + { "glEndQuery", (void *)&glEndQuery }, + { "glGenBuffers", (void *)&glGenBuffers }, + { "glGenQueries", (void *)&glGenQueries }, + { "glGetQueryObjectuiv", (void *)&glGetQueryObjectuiv }, + { "glGetQueryiv", (void *)&glGetQueryiv }, #endif #ifdef OPENGLES - { "ActiveTexture", (void *)&GLP(ActiveTexture) }, + { "glActiveTexture", (void *)&glActiveTexture }, #ifndef OPENGLES_2 - { "ClientActiveTexture", (void *)&GLP(ClientActiveTexture) }, + { "glClientActiveTexture", (void *)&glClientActiveTexture }, #endif - { "BindBuffer", (void *)&GLP(BindBuffer) }, - { "BufferData", (void *)&GLP(BufferData) }, - { "BufferSubData", (void *)&GLP(BufferSubData) }, - { "DeleteBuffers", (void *)&GLP(DeleteBuffers) }, - { "GenBuffers", (void *)&GLP(GenBuffers) }, + { "glBindBuffer", (void *)&glBindBuffer }, + { "glBufferData", (void *)&glBufferData }, + { "glBufferSubData", (void *)&glBufferSubData }, + { "glDeleteBuffers", (void *)&glDeleteBuffers }, + { "glGenBuffers", (void *)&glGenBuffers }, #endif { NULL, NULL } }; @@ -5834,7 +5834,7 @@ get_extension_func(const char *prefix, const char *name) { // If the extension function wasn't compiled in, then go get it from // the runtime. There's a different interface for each API. - return do_get_extension_func(prefix, name); + return do_get_extension_func(name); } //////////////////////////////////////////////////////////////////// @@ -5848,15 +5848,14 @@ get_extension_func(const char *prefix, const char *name) { // not available. //////////////////////////////////////////////////////////////////// void *CLP(GraphicsStateGuardian):: -do_get_extension_func(const char *, const char *) { +do_get_extension_func(const char *) { return NULL; } - //////////////////////////////////////////////////////////////////// // Function: GLGraphicsStateGuardian::set_draw_buffer // Access: Protected -// Description: Sets up the GLP(DrawBuffer) to render into the buffer +// Description: Sets up the glDrawBuffer to render into the buffer // indicated by the RenderBuffer object. This only sets // up the color and aux bits; it does not affect the depth, // stencil, accum layers. @@ -5905,39 +5904,39 @@ set_draw_buffer(int rbtype) { switch (rbtype & RenderBuffer::T_color) { case RenderBuffer::T_front: - GLP(DrawBuffer)(GL_FRONT); + glDrawBuffer(GL_FRONT); break; case RenderBuffer::T_back: - GLP(DrawBuffer)(GL_BACK); + glDrawBuffer(GL_BACK); break; case RenderBuffer::T_right: - GLP(DrawBuffer)(GL_RIGHT); + glDrawBuffer(GL_RIGHT); break; case RenderBuffer::T_left: - GLP(DrawBuffer)(GL_LEFT); + glDrawBuffer(GL_LEFT); break; case RenderBuffer::T_front_right: nassertv(_current_properties->is_stereo()); - GLP(DrawBuffer)(GL_FRONT_RIGHT); + glDrawBuffer(GL_FRONT_RIGHT); break; case RenderBuffer::T_front_left: nassertv(_current_properties->is_stereo()); - GLP(DrawBuffer)(GL_FRONT_LEFT); + glDrawBuffer(GL_FRONT_LEFT); break; case RenderBuffer::T_back_right: nassertv(_current_properties->is_stereo()); - GLP(DrawBuffer)(GL_BACK_RIGHT); + glDrawBuffer(GL_BACK_RIGHT); break; case RenderBuffer::T_back_left: nassertv(_current_properties->is_stereo()); - GLP(DrawBuffer)(GL_BACK_LEFT); + glDrawBuffer(GL_BACK_LEFT); break; default: @@ -5948,10 +5947,10 @@ set_draw_buffer(int rbtype) { // Also ensure that any global color channels are masked out. if (CLP(color_mask)) { - GLP(ColorMask)((_color_write_mask & ColorWriteAttrib::C_red) != 0, - (_color_write_mask & ColorWriteAttrib::C_green) != 0, - (_color_write_mask & ColorWriteAttrib::C_blue) != 0, - (_color_write_mask & ColorWriteAttrib::C_alpha) != 0); + glColorMask((_color_write_mask & ColorWriteAttrib::C_red) != 0, + (_color_write_mask & ColorWriteAttrib::C_green) != 0, + (_color_write_mask & ColorWriteAttrib::C_blue) != 0, + (_color_write_mask & ColorWriteAttrib::C_alpha) != 0); } report_my_gl_errors(); @@ -5960,7 +5959,7 @@ set_draw_buffer(int rbtype) { //////////////////////////////////////////////////////////////////// // Function: GLGraphicsStateGuardian::set_read_buffer // Access: Protected -// Description: Sets up the GLP(ReadBuffer) to render into the buffer +// Description: Sets up the glReadBuffer to render into the buffer // indicated by the RenderBuffer object. This only sets // up the color bits; it does not affect the depth, // stencil, accum layers. @@ -6000,41 +5999,41 @@ set_read_buffer(int rbtype) { } ++index; } - GLP(ReadBuffer)(buffer); + glReadBuffer(buffer); } else { switch (rbtype & RenderBuffer::T_color) { case RenderBuffer::T_front: - GLP(ReadBuffer)(GL_FRONT); + glReadBuffer(GL_FRONT); break; case RenderBuffer::T_back: - GLP(ReadBuffer)(GL_BACK); + glReadBuffer(GL_BACK); break; case RenderBuffer::T_right: - GLP(ReadBuffer)(GL_RIGHT); + glReadBuffer(GL_RIGHT); break; case RenderBuffer::T_left: - GLP(ReadBuffer)(GL_LEFT); + glReadBuffer(GL_LEFT); break; case RenderBuffer::T_front_right: - GLP(ReadBuffer)(GL_FRONT_RIGHT); + glReadBuffer(GL_FRONT_RIGHT); break; case RenderBuffer::T_front_left: - GLP(ReadBuffer)(GL_FRONT_LEFT); + glReadBuffer(GL_FRONT_LEFT); break; case RenderBuffer::T_back_right: - GLP(ReadBuffer)(GL_BACK_RIGHT); + glReadBuffer(GL_BACK_RIGHT); break; case RenderBuffer::T_back_left: - GLP(ReadBuffer)(GL_BACK_LEFT); + glReadBuffer(GL_BACK_LEFT); break; default: @@ -7171,49 +7170,49 @@ print_gfx_visual() { cout << "Graphics Visual Info (# bits of each):" << endl; cout << "RGBA: "; - GLP(GetIntegerv)( GL_RED_BITS, &i ); cout << i << " "; - GLP(GetIntegerv)( GL_GREEN_BITS, &i ); cout << i << " "; - GLP(GetIntegerv)( GL_BLUE_BITS, &i ); cout << i << " "; - GLP(GetIntegerv)( GL_ALPHA_BITS, &i ); cout << i << endl; + glGetIntegerv( GL_RED_BITS, &i ); cout << i << " "; + glGetIntegerv( GL_GREEN_BITS, &i ); cout << i << " "; + glGetIntegerv( GL_BLUE_BITS, &i ); cout << i << " "; + glGetIntegerv( GL_ALPHA_BITS, &i ); cout << i << endl; #ifndef OPENGLES cout << "Accum RGBA: "; - GLP(GetIntegerv)( GL_ACCUM_RED_BITS, &i ); cout << i << " "; - GLP(GetIntegerv)( GL_ACCUM_GREEN_BITS, &i ); cout << i << " "; - GLP(GetIntegerv)( GL_ACCUM_BLUE_BITS, &i ); cout << i << " "; - GLP(GetIntegerv)( GL_ACCUM_ALPHA_BITS, &i ); cout << i << endl; + glGetIntegerv( GL_ACCUM_RED_BITS, &i ); cout << i << " "; + glGetIntegerv( GL_ACCUM_GREEN_BITS, &i ); cout << i << " "; + glGetIntegerv( GL_ACCUM_BLUE_BITS, &i ); cout << i << " "; + glGetIntegerv( GL_ACCUM_ALPHA_BITS, &i ); cout << i << endl; - GLP(GetIntegerv)( GL_INDEX_BITS, &i ); cout << "Color Index: " << i << endl; + glGetIntegerv( GL_INDEX_BITS, &i ); cout << "Color Index: " << i << endl; #endif - GLP(GetIntegerv)( GL_DEPTH_BITS, &i ); cout << "Depth: " << i << endl; - GLP(GetIntegerv)( GL_ALPHA_BITS, &i ); cout << "Alpha: " << i << endl; - GLP(GetIntegerv)( GL_STENCIL_BITS, &i ); cout << "Stencil: " << i << endl; + glGetIntegerv( GL_DEPTH_BITS, &i ); cout << "Depth: " << i << endl; + glGetIntegerv( GL_ALPHA_BITS, &i ); cout << "Alpha: " << i << endl; + glGetIntegerv( GL_STENCIL_BITS, &i ); cout << "Stencil: " << i << endl; #ifndef OPENGLES - GLP(GetBooleanv)( GL_DOUBLEBUFFER, &j ); cout << "DoubleBuffer? " + glGetBooleanv( GL_DOUBLEBUFFER, &j ); cout << "DoubleBuffer? " << (int)j << endl; - GLP(GetBooleanv)( GL_STEREO, &j ); cout << "Stereo? " << (int)j << endl; + glGetBooleanv( GL_STEREO, &j ); cout << "Stereo? " << (int)j << endl; #endif if (_supports_multisample) { #ifndef OPENGLES_2 - GLP(GetBooleanv)( GL_MULTISAMPLE, &j ); cout << "Multisample? " << (int)j << endl; + glGetBooleanv( GL_MULTISAMPLE, &j ); cout << "Multisample? " << (int)j << endl; #endif - GLP(GetIntegerv)( GL_SAMPLES, &i ); cout << "Samples: " << i << endl; + glGetIntegerv( GL_SAMPLES, &i ); cout << "Samples: " << i << endl; } - GLP(GetBooleanv)( GL_BLEND, &j ); cout << "Blend? " << (int)j << endl; + glGetBooleanv( GL_BLEND, &j ); cout << "Blend? " << (int)j << endl; #ifndef OPENGLES_2 - GLP(GetBooleanv)( GL_POINT_SMOOTH, &j ); cout << "Point Smooth? " + glGetBooleanv( GL_POINT_SMOOTH, &j ); cout << "Point Smooth? " << (int)j << endl; - GLP(GetBooleanv)( GL_LINE_SMOOTH, &j ); cout << "Line Smooth? " + glGetBooleanv( GL_LINE_SMOOTH, &j ); cout << "Line Smooth? " << (int)j << endl; #endif #ifndef OPENGLES - GLP(GetIntegerv)( GL_AUX_BUFFERS, &i ); cout << "Aux Buffers: " << i << endl; + glGetIntegerv( GL_AUX_BUFFERS, &i ); cout << "Aux Buffers: " << i << endl; #endif } @@ -7274,9 +7273,9 @@ enable_lighting(bool enable) { // PStatTimer timer(_draw_set_state_light_enable_lighting_pcollector); if (enable) { - GLP(Enable)(GL_LIGHTING); + glEnable(GL_LIGHTING); } else { - GLP(Disable)(GL_LIGHTING); + glDisable(GL_LIGHTING); } #endif } @@ -7317,9 +7316,9 @@ enable_light(int light_id, bool enable) { // PStatTimer timer(_draw_set_state_light_enable_light_pcollector); if (enable) { - GLP(Enable)(get_light_id(light_id)); + glEnable(get_light_id(light_id)); } else { - GLP(Disable)(get_light_id(light_id)); + glDisable(get_light_id(light_id)); } } @@ -7351,8 +7350,8 @@ begin_bind_lights() { CPT(TransformState) render_transform = _cs_transform->compose(_scene_setup->get_world_transform()); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PushMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); GLPf(LoadMatrix)(render_transform->get_mat().get_data()); #endif } @@ -7372,8 +7371,8 @@ end_bind_lights() { // static PStatCollector _draw_set_state_light_end_bind_pcollector("Draw:Set State:Light:End bind"); // PStatTimer timer(_draw_set_state_light_end_bind_pcollector); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PopMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); #endif } @@ -7388,9 +7387,9 @@ end_bind_lights() { void CLP(GraphicsStateGuardian):: enable_clip_plane(int plane_id, bool enable) { if (enable) { - GLP(Enable)(get_clip_plane_id(plane_id)); + glEnable(get_clip_plane_id(plane_id)); } else { - GLP(Disable)(get_clip_plane_id(plane_id)); + glDisable(get_clip_plane_id(plane_id)); } } @@ -7419,8 +7418,8 @@ begin_bind_clip_planes() { CPT(TransformState) render_transform = _cs_transform->compose(_scene_setup->get_world_transform()); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PushMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); GLPf(LoadMatrix)(render_transform->get_mat().get_data()); #endif } @@ -7446,11 +7445,11 @@ bind_clip_plane(const NodePath &plane, int plane_id) { #ifdef OPENGLES // OpenGL ES uses a single-precision call. LPlanef single_plane(LCAST(float, xformed_plane)); - GLP(ClipPlanef)(id, single_plane.get_data()); + glClipPlanef(id, single_plane.get_data()); #else // Mainline OpenGL uses a double-precision call. LPlaned double_plane(LCAST(double, xformed_plane)); - GLP(ClipPlane)(id, double_plane.get_data()); + glClipPlane(id, double_plane.get_data()); #endif // OPENGLES #endif // OPENGLES_2 @@ -7469,8 +7468,8 @@ bind_clip_plane(const NodePath &plane, int plane_id) { void CLP(GraphicsStateGuardian):: end_bind_clip_planes() { #ifndef OPENGLES_2 - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PopMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); #endif } @@ -7795,12 +7794,12 @@ do_auto_rescale_normal() { #ifndef OPENGLES_2 if (_internal_transform->has_identity_scale()) { // If there's no scale at all, don't do anything. - GLP(Disable)(GL_NORMALIZE); + glDisable(GL_NORMALIZE); if (GLCAT.is_spam()) { GLCAT.spam() << "glDisable(GL_NORMALIZE)\n"; } if (_supports_rescale_normal && support_rescale_normal) { - GLP(Disable)(GL_RESCALE_NORMAL); + glDisable(GL_RESCALE_NORMAL); if (GLCAT.is_spam()) { GLCAT.spam() << "glDisable(GL_RESCALE_NORMAL)\n"; } @@ -7809,14 +7808,14 @@ do_auto_rescale_normal() { } else if (_internal_transform->has_uniform_scale()) { // There's a uniform scale; use the rescale feature if available. if (_supports_rescale_normal && support_rescale_normal) { - GLP(Enable)(GL_RESCALE_NORMAL); - GLP(Disable)(GL_NORMALIZE); + glEnable(GL_RESCALE_NORMAL); + glDisable(GL_NORMALIZE); if (GLCAT.is_spam()) { GLCAT.spam() << "glEnable(GL_RESCALE_NORMAL)\n"; GLCAT.spam() << "glDisable(GL_NORMALIZE)\n"; } } else { - GLP(Enable)(GL_NORMALIZE); + glEnable(GL_NORMALIZE); if (GLCAT.is_spam()) { GLCAT.spam() << "glEnable(GL_NORMALIZE)\n"; } @@ -7824,12 +7823,12 @@ do_auto_rescale_normal() { } else { // If there's a non-uniform scale, normalize everything. - GLP(Enable)(GL_NORMALIZE); + glEnable(GL_NORMALIZE); if (GLCAT.is_spam()) { GLCAT.spam() << "glEnable(GL_NORMALIZE)\n"; } if (_supports_rescale_normal && support_rescale_normal) { - GLP(Disable)(GL_RESCALE_NORMAL); + glDisable(GL_RESCALE_NORMAL); if (GLCAT.is_spam()) { GLCAT.spam() << "glDisable(GL_RESCALE_NORMAL)\n"; } @@ -7936,16 +7935,16 @@ update_standard_texture_bindings() { // First, turn off the previous texture mode. #ifndef OPENGLES_2 #ifndef OPENGLES - GLP(Disable)(GL_TEXTURE_1D); + glDisable(GL_TEXTURE_1D); #endif // OPENGLES - GLP(Disable)(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); if (_supports_3d_texture) { #ifndef OPENGLES_1 - GLP(Disable)(GL_TEXTURE_3D); + glDisable(GL_TEXTURE_3D); #endif // OPENGLES_1 } if (_supports_cube_map) { - GLP(Disable)(GL_TEXTURE_CUBE_MAP); + glDisable(GL_TEXTURE_CUBE_MAP); } #endif // OPENGLES_2 @@ -7969,12 +7968,12 @@ update_standard_texture_bindings() { continue; } #endif - GLP(Enable)(target); + glEnable(target); #endif if (!update_texture(tc, false)) { #ifndef OPENGLES_2 - GLP(Disable)(target); + glDisable(target); #endif continue; } @@ -7996,88 +7995,88 @@ update_standard_texture_bindings() { // Make a special case for 1- and 2-channel decal textures. // OpenGL does not define their use with GL_DECAL for some // reason, so implement them using the combiner instead. - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_RGB_SCALE, 1); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_TEXTURE); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE); + glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE, 1); + glTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1); + glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE); + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); + glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS); + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR); + glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, GL_TEXTURE); + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA); } else { // Normal 3- and 4-channel decal textures. - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); } } else if (stage->get_mode() == TextureStage::M_combine) { if (!_supports_texture_combine) { GLCAT.warning() << "TextureStage::M_combine mode is not supported.\n"; - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); } else { - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_RGB_SCALE, stage->get_rgb_scale()); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_ALPHA_SCALE, stage->get_alpha_scale()); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_COMBINE_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE); + glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE, stage->get_rgb_scale()); + glTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, stage->get_alpha_scale()); + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, get_texture_combine_type(stage->get_combine_rgb_mode())); switch (stage->get_num_combine_rgb_operands()) { case 3: - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC2_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_RGB, get_texture_src_type(stage->get_combine_rgb_source2(), last_stage, last_saved_result, i)); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND2_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB, get_texture_operand_type(stage->get_combine_rgb_operand2())); // fall through case 2: - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC1_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_RGB, get_texture_src_type(stage->get_combine_rgb_source1(), last_stage, last_saved_result, i)); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND1_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB, get_texture_operand_type(stage->get_combine_rgb_operand1())); // fall through case 1: - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC0_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_RGB, get_texture_src_type(stage->get_combine_rgb_source0(), last_stage, last_saved_result, i)); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND0_RGB, + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB, get_texture_operand_type(stage->get_combine_rgb_operand0())); // fall through default: break; } - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, get_texture_combine_type(stage->get_combine_alpha_mode())); switch (stage->get_num_combine_alpha_operands()) { case 3: - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC2_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_SRC2_ALPHA, get_texture_src_type(stage->get_combine_alpha_source2(), last_stage, last_saved_result, i)); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, get_texture_operand_type(stage->get_combine_alpha_operand2())); // fall through case 2: - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC1_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_SRC1_ALPHA, get_texture_src_type(stage->get_combine_alpha_source1(), last_stage, last_saved_result, i)); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, get_texture_operand_type(stage->get_combine_alpha_operand1())); // fall through case 1: - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_SRC0_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_SRC0_ALPHA, get_texture_src_type(stage->get_combine_alpha_source0(), last_stage, last_saved_result, i)); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, + glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, get_texture_operand_type(stage->get_combine_alpha_operand0())); // fall through @@ -8087,7 +8086,7 @@ update_standard_texture_bindings() { } } else { GLint glmode = get_texture_apply_mode_type(stage->get_mode()); - GLP(TexEnvi)(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, glmode); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, glmode); } if (stage->get_saved_result()) { @@ -8106,16 +8105,16 @@ update_standard_texture_bindings() { for (i = num_stages; i < _num_active_texture_stages; i++) { _glActiveTexture(GL_TEXTURE0 + i); #ifndef OPENGLES - GLP(Disable)(GL_TEXTURE_1D); + glDisable(GL_TEXTURE_1D); #endif // OPENGLES - GLP(Disable)(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); if (_supports_3d_texture) { #ifndef OPENGLES_1 - GLP(Disable)(GL_TEXTURE_3D); + glDisable(GL_TEXTURE_3D); #endif // OPENGLES_1 } if (_supports_cube_map) { - GLP(Disable)(GL_TEXTURE_CUBE_MAP); + glDisable(GL_TEXTURE_CUBE_MAP); } } #endif // OPENGLES_2 @@ -8174,16 +8173,16 @@ update_show_usage_texture_bindings(int show_stage_index) { for (i = 0; i < _num_active_texture_stages; i++) { _glActiveTexture(GL_TEXTURE0 + i); #ifndef OPENGLES - GLP(Disable)(GL_TEXTURE_1D); + glDisable(GL_TEXTURE_1D); #endif // OPENGLES - GLP(Disable)(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); if (_supports_3d_texture) { #ifndef OPENGLES_1 - GLP(Disable)(GL_TEXTURE_3D); + glDisable(GL_TEXTURE_3D); #endif // OPENGLES_1 } if (_supports_cube_map) { - GLP(Disable)(GL_TEXTURE_CUBE_MAP); + glDisable(GL_TEXTURE_CUBE_MAP); } } #endif @@ -8206,7 +8205,7 @@ update_show_usage_texture_bindings(int show_stage_index) { // Choose the corresponding usage texture and apply it. _glActiveTexture(GL_TEXTURE0 + i); #ifndef OPENGLES_2 - GLP(Enable)(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); #endif UsageTextureKey key(texture->get_x_size(), texture->get_y_size()); @@ -8214,15 +8213,15 @@ update_show_usage_texture_bindings(int show_stage_index) { if (ui == _usage_textures.end()) { // Need to create a new texture for this size. GLuint index; - GLP(GenTextures)(1, &index); - GLP(BindTexture)(GL_TEXTURE_2D, index); + glGenTextures(1, &index); + glBindTexture(GL_TEXTURE_2D, index); upload_usage_texture(texture->get_x_size(), texture->get_y_size()); _usage_textures[key] = index; } else { // Just bind the previously-created texture. GLuint index = (*ui).second; - GLP(BindTexture)(GL_TEXTURE_2D, index); + glBindTexture(GL_TEXTURE_2D, index); } } @@ -8240,10 +8239,10 @@ update_show_usage_texture_bindings(int show_stage_index) { //////////////////////////////////////////////////////////////////// void CLP(GraphicsStateGuardian):: upload_usage_texture(int width, int height) { - GLP(TexParameteri)(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - GLP(TexParameteri)(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - GLP(TexParameteri)(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); - GLP(TexParameteri)(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); if (GLCAT.is_debug()) { GLCAT.debug() @@ -8286,7 +8285,7 @@ upload_usage_texture(int width, int height) { buffer[p] = store.w; } - GLP(TexImage2D)(GL_TEXTURE_2D, n, GL_RGBA, width, height, 0, + glTexImage2D(GL_TEXTURE_2D, n, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer); if (width == 1 && height == 1) { // That was the last mipmap level. @@ -8314,16 +8313,16 @@ disable_standard_texture_bindings() { for (int i = 0; i < _num_active_texture_stages; i++) { _glActiveTexture(GL_TEXTURE0 + i); #ifndef OPENGLES - GLP(Disable)(GL_TEXTURE_1D); + glDisable(GL_TEXTURE_1D); #endif // OPENGLES - GLP(Disable)(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_2D); if (_supports_3d_texture) { #ifndef OPENGLES_1 - GLP(Disable)(GL_TEXTURE_3D); + glDisable(GL_TEXTURE_3D); #endif // OPENGLES_1 } if (_supports_cube_map) { - GLP(Disable)(GL_TEXTURE_CUBE_MAP); + glDisable(GL_TEXTURE_CUBE_MAP); } } @@ -8347,13 +8346,13 @@ do_issue_tex_matrix() { TextureStage *stage = _target_texture->get_on_ff_stage(i); _glActiveTexture(GL_TEXTURE0 + i); - GLP(MatrixMode)(GL_TEXTURE); + glMatrixMode(GL_TEXTURE); const TexMatrixAttrib *target_tex_matrix = DCAST(TexMatrixAttrib, _target_rs->get_attrib_def(TexMatrixAttrib::get_class_slot())); if (target_tex_matrix->has_stage(stage)) { GLPf(LoadMatrix)(target_tex_matrix->get_mat(stage).get_data()); } else { - GLP(LoadIdentity)(); + glLoadIdentity(); // For some reason, the glLoadIdentity() call doesn't work on // my Dell laptop's IBM OpenGL driver, when used in @@ -8399,18 +8398,18 @@ do_issue_tex_gen() { #ifndef OPENGLES_2 if (_supports_point_sprite) { #ifdef OPENGLES - GLP(TexEnvi)(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_FALSE); + glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_FALSE); #else - GLP(TexEnvi)(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_FALSE); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_FALSE); #endif // OPENGLES } #endif // OPENGLES_2 #ifndef OPENGLES // TexGen not supported by OpenGL ES. - GLP(Disable)(GL_TEXTURE_GEN_S); - GLP(Disable)(GL_TEXTURE_GEN_T); - GLP(Disable)(GL_TEXTURE_GEN_R); - GLP(Disable)(GL_TEXTURE_GEN_Q); + glDisable(GL_TEXTURE_GEN_S); + glDisable(GL_TEXTURE_GEN_T); + glDisable(GL_TEXTURE_GEN_R); + glDisable(GL_TEXTURE_GEN_Q); TexGenAttrib::Mode mode = _target_tex_gen->get_mode(stage); switch (mode) { @@ -8419,10 +8418,10 @@ do_issue_tex_gen() { break; case TexGenAttrib::M_eye_sphere_map: - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); force_normal = true; break; @@ -8433,19 +8432,19 @@ do_issue_tex_gen() { // by composing a transform onto the texture matrix. LMatrix4 mat = _inv_cs_transform->get_mat(); mat.set_row(3, LVecBase3(0.0f, 0.0f, 0.0f)); - GLP(MatrixMode)(GL_TEXTURE); + glMatrixMode(GL_TEXTURE); GLPf(MultMatrix)(mat.get_data()); // Now we need to reset the texture matrix next time // around to undo this. _tex_gen_modifies_mat = true; - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); force_normal = true; } break; @@ -8462,19 +8461,19 @@ do_issue_tex_gen() { LMatrix4 mat = camera_transform->get_mat(); mat.set_row(3, LVecBase3(0.0f, 0.0f, 0.0f)); - GLP(MatrixMode)(GL_TEXTURE); + glMatrixMode(GL_TEXTURE); GLPf(MultMatrix)(mat.get_data()); // Now we need to reset the texture matrix next time // around to undo this. _tex_gen_modifies_mat = true; - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); force_normal = true; } break; @@ -8486,19 +8485,19 @@ do_issue_tex_gen() { // by composing a transform onto the texture matrix. LMatrix4 mat = _inv_cs_transform->get_mat(); mat.set_row(3, LVecBase3(0.0f, 0.0f, 0.0f)); - GLP(MatrixMode)(GL_TEXTURE); + glMatrixMode(GL_TEXTURE); GLPf(MultMatrix)(mat.get_data()); // Now we need to reset the texture matrix next time // around to undo this. _tex_gen_modifies_mat = true; - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); force_normal = true; } break; @@ -8515,19 +8514,19 @@ do_issue_tex_gen() { LMatrix4 mat = camera_transform->get_mat(); mat.set_row(3, LVecBase3(0.0f, 0.0f, 0.0f)); - GLP(MatrixMode)(GL_TEXTURE); + glMatrixMode(GL_TEXTURE); GLPf(MultMatrix)(mat.get_data()); // Now we need to reset the texture matrix next time // around to undo this. _tex_gen_modifies_mat = true; - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); force_normal = true; } break; @@ -8535,27 +8534,27 @@ do_issue_tex_gen() { case TexGenAttrib::M_eye_position: // To represent eye position correctly, we need to temporarily // load the coordinate-system transform. - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PushMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); GLPf(LoadMatrix)(_cs_transform->get_mat().get_data()); - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - GLP(TexGeni)(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); GLPfv(TexGen)(GL_S, GL_EYE_PLANE, s_data); GLPfv(TexGen)(GL_T, GL_EYE_PLANE, t_data); GLPfv(TexGen)(GL_R, GL_EYE_PLANE, r_data); GLPfv(TexGen)(GL_Q, GL_EYE_PLANE, q_data); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); - GLP(Enable)(GL_TEXTURE_GEN_Q); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); + glEnable(GL_TEXTURE_GEN_Q); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PopMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); break; case TexGenAttrib::M_world_position: @@ -8563,36 +8562,36 @@ do_issue_tex_gen() { // position mode, and loading the transform of the root // node--thus putting the "eye" at the root. { - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PushMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); CPT(TransformState) root_transform = _cs_transform->compose(_scene_setup->get_world_transform()); GLPf(LoadMatrix)(root_transform->get_mat().get_data()); - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); - GLP(TexGeni)(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); + glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR); GLPfv(TexGen)(GL_S, GL_EYE_PLANE, s_data); GLPfv(TexGen)(GL_T, GL_EYE_PLANE, t_data); GLPfv(TexGen)(GL_R, GL_EYE_PLANE, r_data); GLPfv(TexGen)(GL_Q, GL_EYE_PLANE, q_data); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); - GLP(Enable)(GL_TEXTURE_GEN_Q); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); + glEnable(GL_TEXTURE_GEN_Q); - GLP(MatrixMode)(GL_MODELVIEW); - GLP(PopMatrix)(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); } break; case TexGenAttrib::M_point_sprite: if (_supports_point_sprite) { #ifdef OPENGLES - GLP(TexEnvi)(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_TRUE); + glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, GL_TRUE); #else - GLP(TexEnvi)(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); #endif got_point_sprites = true; } @@ -8606,10 +8605,10 @@ do_issue_tex_gen() { { const LTexCoord3 &v = _target_tex_gen->get_constant_value(stage); - GLP(TexGeni)(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); - GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); - GLP(TexGeni)(GL_R, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); - GLP(TexGeni)(GL_Q, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); LVecBase4 s(0.0f, 0.0f, 0.0f, v[0]); LVecBase4 t(0.0f, 0.0f, 0.0f, v[1]); @@ -8620,10 +8619,10 @@ do_issue_tex_gen() { GLPfv(TexGen)(GL_R, GL_OBJECT_PLANE, r.get_data()); GLPfv(TexGen)(GL_Q, GL_OBJECT_PLANE, q_data); - GLP(Enable)(GL_TEXTURE_GEN_S); - GLP(Enable)(GL_TEXTURE_GEN_T); - GLP(Enable)(GL_TEXTURE_GEN_R); - GLP(Enable)(GL_TEXTURE_GEN_Q); + glEnable(GL_TEXTURE_GEN_S); + glEnable(GL_TEXTURE_GEN_T); + glEnable(GL_TEXTURE_GEN_R); + glEnable(GL_TEXTURE_GEN_Q); } break; @@ -8638,15 +8637,15 @@ do_issue_tex_gen() { #ifndef OPENGLES_2 #ifdef OPENGLES if (_tex_gen_point_sprite) { - GLP(Enable)(GL_POINT_SPRITE_OES); + glEnable(GL_POINT_SPRITE_OES); } else { - GLP(Disable)(GL_POINT_SPRITE_OES); + glDisable(GL_POINT_SPRITE_OES); } #else if (_tex_gen_point_sprite) { - GLP(Enable)(GL_POINT_SPRITE_ARB); + glEnable(GL_POINT_SPRITE_ARB); } else { - GLP(Disable)(GL_POINT_SPRITE_ARB); + glDisable(GL_POINT_SPRITE_ARB); } #endif // OPENGLES #endif // OPENGLES_2 @@ -8671,23 +8670,23 @@ specify_texture(CLP(TextureContext) *gtc) { return false; } - GLP(TexParameteri)(target, GL_TEXTURE_WRAP_S, + glTexParameteri(target, GL_TEXTURE_WRAP_S, get_texture_wrap_mode(tex->get_wrap_u())); #ifndef OPENGLES if (target != GL_TEXTURE_1D) { - GLP(TexParameteri)(target, GL_TEXTURE_WRAP_T, + glTexParameteri(target, GL_TEXTURE_WRAP_T, get_texture_wrap_mode(tex->get_wrap_v())); } #endif #ifdef OPENGLES_2 if (target == GL_TEXTURE_3D_OES) { - GLP(TexParameteri)(target, GL_TEXTURE_WRAP_R_OES, + glTexParameteri(target, GL_TEXTURE_WRAP_R_OES, get_texture_wrap_mode(tex->get_wrap_w())); } #endif #ifndef OPENGLES if (target == GL_TEXTURE_3D) { - GLP(TexParameteri)(target, GL_TEXTURE_WRAP_R, + glTexParameteri(target, GL_TEXTURE_WRAP_R, get_texture_wrap_mode(tex->get_wrap_w())); } @@ -8713,7 +8712,7 @@ specify_texture(CLP(TextureContext) *gtc) { // enable GL-generated mipmaps here if we can. if (_supports_generate_mipmap) { #ifndef OPENGLES_2 - GLP(TexParameteri)(target, GL_GENERATE_MIPMAP, uses_mipmaps); + glTexParameteri(target, GL_GENERATE_MIPMAP, uses_mipmaps); #endif } else { // Otherwise, don't try to use mipmaps. @@ -8721,9 +8720,9 @@ specify_texture(CLP(TextureContext) *gtc) { } } - GLP(TexParameteri)(target, GL_TEXTURE_MIN_FILTER, + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, get_texture_filter_type(minfilter, !uses_mipmaps)); - GLP(TexParameteri)(target, GL_TEXTURE_MAG_FILTER, + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, get_texture_filter_type(magfilter, true)); // Set anisotropic filtering. @@ -8731,7 +8730,7 @@ specify_texture(CLP(TextureContext) *gtc) { PN_stdfloat anisotropy = tex->get_effective_anisotropic_degree(); anisotropy = min(anisotropy, _max_anisotropy); anisotropy = max(anisotropy, (PN_stdfloat)1.0); - GLP(TexParameterf)(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy); + glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy); } #ifndef OPENGLES @@ -8740,15 +8739,15 @@ specify_texture(CLP(TextureContext) *gtc) { tex->get_format() == Texture::F_depth_component16 || tex->get_format() == Texture::F_depth_component24 || tex->get_format() == Texture::F_depth_component32) { - GLP(TexParameteri)(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY); + glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY); if (_supports_shadow_filter) { if ((tex->get_magfilter() == Texture::FT_shadow) || (tex->get_minfilter() == Texture::FT_shadow)) { - GLP(TexParameteri)(target, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB); - GLP(TexParameteri)(target, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL); + glTexParameteri(target, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB); + glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL); } else { - GLP(TexParameteri)(target, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE); - GLP(TexParameteri)(target, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL); + glTexParameteri(target, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE); + glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL); } } } @@ -8788,7 +8787,7 @@ apply_texture(TextureContext *tc) { gtc->reset_data(); gtc->_target = target; } - GLP(BindTexture)(target, gtc->_index); + glBindTexture(target, gtc->_index); report_my_gl_errors(); return true; @@ -8949,22 +8948,22 @@ upload_texture(CLP(TextureContext) *gtc, bool force) { #ifndef OPENGLES switch (quality_level) { case Texture::QL_fastest: - GLP(Hint)(GL_TEXTURE_COMPRESSION_HINT, GL_FASTEST); + glHint(GL_TEXTURE_COMPRESSION_HINT, GL_FASTEST); break; case Texture::QL_default: case Texture::QL_normal: - GLP(Hint)(GL_TEXTURE_COMPRESSION_HINT, GL_DONT_CARE); + glHint(GL_TEXTURE_COMPRESSION_HINT, GL_DONT_CARE); break; case Texture::QL_best: - GLP(Hint)(GL_TEXTURE_COMPRESSION_HINT, GL_NICEST); + glHint(GL_TEXTURE_COMPRESSION_HINT, GL_NICEST); break; } #endif } - GLP(PixelStorei)(GL_UNPACK_ALIGNMENT, 1); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); bool uses_mipmaps = (tex->uses_mipmaps() && !CLP(ignore_mipmaps)) || CLP(force_mipmaps); @@ -9143,11 +9142,11 @@ upload_texture_image(CLP(TextureContext) *gtc, if (uses_mipmaps) { if (_supports_generate_mipmap) { #ifndef OPENGLES_2 - GLP(TexParameteri)(texture_target, GL_GENERATE_MIPMAP, true); + glTexParameteri(texture_target, GL_GENERATE_MIPMAP, true); #endif } else { // If it can't, do without mipmaps. - GLP(TexParameteri)(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); uses_mipmaps = false; } } @@ -9175,7 +9174,7 @@ upload_texture_image(CLP(TextureContext) *gtc, // generate them. #ifndef OPENGLES_2 if (_supports_generate_mipmap) { - GLP(TexParameteri)(texture_target, GL_GENERATE_MIPMAP, false); + glTexParameteri(texture_target, GL_GENERATE_MIPMAP, false); } #endif load_ram_mipmaps = true; @@ -9185,11 +9184,11 @@ upload_texture_image(CLP(TextureContext) *gtc, // them if it can. if (_supports_generate_mipmap) { #ifndef OPENGLES_2 - GLP(TexParameteri)(texture_target, GL_GENERATE_MIPMAP, true); + glTexParameteri(texture_target, GL_GENERATE_MIPMAP, true); #endif } else { // If it can't, do without mipmaps. - GLP(TexParameteri)(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); uses_mipmaps = false; } } @@ -9267,7 +9266,7 @@ upload_texture_image(CLP(TextureContext) *gtc, switch (texture_target) { case GL_TEXTURE_1D: if (image_compression == Texture::CM_off) { - GLP(TexSubImage1D)(page_target, n - mipmap_bias, 0, width, + glTexSubImage1D(page_target, n - mipmap_bias, 0, width, external_format, component_type, image_ptr); } else { _glCompressedTexSubImage1D(page_target, n - mipmap_bias, 0, width, @@ -9319,7 +9318,7 @@ upload_texture_image(CLP(TextureContext) *gtc, // but TexSubImage2D doesn't accept a row-stride parameter. height = tex->get_y_size() - tex->get_pad_y_size(); } - GLP(TexSubImage2D)(page_target, n - mipmap_bias, 0, 0, width, height, + glTexSubImage2D(page_target, n - mipmap_bias, 0, 0, width, height, external_format, component_type, image_ptr); } else { _glCompressedTexSubImage2D(page_target, n - mipmap_bias, 0, 0, width, height, @@ -9369,7 +9368,7 @@ upload_texture_image(CLP(TextureContext) *gtc, switch (page_target) { #ifndef OPENGLES case GL_TEXTURE_1D: - GLP(TexImage1D)(page_target, 0, internal_format, width, 0, external_format, component_type, NULL); + glTexImage1D(page_target, 0, internal_format, width, 0, external_format, component_type, NULL); break; case GL_TEXTURE_2D_ARRAY: #endif @@ -9379,7 +9378,7 @@ upload_texture_image(CLP(TextureContext) *gtc, break; #endif default: - GLP(TexImage2D)(page_target, 0, internal_format, width, height, 0, external_format, component_type, NULL); + glTexImage2D(page_target, 0, internal_format, width, height, 0, external_format, component_type, NULL); break; } } @@ -9427,7 +9426,7 @@ upload_texture_image(CLP(TextureContext) *gtc, #ifndef OPENGLES // 1-d textures not supported by OpenGL ES. Fall through. case GL_TEXTURE_1D: if (image_compression == Texture::CM_off) { - GLP(TexImage1D)(page_target, n - mipmap_bias, internal_format, + glTexImage1D(page_target, n - mipmap_bias, internal_format, width, 0, external_format, component_type, image_ptr); } else { @@ -9481,7 +9480,7 @@ upload_texture_image(CLP(TextureContext) *gtc, default: if (image_compression == Texture::CM_off) { - GLP(TexImage2D)(page_target, n - mipmap_bias, internal_format, + glTexImage2D(page_target, n - mipmap_bias, internal_format, width, height, 0, external_format, component_type, image_ptr); } else { @@ -9512,14 +9511,14 @@ upload_texture_image(CLP(TextureContext) *gtc, // By the time we get here, we have successfully loaded a certain // number of mipmap levels. Tell the GL that's all it's going to // get. - GLP(TexParameteri)(texture_target, GL_TEXTURE_MAX_LEVEL, highest_level - mipmap_bias); + glTexParameteri(texture_target, GL_TEXTURE_MAX_LEVEL, highest_level - mipmap_bias); } else if (uses_mipmaps) { // Since the mipmap levels were auto-generated and are therefore // complete, make sure the GL doesn't remember some previous value // for GL_TEXTURE_MAX_LEVEL from the above call--set it to the // full count of mipmap levels. - GLP(TexParameteri)(texture_target, GL_TEXTURE_MAX_LEVEL, tex->get_expected_num_mipmap_levels() - mipmap_bias - 1); + glTexParameteri(texture_target, GL_TEXTURE_MAX_LEVEL, tex->get_expected_num_mipmap_levels() - mipmap_bias - 1); } } #endif @@ -9582,7 +9581,7 @@ upload_simple_texture(CLP(TextureContext) *gtc) { // Turn off mipmaps for the simple texture. if (tex->uses_mipmaps()) { if (is_at_least_gl_version(1, 2)) { - GLP(TexParameteri)(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); } } #endif @@ -9591,7 +9590,7 @@ upload_simple_texture(CLP(TextureContext) *gtc) { _data_transferred_pcollector.add_level(image_size); #endif - GLP(TexImage2D)(GL_TEXTURE_2D, 0, internal_format, + glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, external_format, component_type, image_ptr); @@ -9631,18 +9630,18 @@ get_texture_memory_size(Texture *tex) { } GLint minfilter; - GLP(GetTexParameteriv)(target, GL_TEXTURE_MIN_FILTER, &minfilter); + glGetTexParameteriv(target, GL_TEXTURE_MIN_FILTER, &minfilter); bool has_mipmaps = is_mipmap_filter(minfilter); clear_my_gl_errors(); GLint internal_format; - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format); if (is_compressed_format(internal_format)) { // Try to get the compressed size. GLint image_size; - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &image_size); GLenum error_code = gl_get_error(); @@ -9662,28 +9661,28 @@ get_texture_memory_size(Texture *tex) { GLint red_size, green_size, blue_size, alpha_size, luminance_size, intensity_size; GLint depth_size = 0; - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_RED_SIZE, &red_size); - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_GREEN_SIZE, &green_size); - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_BLUE_SIZE, &blue_size); - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size); - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_LUMINANCE_SIZE, &luminance_size); - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_INTENSITY_SIZE, &intensity_size); if (_supports_depth_texture) { - GLP(GetTexLevelParameteriv)(page_target, 0, + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_DEPTH_SIZE, &depth_size); } GLint width = 1, height = 1, depth = 1; - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_WIDTH, &width); - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_HEIGHT, &height); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_WIDTH, &width); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_HEIGHT, &height); if (_supports_3d_texture || _supports_2d_texture_array) { - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_DEPTH, &depth); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_DEPTH, &depth); } report_my_gl_errors(); @@ -9727,7 +9726,7 @@ check_nonresident_texture(BufferContextChain &chain) { } nassertv(ti == num_textures); GLboolean *results = (GLboolean *)alloca(num_textures * sizeof(GLboolean)); - bool all_resident = (GLP(AreTexturesResident)(num_textures, texture_list, results) != 0); + bool all_resident = (glAreTexturesResident(num_textures, texture_list, results) != 0); report_my_gl_errors(); @@ -9757,7 +9756,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc) { if (target == GL_NONE) { return false; } - GLP(BindTexture)(target, gtc->_index); + glBindTexture(target, gtc->_index); Texture *tex = gtc->get_texture(); @@ -9765,27 +9764,27 @@ do_extract_texture_data(CLP(TextureContext) *gtc) { GLint minfilter, magfilter; GLfloat border_color[4]; - GLP(GetTexParameteriv)(target, GL_TEXTURE_WRAP_S, &wrap_u); - GLP(GetTexParameteriv)(target, GL_TEXTURE_WRAP_T, &wrap_v); + glGetTexParameteriv(target, GL_TEXTURE_WRAP_S, &wrap_u); + glGetTexParameteriv(target, GL_TEXTURE_WRAP_T, &wrap_v); wrap_w = GL_REPEAT; if (_supports_3d_texture) { #ifdef OPENGLES_2 - GLP(GetTexParameteriv)(target, GL_TEXTURE_WRAP_R_OES, &wrap_w); + glGetTexParameteriv(target, GL_TEXTURE_WRAP_R_OES, &wrap_w); #endif #ifndef OPENGLES - GLP(GetTexParameteriv)(target, GL_TEXTURE_WRAP_R, &wrap_w); + glGetTexParameteriv(target, GL_TEXTURE_WRAP_R, &wrap_w); #endif } if (_supports_2d_texture_array) { #ifndef OPENGLES - GLP(GetTexParameteriv)(target, GL_TEXTURE_WRAP_R, &wrap_w); + glGetTexParameteriv(target, GL_TEXTURE_WRAP_R, &wrap_w); #endif } - GLP(GetTexParameteriv)(target, GL_TEXTURE_MIN_FILTER, &minfilter); - GLP(GetTexParameteriv)(target, GL_TEXTURE_MAG_FILTER, &magfilter); + glGetTexParameteriv(target, GL_TEXTURE_MIN_FILTER, &minfilter); + glGetTexParameteriv(target, GL_TEXTURE_MAG_FILTER, &magfilter); #ifndef OPENGLES - GLP(GetTexParameterfv)(target, GL_TEXTURE_BORDER_COLOR, border_color); + glGetTexParameterfv(target, GL_TEXTURE_BORDER_COLOR, border_color); #endif GLenum page_target = target; @@ -9796,17 +9795,17 @@ do_extract_texture_data(CLP(TextureContext) *gtc) { GLint width = gtc->_width, height = gtc->_height, depth = gtc->_depth; #ifndef OPENGLES - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_WIDTH, &width); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_WIDTH, &width); if (target != GL_TEXTURE_1D) { - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_HEIGHT, &height); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_HEIGHT, &height); } if (_supports_3d_texture && target == GL_TEXTURE_3D) { - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_DEPTH, &depth); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_DEPTH, &depth); } #ifndef OPENGLES else if (_supports_2d_texture_array && target == GL_TEXTURE_2D_ARRAY_EXT) { - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_DEPTH, &depth); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_DEPTH, &depth); } #endif else if (target == GL_TEXTURE_CUBE_MAP) { @@ -9822,7 +9821,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc) { GLint internal_format = GL_RGBA; #ifndef OPENGLES - GLP(GetTexLevelParameteriv)(page_target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format); + glGetTexLevelParameteriv(page_target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format); #endif // OPENGLES // Make sure we were able to query those parameters properly. @@ -10083,7 +10082,7 @@ do_extract_texture_data(CLP(TextureContext) *gtc) { GLint highest_level = num_expected_levels; #ifndef OPENGLES if (is_at_least_gl_version(1, 2)) { - GLP(GetTexParameteriv)(target, GL_TEXTURE_MAX_LEVEL, &highest_level); + glGetTexParameteriv(target, GL_TEXTURE_MAX_LEVEL, &highest_level); highest_level = min(highest_level, num_expected_levels); } #endif @@ -10133,7 +10132,7 @@ extract_texture_image(PTA_uchar &image, size_t &page_size, if (compression != Texture::CM_off) { GLint image_size; - GLP(GetTexLevelParameteriv)(page_target, n, + glGetTexLevelParameteriv(page_target, n, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &image_size); nassertr(image_size <= (int)page_size, false); page_size = image_size; @@ -10145,7 +10144,7 @@ extract_texture_image(PTA_uchar &image, size_t &page_size, page_target = GL_TEXTURE_CUBE_MAP_POSITIVE_X + z; if (compression == Texture::CM_off) { - GLP(GetTexImage)(page_target, n, external_format, pixel_type, + glGetTexImage(page_target, n, external_format, pixel_type, image.p() + z * page_size); } else { _glGetCompressedTexImage(page_target, 0, image.p() + z * page_size); @@ -10157,12 +10156,12 @@ extract_texture_image(PTA_uchar &image, size_t &page_size, image = PTA_uchar::empty_array(tex->get_expected_ram_mipmap_image_size(n)); GLenum external_format = get_external_image_format(tex); GLenum pixel_type = get_component_type(type); - GLP(GetTexImage)(target, n, external_format, pixel_type, image.p()); + glGetTexImage(target, n, external_format, pixel_type, image.p()); } else { // A compressed 1-d, 2-d, or 3-d texture. GLint image_size; - GLP(GetTexLevelParameteriv)(target, n, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &image_size); + glGetTexLevelParameteriv(target, n, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &image_size); page_size = image_size / tex->get_z_size(); image = PTA_uchar::empty_array(image_size); @@ -10549,9 +10548,9 @@ do_issue_stencil() { GLbitfield mask = 0; // clear stencil buffer - GLP(ClearStencil)(stencil -> get_render_state (StencilAttrib::SRS_clear_value)); + glClearStencil(stencil -> get_render_state (StencilAttrib::SRS_clear_value)); mask |= GL_STENCIL_BUFFER_BIT; - GLP(Clear)(mask); + glClear(mask); } } else { @@ -10575,6 +10574,6 @@ do_issue_scissor() { int width = (int)(_viewport_width * (frame[1] - frame[0]) + 0.5f); int height = (int)(_viewport_height * (frame[3] - frame[2]) + 0.5f); - GLP(Enable)(GL_SCISSOR_TEST); - GLP(Scissor)(x, y, width, height); + glEnable(GL_SCISSOR_TEST); + glScissor(x, y, width, height); } diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.h b/panda/src/glstuff/glGraphicsStateGuardian_src.h index c7348a3b6f..7863b7cd3b 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.h +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.h @@ -345,8 +345,8 @@ protected: bool has_extension(const string &extension) const; INLINE bool is_at_least_gl_version(int major_version, int minor_version) const; INLINE bool is_at_least_gles_version(int major_version, int minor_version) const; - void *get_extension_func(const char *prefix, const char *name); - virtual void *do_get_extension_func(const char *prefix, const char *name); + void *get_extension_func(const char *name); + virtual void *do_get_extension_func(const char *name); virtual void reissue_transforms(); virtual void enable_lighting(bool enable); diff --git a/panda/src/glstuff/glOcclusionQueryContext_src.cxx b/panda/src/glstuff/glOcclusionQueryContext_src.cxx index 2d94df0665..f3197ee68d 100644 --- a/panda/src/glstuff/glOcclusionQueryContext_src.cxx +++ b/panda/src/glstuff/glOcclusionQueryContext_src.cxx @@ -75,7 +75,7 @@ is_answer_ready() const { void CLP(OcclusionQueryContext):: waiting_for_answer() { PStatTimer timer(GraphicsStateGuardian::_wait_occlusion_pcollector); - GLP(Flush)(); + glFlush(); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index 47869cd1d4..83a63345ca 100755 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -1365,21 +1365,21 @@ disable_shader_texture_bindings(GSG *gsg) { return; } #ifndef OPENGLES - GLP(BindTexture)(GL_TEXTURE_1D, 0); + glBindTexture(GL_TEXTURE_1D, 0); #endif // OPENGLES - GLP(BindTexture)(GL_TEXTURE_2D, 0); + glBindTexture(GL_TEXTURE_2D, 0); #ifndef OPENGLES_1 if (gsg->_supports_3d_texture) { - GLP(BindTexture)(GL_TEXTURE_3D, 0); + glBindTexture(GL_TEXTURE_3D, 0); } #endif // OPENGLES_1 #ifndef OPENGLES if (gsg->_supports_2d_texture_array) { - GLP(BindTexture)(GL_TEXTURE_2D_ARRAY_EXT, 0); + glBindTexture(GL_TEXTURE_2D_ARRAY_EXT, 0); } #endif if (gsg->_supports_cube_map) { - GLP(BindTexture)(GL_TEXTURE_CUBE_MAP, 0); + glBindTexture(GL_TEXTURE_CUBE_MAP, 0); } // This is probably faster - but maybe not as safe? // cgGLDisableTextureParameter(p); @@ -1490,6 +1490,11 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) { } } +#if defined(HAVE_CG) && !defined(OPENGLES) + cg_report_errors(); +#endif + +#ifndef OPENGLES // Now bind all the 'image units'; a bit of an esoteric OpenGL feature right now. int num_image_units = min(_glsl_img_inputs.size(), (size_t)gsg->_max_image_units); @@ -1511,6 +1516,7 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) { CLP(TextureContext) *gtc = DCAST(CLP(TextureContext), tex->prepare_now(view, gsg->_prepared_objects, gsg)); if (gtc != (TextureContext*)NULL) { gl_tex = gtc->_index; + gsg->update_texture(gtc, false); } } @@ -1523,6 +1529,7 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) { if (gl_tex == 0) { gsg->_glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_ONLY, GL_R8); } else { + //TODO: automatically convert to sized type instead of plain GL_RGBA GLint internal_format = gsg->get_internal_image_format(tex); gsg->_glBindImageTexture(i, gl_tex, 0, GL_TRUE, 0, GL_READ_WRITE, internal_format); } @@ -1534,9 +1541,6 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) { delete[] multi_img; } } - -#if defined(HAVE_CG) && !defined(OPENGLES) - cg_report_errors(); #endif gsg->report_my_gl_errors(); diff --git a/panda/src/glstuff/glTextureContext_src.cxx b/panda/src/glstuff/glTextureContext_src.cxx index ea58861bd2..4e6cdbb1bb 100644 --- a/panda/src/glstuff/glTextureContext_src.cxx +++ b/panda/src/glstuff/glTextureContext_src.cxx @@ -49,11 +49,11 @@ evict_lru() { void CLP(TextureContext):: reset_data() { // Free the texture resources. - GLP(DeleteTextures)(1, &_index); + glDeleteTextures(1, &_index); // We still need a valid index number, though, in case we want to // re-load the texture later. - GLP(GenTextures)(1, &_index); + glGenTextures(1, &_index); _already_applied = false; } diff --git a/panda/src/glstuff/glmisc_src.cxx b/panda/src/glstuff/glmisc_src.cxx index 8cf477f54b..566c292912 100644 --- a/panda/src/glstuff/glmisc_src.cxx +++ b/panda/src/glstuff/glmisc_src.cxx @@ -16,7 +16,7 @@ ConfigVariableBool CLP(cheap_textures) ("gl-cheap-textures", false, - PRC_DESC("Configure this true to GLP(Hint) the textures into the cheapest " + PRC_DESC("Configure this true to glHint the textures into the cheapest " "possible mode.")); ConfigVariableBool CLP(ignore_clamp) diff --git a/panda/src/glstuff/glstuff_src.h b/panda/src/glstuff/glstuff_src.h index f62c4f8c59..0c48fafdac 100644 --- a/panda/src/glstuff/glstuff_src.h +++ b/panda/src/glstuff/glstuff_src.h @@ -18,7 +18,6 @@ // some such), define the following symbols and #include this header // file. -// #define GLP(name): returns name prefixed by the gl prefix, e.g. gl##name // #define CLP(name): returns name prefixed by the class prefix, e.g. GL##name // #define CLASSPREFIX_QUOTED: the quoted prefix of CLP, e.g. "GL" // #define CONFIGOBJ: a Configrc object, e.g. config_glgsg @@ -43,4 +42,3 @@ #include "glImmediateModeSender_src.h" #include "glGraphicsBuffer_src.h" #include "glGraphicsStateGuardian_src.h" - diff --git a/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx b/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx index 8470fe8d57..dce585fd84 100644 --- a/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx +++ b/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx @@ -90,7 +90,7 @@ get_properties(FrameBufferProperties &properties, XVisualInfo *visual) { red_size, green_size, blue_size, alpha_size, ared_size, agreen_size, ablue_size, aalpha_size, depth_size, stencil_size; - + glXGetConfig(_display, visual, GLX_USE_GL, &use_gl); glXGetConfig(_display, visual, GLX_RGBA, &render_mode); glXGetConfig(_display, visual, GLX_DOUBLEBUFFER, &double_buffer); @@ -131,7 +131,7 @@ get_properties(FrameBufferProperties &properties, XVisualInfo *visual) { properties.set_depth_bits(depth_size); properties.set_alpha_bits(alpha_size); properties.set_accum_bits(ared_size+agreen_size+ablue_size+aalpha_size); - + // Set both hardware and software bits, indicating not-yet-known. properties.set_force_software(1); properties.set_force_hardware(1); @@ -154,7 +154,7 @@ get_properties_advanced(FrameBufferProperties &properties, int render_type, double_buffer, stereo, red_size, green_size, blue_size, alpha_size, ared_size, agreen_size, ablue_size, aalpha_size, depth_size, stencil_size, samples, drawable_type, caveat; - + _glXGetFBConfigAttrib(_display, config, GLX_RENDER_TYPE, &render_type); _glXGetFBConfigAttrib(_display, config, GLX_DOUBLEBUFFER, &double_buffer); _glXGetFBConfigAttrib(_display, config, GLX_STEREO, &stereo); @@ -171,47 +171,49 @@ get_properties_advanced(FrameBufferProperties &properties, _glXGetFBConfigAttrib(_display, config, GLX_SAMPLES, &samples); _glXGetFBConfigAttrib(_display, config, GLX_DRAWABLE_TYPE, &drawable_type); _glXGetFBConfigAttrib(_display, config, GLX_CONFIG_CAVEAT, &caveat); - + context_has_pbuffer = false; if ((drawable_type & GLX_PBUFFER_BIT)!=0) { context_has_pbuffer = true; } - + context_has_pixmap = false; if ((drawable_type & GLX_PIXMAP_BIT)!=0) { context_has_pixmap = true; } - + slow = false; if (caveat == GLX_SLOW_CONFIG) { slow = true; } - + if ((drawable_type & GLX_WINDOW_BIT)==0) { // We insist on having a context that will support an onscreen window. return; } - + if (double_buffer) { properties.set_back_buffers(1); } + if (stereo) { - properties.set_stereo(1); + properties.set_stereo(true); } - + if ((render_type & GLX_RGBA_BIT)!=0) { - properties.set_rgb_color(1); + properties.set_rgb_color(true); } if ((render_type & GLX_COLOR_INDEX_BIT)!=0) { - properties.set_indexed_color(1); + properties.set_indexed_color(true); } + properties.set_color_bits(red_size+green_size+blue_size); properties.set_stencil_bits(stencil_size); properties.set_depth_bits(depth_size); properties.set_alpha_bits(alpha_size); properties.set_accum_bits(ared_size+agreen_size+ablue_size+aalpha_size); properties.set_multisamples(samples); - + // Set both hardware and software bits, indicating not-yet-known. properties.set_force_software(1); properties.set_force_hardware(1); @@ -298,11 +300,11 @@ choose_pixel_format(const FrameBufferProperties &properties, attrib_list[n++] = GLX_DRAWABLE_TYPE; attrib_list[n++] = GLX_DONT_CARE; attrib_list[n] = (int)None; - + int num_configs = 0; GLXFBConfig *configs = _glXChooseFBConfig(_display, _screen, attrib_list, &num_configs); - + if (configs != 0) { bool context_has_pbuffer, context_has_pixmap, slow; int quality, i; @@ -325,7 +327,7 @@ choose_pixel_format(const FrameBufferProperties &properties, if (need_pixmap && !context_has_pixmap) { continue; } - + if (quality > best_quality) { best_quality = quality; best_result = i; @@ -336,7 +338,7 @@ choose_pixel_format(const FrameBufferProperties &properties, if (best_quality > 0) { _fbconfig = configs[best_result]; - _context = + _context = _glXCreateNewContext(_display, _fbconfig, GLX_RGBA_TYPE, _share_context, GL_TRUE); if (_context) { @@ -401,7 +403,7 @@ reset() { if (_supports_swap_control) { _glXSwapIntervalSGI = - (PFNGLXSWAPINTERVALSGIPROC)get_extension_func("glX", "SwapIntervalSGI"); + (PFNGLXSWAPINTERVALSGIPROC)get_extension_func("glXSwapIntervalSGI"); if (_glXSwapIntervalSGI == NULL) { glxdisplay_cat.error() << "Driver claims to support GLX_SGI_swap_control extension, but does not define all functions.\n"; @@ -419,18 +421,18 @@ reset() { if (glx_is_at_least_version(1, 3)) { // If we have glx 1.3 or better, we have the FBConfig interface. _supports_fbconfig = true; - - _glXChooseFBConfig = - (PFNGLXCHOOSEFBCONFIGPROC)get_extension_func("glX", "ChooseFBConfig"); - _glXCreateNewContext = - (PFNGLXCREATENEWCONTEXTPROC)get_extension_func("glX", "CreateNewContext"); - _glXGetVisualFromFBConfig = - (PFNGLXGETVISUALFROMFBCONFIGPROC)get_extension_func("glX", "GetVisualFromFBConfig"); - _glXGetFBConfigAttrib = - (PFNGLXGETFBCONFIGATTRIBPROC)get_extension_func("glX", "GetFBConfigAttrib"); - _glXCreatePixmap = - (PFNGLXCREATEPIXMAPPROC)get_extension_func("glX", "CreatePixmap"); - + + _glXChooseFBConfig = + (PFNGLXCHOOSEFBCONFIGPROC)get_extension_func("glXChooseFBConfig"); + _glXCreateNewContext = + (PFNGLXCREATENEWCONTEXTPROC)get_extension_func("glXCreateNewContext"); + _glXGetVisualFromFBConfig = + (PFNGLXGETVISUALFROMFBCONFIGPROC)get_extension_func("glXGetVisualFromFBConfig"); + _glXGetFBConfigAttrib = + (PFNGLXGETFBCONFIGATTRIBPROC)get_extension_func("glXGetFBConfigAttrib"); + _glXCreatePixmap = + (PFNGLXCREATEPIXMAPPROC)get_extension_func("glXCreatePixmap"); + if (_glXChooseFBConfig == NULL || _glXCreateNewContext == NULL || _glXGetVisualFromFBConfig == NULL || @@ -445,18 +447,18 @@ reset() { // the same, but the function names are different--we just remap // them to the same function pointers. _supports_fbconfig = true; - - _glXChooseFBConfig = - (PFNGLXCHOOSEFBCONFIGPROC)get_extension_func("glX", "ChooseFBConfigSGIX"); - _glXCreateNewContext = - (PFNGLXCREATENEWCONTEXTPROC)get_extension_func("glX", "CreateContextWithConfigSGIX"); - _glXGetVisualFromFBConfig = - (PFNGLXGETVISUALFROMFBCONFIGPROC)get_extension_func("glX", "GetVisualFromFBConfigSGIX"); - _glXGetFBConfigAttrib = - (PFNGLXGETFBCONFIGATTRIBPROC)get_extension_func("glX", "GetFBConfigAttribSGIX"); - _glXCreatePixmap = - (PFNGLXCREATEPIXMAPPROC)get_extension_func("glX", "CreateGLXPixmapWithConfigSGIX"); - + + _glXChooseFBConfig = + (PFNGLXCHOOSEFBCONFIGPROC)get_extension_func("glXChooseFBConfigSGIX"); + _glXCreateNewContext = + (PFNGLXCREATENEWCONTEXTPROC)get_extension_func("glXCreateContextWithConfigSGIX"); + _glXGetVisualFromFBConfig = + (PFNGLXGETVISUALFROMFBCONFIGPROC)get_extension_func("glXGetVisualFromFBConfigSGIX"); + _glXGetFBConfigAttrib = + (PFNGLXGETFBCONFIGATTRIBPROC)get_extension_func("glXGetFBConfigAttribSGIX"); + _glXCreatePixmap = + (PFNGLXCREATEPIXMAPPROC)get_extension_func("glXCreateGLXPixmapWithConfigSGIX"); + if (_glXChooseFBConfig == NULL || _glXCreateNewContext == NULL || _glXGetVisualFromFBConfig == NULL || @@ -467,36 +469,36 @@ reset() { _supports_fbconfig = false; } } - + if (glx_is_at_least_version(1, 3)) { // If we have glx 1.3 or better, we have the PBuffer interface. _supports_pbuffer = true; _uses_sgix_pbuffer = false; - - _glXCreatePbuffer = - (PFNGLXCREATEPBUFFERPROC)get_extension_func("glX", "CreatePbuffer"); + + _glXCreatePbuffer = + (PFNGLXCREATEPBUFFERPROC)get_extension_func("glXCreatePbuffer"); _glXCreateGLXPbufferSGIX = NULL; - _glXDestroyPbuffer = - (PFNGLXDESTROYPBUFFERPROC)get_extension_func("glX", "DestroyPbuffer"); + _glXDestroyPbuffer = + (PFNGLXDESTROYPBUFFERPROC)get_extension_func("glXDestroyPbuffer"); if (_glXCreatePbuffer == NULL || _glXDestroyPbuffer == NULL) { glxdisplay_cat.error() << "Driver claims to support GLX_pbuffer extension, but does not define all functions.\n"; _supports_pbuffer = false; } - + } else if (has_extension("GLX_SGIX_pbuffer")) { // Or maybe we have the old SGIX extension for PBuffers. _uses_sgix_pbuffer = true; - + // CreatePbuffer has a different form between SGIX and 1.3, // however, so we must treat it specially. But we can use the // same function pointer for DestroyPbuffer. _glXCreatePbuffer = NULL; - _glXCreateGLXPbufferSGIX = - (PFNGLXCREATEGLXPBUFFERSGIXPROC)get_extension_func("glX", "CreateGLXPbufferSGIX"); - _glXDestroyPbuffer = - (PFNGLXDESTROYPBUFFERPROC)get_extension_func("glX", "DestroyGLXPbufferSGIX"); + _glXCreateGLXPbufferSGIX = + (PFNGLXCREATEGLXPBUFFERSGIXPROC)get_extension_func("glXCreateGLXPbufferSGIX"); + _glXDestroyPbuffer = + (PFNGLXDESTROYPBUFFERPROC)get_extension_func("glXDestroyGLXPbufferSGIX"); if (_glXCreateGLXPbufferSGIX == NULL || _glXDestroyPbuffer == NULL) { glxdisplay_cat.error() @@ -625,41 +627,39 @@ get_extra_extensions() { // not defined. //////////////////////////////////////////////////////////////////// void *glxGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - nassertr(prefix != NULL, NULL); +do_get_extension_func(const char *name) { nassertr(name != NULL, NULL); - string fullname = string(prefix) + string(name); if (glx_get_proc_address) { // First, check if we have glXGetProcAddress available. This will // be superior if we can get it. - + #if defined(LINK_IN_GLXGETPROCADDRESS) && defined(HAVE_GLXGETPROCADDRESS) // If we are confident the system headers defined it, we can // call it directly. This is more reliable than trying to // determine its address dynamically, but it may make // libpandagl.so fail to load if the symbol isn't in the runtime // library. - return (void *)glXGetProcAddress((const GLubyte *)fullname.c_str()); - + return (void *)glXGetProcAddress((const GLubyte *)name); + #elif defined(LINK_IN_GLXGETPROCADDRESS) && defined(HAVE_GLXGETPROCADDRESSARB) // The ARB extension version is OK too. Sometimes the prototype // isn't supplied for some reason. - return (void *)glXGetProcAddressARB((const GLubyte *)fullname.c_str()); - + return (void *)glXGetProcAddressARB((const GLubyte *)name); + #else // Otherwise, we have to fiddle around with the dynamic runtime. - + if (!_checked_get_proc_address) { const char *funcName = NULL; - + if (glx_is_at_least_version(1, 4)) { funcName = "glXGetProcAddress"; } else if (has_extension("GLX_ARB_get_proc_address")) { funcName = "glXGetProcAddressARB"; } - + if (funcName != NULL) { _glXGetProcAddress = (PFNGLXGETPROCADDRESSPROC)get_system_func(funcName); if (_glXGetProcAddress == NULL) { @@ -671,16 +671,16 @@ do_get_extension_func(const char *prefix, const char *name) { _checked_get_proc_address = true; } - + // Use glxGetProcAddress() if we've got it; it should be more robust. if (_glXGetProcAddress != NULL) { - return (void *)_glXGetProcAddress((const GLubyte *)fullname.c_str()); + return (void *)_glXGetProcAddress((const GLubyte *)name); } #endif // HAVE_GLXGETPROCADDRESS } // Otherwise, fall back to the OS-provided calls. - return PosixGraphicsStateGuardian::do_get_extension_func(prefix, name); + return PosixGraphicsStateGuardian::do_get_extension_func(name); } //////////////////////////////////////////////////////////////////// @@ -759,17 +759,17 @@ choose_temp_visual(const FrameBufferProperties &properties) { } } } - + if (best_quality > 0) { _visual = _visuals + best_result; - _temp_context = glXCreateContext(_display, _visual, None, GL_TRUE); + _temp_context = glXCreateContext(_display, _visual, None, GL_TRUE); if (_temp_context) { _fbprops = best_props; return; } } - glxdisplay_cat.error() + glxdisplay_cat.error() << "Could not find a usable pixel format.\n"; } @@ -828,7 +828,7 @@ destroy_temp_xwindow() { _temp_xwindow = (X11_Window)NULL; } - if (_temp_context != (GLXContext)NULL){ + if (_temp_context != (GLXContext)NULL) { glXDestroyContext(_display, _temp_context); _temp_context = (GLXContext)NULL; } diff --git a/panda/src/glxdisplay/glxGraphicsStateGuardian.h b/panda/src/glxdisplay/glxGraphicsStateGuardian.h index f3f72f5b91..f0af77ae60 100644 --- a/panda/src/glxdisplay/glxGraphicsStateGuardian.h +++ b/panda/src/glxdisplay/glxGraphicsStateGuardian.h @@ -132,7 +132,7 @@ protected: virtual void query_gl_version(); virtual void get_extra_extensions(); - virtual void *do_get_extension_func(const char *prefix, const char *name); + virtual void *do_get_extension_func(const char *name); private: void show_glx_client_string(const string &name, int id); diff --git a/panda/src/glxdisplay/panda_glxext.h b/panda/src/glxdisplay/panda_glxext.h index 71f208f34a..308e166224 100644 --- a/panda/src/glxdisplay/panda_glxext.h +++ b/panda/src/glxdisplay/panda_glxext.h @@ -1,614 +1,867 @@ #ifndef panda__glxext_h_ -#define panda__glxext_h_ +#define panda__glxext_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2002 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. +** Copyright (c) 2013-2014 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** "Materials"), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are furnished to do so, subject to +** the following conditions: +** +** The above copyright notice and this permission notice shall be included +** in all copies or substantial portions of the Materials. +** +** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +*/ +/* +** This header is generated from the Khronos OpenGL / OpenGL ES XML +** API Registry. The current version of the Registry, generator scripts +** used to make the header, and the header can be found at +** http://www.opengl.org/registry/ +** +** Khronos $Revision$ on $Date$ */ -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif +#define GLX_GLXEXT_VERSION 20140416 -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glxext.h last updated 2002/03/22 */ -/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ -#define GLX_GLXEXT_VERSION 5 - -#ifndef GLX_VERSION_1_3 -#define GLX_WINDOW_BIT 0x00000001 -#define GLX_PIXMAP_BIT 0x00000002 -#define GLX_PBUFFER_BIT 0x00000004 -#define GLX_RGBA_BIT 0x00000001 -#define GLX_COLOR_INDEX_BIT 0x00000002 -#define GLX_PBUFFER_CLOBBER_MASK 0x08000000 -#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001 -#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002 -#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004 -#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008 -#define GLX_AUX_BUFFERS_BIT 0x00000010 -#define GLX_DEPTH_BUFFER_BIT 0x00000020 -#define GLX_STENCIL_BUFFER_BIT 0x00000040 -#define GLX_ACCUM_BUFFER_BIT 0x00000080 -#define GLX_CONFIG_CAVEAT 0x20 -#define GLX_X_VISUAL_TYPE 0x22 -#define GLX_TRANSPARENT_TYPE 0x23 -#define GLX_TRANSPARENT_INDEX_VALUE 0x24 -#define GLX_TRANSPARENT_RED_VALUE 0x25 -#define GLX_TRANSPARENT_GREEN_VALUE 0x26 -#define GLX_TRANSPARENT_BLUE_VALUE 0x27 -#define GLX_TRANSPARENT_ALPHA_VALUE 0x28 -#define GLX_DONT_CARE 0xFFFFFFFF -#define GLX_NONE 0x8000 -#define GLX_SLOW_CONFIG 0x8001 -#define GLX_TRUE_COLOR 0x8002 -#define GLX_DIRECT_COLOR 0x8003 -#define GLX_PSEUDO_COLOR 0x8004 -#define GLX_STATIC_COLOR 0x8005 -#define GLX_GRAY_SCALE 0x8006 -#define GLX_STATIC_GRAY 0x8007 -#define GLX_TRANSPARENT_RGB 0x8008 -#define GLX_TRANSPARENT_INDEX 0x8009 -#define GLX_VISUAL_ID 0x800B -#define GLX_SCREEN 0x800C -#define GLX_NON_CONFORMANT_CONFIG 0x800D -#define GLX_DRAWABLE_TYPE 0x8010 -#define GLX_RENDER_TYPE 0x8011 -#define GLX_X_RENDERABLE 0x8012 -#define GLX_FBCONFIG_ID 0x8013 -#define GLX_RGBA_TYPE 0x8014 -#define GLX_COLOR_INDEX_TYPE 0x8015 -#define GLX_MAX_PBUFFER_WIDTH 0x8016 -#define GLX_MAX_PBUFFER_HEIGHT 0x8017 -#define GLX_MAX_PBUFFER_PIXELS 0x8018 -#define GLX_PRESERVED_CONTENTS 0x801B -#define GLX_LARGEST_PBUFFER 0x801C -#define GLX_WIDTH 0x801D -#define GLX_HEIGHT 0x801E -#define GLX_EVENT_MASK 0x801F -#define GLX_DAMAGED 0x8020 -#define GLX_SAVED 0x8021 -#define GLX_WINDOW 0x8022 -#define GLX_PBUFFER 0x8023 -#define GLX_PBUFFER_HEIGHT 0x8040 -#define GLX_PBUFFER_WIDTH 0x8041 -#endif - -#ifndef GLX_VERSION_1_4 -#define GLX_SAMPLE_BUFFERS 100000 -#define GLX_SAMPLES 100001 -#endif - -/* drose: the version of GL/glx.h that ships with Fedora Core 2 seems - to define GLX_VERSION_1_4, but for some reason does not define - GLX_SAMPLE_BUFFERS or GLX_SAMPLES. We work around that here. */ -#ifndef GLX_SAMPLE_BUFFERS -#define GLX_SAMPLE_BUFFERS 100000 -#endif -#ifndef GLX_SAMPLES -#define GLX_SAMPLES 100001 -#endif - -#ifndef GLX_ARB_get_proc_address -#endif - -#ifndef GLX_ARB_multisample -#define GLX_SAMPLE_BUFFERS_ARB 100000 -#define GLX_SAMPLES_ARB 100001 -#endif - -#ifndef GLX_SGIS_multisample -#define GLX_SAMPLE_BUFFERS_SGIS 100000 -#define GLX_SAMPLES_SGIS 100001 -#endif - -#ifndef GLX_EXT_visual_info -#define GLX_X_VISUAL_TYPE_EXT 0x22 -#define GLX_TRANSPARENT_TYPE_EXT 0x23 -#define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24 -#define GLX_TRANSPARENT_RED_VALUE_EXT 0x25 -#define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26 -#define GLX_TRANSPARENT_BLUE_VALUE_EXT 0x27 -#define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28 -#define GLX_NONE_EXT 0x8000 -#define GLX_TRUE_COLOR_EXT 0x8002 -#define GLX_DIRECT_COLOR_EXT 0x8003 -#define GLX_PSEUDO_COLOR_EXT 0x8004 -#define GLX_STATIC_COLOR_EXT 0x8005 -#define GLX_GRAY_SCALE_EXT 0x8006 -#define GLX_STATIC_GRAY_EXT 0x8007 -#define GLX_TRANSPARENT_RGB_EXT 0x8008 -#define GLX_TRANSPARENT_INDEX_EXT 0x8009 -#endif - -#ifndef GLX_SGI_swap_control -#endif - -#ifndef GLX_SGI_video_sync -#endif - -#ifndef GLX_SGI_make_current_read -#endif - -#ifndef GLX_SGIX_video_source -#endif - -#ifndef GLX_EXT_visual_rating -#define GLX_VISUAL_CAVEAT_EXT 0x20 -#define GLX_SLOW_VISUAL_EXT 0x8001 -#define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D -/* reuse GLX_NONE_EXT */ -#endif - -#ifndef GLX_SGIX_fbconfig -#define GLX_WINDOW_BIT_SGIX 0x00000001 -#define GLX_PIXMAP_BIT_SGIX 0x00000002 -#define GLX_RGBA_BIT_SGIX 0x00000001 -#define GLX_COLOR_INDEX_BIT_SGIX 0x00000002 -#define GLX_DRAWABLE_TYPE_SGIX 0x8010 -#define GLX_RENDER_TYPE_SGIX 0x8011 -#define GLX_X_RENDERABLE_SGIX 0x8012 -#define GLX_FBCONFIG_ID_SGIX 0x8013 -#define GLX_RGBA_TYPE_SGIX 0x8014 -#define GLX_COLOR_INDEX_TYPE_SGIX 0x8015 -/* reuse GLX_SCREEN_EXT */ -#endif - -#ifndef GLX_SGIX_pbuffer -#define GLX_PBUFFER_BIT_SGIX 0x00000004 -#define GLX_BUFFER_CLOBBER_MASK_SGIX 0x08000000 -#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX 0x00000001 -#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX 0x00000002 -#define GLX_BACK_LEFT_BUFFER_BIT_SGIX 0x00000004 -#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX 0x00000008 -#define GLX_AUX_BUFFERS_BIT_SGIX 0x00000010 -#define GLX_DEPTH_BUFFER_BIT_SGIX 0x00000020 -#define GLX_STENCIL_BUFFER_BIT_SGIX 0x00000040 -#define GLX_ACCUM_BUFFER_BIT_SGIX 0x00000080 -#define GLX_SAMPLE_BUFFERS_BIT_SGIX 0x00000100 -#define GLX_MAX_PBUFFER_WIDTH_SGIX 0x8016 -#define GLX_MAX_PBUFFER_HEIGHT_SGIX 0x8017 -#define GLX_MAX_PBUFFER_PIXELS_SGIX 0x8018 -#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX 0x8019 -#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX 0x801A -#define GLX_PRESERVED_CONTENTS_SGIX 0x801B -#define GLX_LARGEST_PBUFFER_SGIX 0x801C -#define GLX_WIDTH_SGIX 0x801D -#define GLX_HEIGHT_SGIX 0x801E -#define GLX_EVENT_MASK_SGIX 0x801F -#define GLX_DAMAGED_SGIX 0x8020 -#define GLX_SAVED_SGIX 0x8021 -#define GLX_WINDOW_SGIX 0x8022 -#define GLX_PBUFFER_SGIX 0x8023 -#endif - -#ifndef GLX_SGI_cushion -#endif - -#ifndef GLX_SGIX_video_resize -#define GLX_SYNC_FRAME_SGIX 0x00000000 -#define GLX_SYNC_SWAP_SGIX 0x00000001 -#endif - -#ifndef GLX_SGIX_dmbuffer -#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX 0x8024 -#endif - -#ifndef GLX_SGIX_swap_group -#endif - -#ifndef GLX_SGIX_swap_barrier -#endif - -#ifndef GLX_SGIS_blended_overlay -#define GLX_BLENDED_RGBA_SGIS 0x8025 -#endif - -#ifndef GLX_SGIS_shared_multisample -#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026 -#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027 -#endif - -#ifndef GLX_SUN_get_transparent_index -#endif - -#ifndef GLX_3DFX_multisample -#define GLX_SAMPLE_BUFFERS_3DFX 0x8050 -#define GLX_SAMPLES_3DFX 0x8051 -#endif - -#ifndef GLX_MESA_copy_sub_buffer -#endif - -#ifndef GLX_MESA_pixmap_colormap -#endif - -#ifndef GLX_MESA_release_buffers -#endif - -#ifndef GLX_MESA_set_3dfx_mode -#define GLX_3DFX_WINDOW_MODE_MESA 0x1 -#define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2 -#endif - -#ifndef GLX_SGIX_visual_select_group -#define GLX_VISUAL_SELECT_GROUP_SGIX 0x8028 -#endif - -#ifndef GLX_OML_swap_method -#define GLX_SWAP_METHOD_OML 0x8060 -#define GLX_SWAP_EXCHANGE_OML 0x8061 -#define GLX_SWAP_COPY_OML 0x8062 -#define GLX_SWAP_UNDEFINED_OML 0x8063 -#endif - -#ifndef GLX_OML_sync_control -#endif - - -/*************************************************************/ - -/* drose: glxext.h seems to have an error in that it assumes - __GLXextFuncPtr will be typedeffed if GLX_ARB_get_proc_address is - defined, which does not seem to be the case (at least it is not so - on my redhat 8.0 box). So we work around this by typedeffing it - explicitly; and we use #define in case it is already typedeffed. */ -#define __GLXextFuncPtr panda__GLXextFuncPtr -typedef void (*__GLXextFuncPtr)(); - - /* -#ifndef GLX_ARB_get_proc_address -typedef void (*__GLXextFuncPtr)(); -#endif - */ - -#ifndef GLX_SGIX_video_source -typedef XID GLXVideoSourceSGIX; -#endif - -#ifndef GLX_SGIX_fbconfig -typedef XID GLXFBConfigIDSGIX; -typedef struct __GLXFBConfigRec *GLXFBConfigSGIX; -#endif - -#ifndef GLX_SGIX_pbuffer -typedef XID GLXPbufferSGIX; -typedef struct { - int type; - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came for SendEvent request */ - X11_Display *display; /* display the event was read from */ - GLXDrawable drawable; /* i.d. of Drawable */ - int event_type; /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */ - int draw_type; /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */ - unsigned int mask; /* mask indicating which buffers are affected*/ - int x, y; - int width, height; - int count; /* if nonzero, at least this many more */ -} GLXBufferClobberEventSGIX; -#endif +/* Generated C header for: + * API: glx + * Versions considered: .* + * Versions emitted: 1\.[3-9] + * Default extensions included: glx + * Additional extensions included: _nomatch_^ + * Extensions removed: _nomatch_^ + */ #ifndef GLX_VERSION_1_3 #define GLX_VERSION_1_3 1 - /* drose: If the system glx.h isn't at least version 1.3, it won't - have defined these types, so we need to do so here in order for - the following to compile. */ -typedef struct __GLXFBConfigRec *GLXFBConfig; -typedef XID GLXPbuffer; +typedef XID GLXContextID; +typedef struct __GLXFBConfigRec *GLXFBConfig; typedef XID GLXWindow; - +typedef XID GLXPbuffer; +#define GLX_WINDOW_BIT 0x00000001 +#define GLX_PIXMAP_BIT 0x00000002 +#define GLX_PBUFFER_BIT 0x00000004 +#define GLX_RGBA_BIT 0x00000001 +#define GLX_COLOR_INDEX_BIT 0x00000002 +#define GLX_PBUFFER_CLOBBER_MASK 0x08000000 +#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001 +#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002 +#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004 +#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008 +#define GLX_AUX_BUFFERS_BIT 0x00000010 +#define GLX_DEPTH_BUFFER_BIT 0x00000020 +#define GLX_STENCIL_BUFFER_BIT 0x00000040 +#define GLX_ACCUM_BUFFER_BIT 0x00000080 +#define GLX_CONFIG_CAVEAT 0x20 +#define GLX_X_VISUAL_TYPE 0x22 +#define GLX_TRANSPARENT_TYPE 0x23 +#define GLX_TRANSPARENT_INDEX_VALUE 0x24 +#define GLX_TRANSPARENT_RED_VALUE 0x25 +#define GLX_TRANSPARENT_GREEN_VALUE 0x26 +#define GLX_TRANSPARENT_BLUE_VALUE 0x27 +#define GLX_TRANSPARENT_ALPHA_VALUE 0x28 +#define GLX_DONT_CARE 0xFFFFFFFF +#define GLX_NONE 0x8000 +#define GLX_SLOW_CONFIG 0x8001 +#define GLX_TRUE_COLOR 0x8002 +#define GLX_DIRECT_COLOR 0x8003 +#define GLX_PSEUDO_COLOR 0x8004 +#define GLX_STATIC_COLOR 0x8005 +#define GLX_GRAY_SCALE 0x8006 +#define GLX_STATIC_GRAY 0x8007 +#define GLX_TRANSPARENT_RGB 0x8008 +#define GLX_TRANSPARENT_INDEX 0x8009 +#define GLX_VISUAL_ID 0x800B +#define GLX_SCREEN 0x800C +#define GLX_NON_CONFORMANT_CONFIG 0x800D +#define GLX_DRAWABLE_TYPE 0x8010 +#define GLX_RENDER_TYPE 0x8011 +#define GLX_X_RENDERABLE 0x8012 +#define GLX_FBCONFIG_ID 0x8013 +#define GLX_RGBA_TYPE 0x8014 +#define GLX_COLOR_INDEX_TYPE 0x8015 +#define GLX_MAX_PBUFFER_WIDTH 0x8016 +#define GLX_MAX_PBUFFER_HEIGHT 0x8017 +#define GLX_MAX_PBUFFER_PIXELS 0x8018 +#define GLX_PRESERVED_CONTENTS 0x801B +#define GLX_LARGEST_PBUFFER 0x801C +#define GLX_WIDTH 0x801D +#define GLX_HEIGHT 0x801E +#define GLX_EVENT_MASK 0x801F +#define GLX_DAMAGED 0x8020 +#define GLX_SAVED 0x8021 +#define GLX_WINDOW 0x8022 +#define GLX_PBUFFER 0x8023 +#define GLX_PBUFFER_HEIGHT 0x8040 +#define GLX_PBUFFER_WIDTH 0x8041 +typedef GLXFBConfig *( *PFNGLXGETFBCONFIGSPROC) (X11_Display *dpy, int screen, int *nelements); +typedef GLXFBConfig *( *PFNGLXCHOOSEFBCONFIGPROC) (X11_Display *dpy, int screen, const int *attrib_list, int *nelements); +typedef int ( *PFNGLXGETFBCONFIGATTRIBPROC) (X11_Display *dpy, GLXFBConfig config, int attribute, int *value); +typedef XVisualInfo *( *PFNGLXGETVISUALFROMFBCONFIGPROC) (X11_Display *dpy, GLXFBConfig config); +typedef GLXWindow ( *PFNGLXCREATEWINDOWPROC) (X11_Display *dpy, GLXFBConfig config, X11_Window win, const int *attrib_list); +typedef void ( *PFNGLXDESTROYWINDOWPROC) (X11_Display *dpy, GLXWindow win); +typedef GLXPixmap ( *PFNGLXCREATEPIXMAPPROC) (X11_Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list); +typedef void ( *PFNGLXDESTROYPIXMAPPROC) (X11_Display *dpy, GLXPixmap pixmap); +typedef GLXPbuffer ( *PFNGLXCREATEPBUFFERPROC) (X11_Display *dpy, GLXFBConfig config, const int *attrib_list); +typedef void ( *PFNGLXDESTROYPBUFFERPROC) (X11_Display *dpy, GLXPbuffer pbuf); +typedef void ( *PFNGLXQUERYDRAWABLEPROC) (X11_Display *dpy, GLXDrawable draw, int attribute, unsigned int *value); +typedef GLXContext ( *PFNGLXCREATENEWCONTEXTPROC) (X11_Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct); +typedef Bool ( *PFNGLXMAKECONTEXTCURRENTPROC) (X11_Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); +typedef GLXDrawable ( *PFNGLXGETCURRENTREADDRAWABLEPROC) (void); +typedef int ( *PFNGLXQUERYCONTEXTPROC) (X11_Display *dpy, GLXContext ctx, int attribute, int *value); +typedef void ( *PFNGLXSELECTEVENTPROC) (X11_Display *dpy, GLXDrawable draw, unsigned long event_mask); +typedef void ( *PFNGLXGETSELECTEDEVENTPROC) (X11_Display *dpy, GLXDrawable draw, unsigned long *event_mask); #ifdef GLX_GLXEXT_PROTOTYPES -extern GLXFBConfig * glXGetFBConfigs (X11_Display *, int, int *); -extern GLXFBConfig * glXChooseFBConfig (X11_Display *, int, const int *, int *); -extern int glXGetFBConfigAttrib (X11_Display *, GLXFBConfig, int, int *); -extern XVisualInfo * glXGetVisualFromFBConfig (X11_Display *, GLXFBConfig); -extern GLXWindow glXCreateWindow (X11_Display *, GLXFBConfig, X11_Window, const int *); -extern void glXDestroyWindow (X11_Display *, GLXWindow); -extern GLXPixmap glXCreatePixmap (X11_Display *, GLXFBConfig, Pixmap, const int *); -extern void glXDestroyPixmap (X11_Display *, GLXPixmap); -extern GLXPbuffer glXCreatePbuffer (X11_Display *, GLXFBConfig, const int *); -extern void glXDestroyPbuffer (X11_Display *, GLXPbuffer); -extern void glXQueryDrawable (X11_Display *, GLXDrawable, int, unsigned int *); -extern GLXContext glXCreateNewContext (X11_Display *, GLXFBConfig, int, GLXContext, Bool); -extern Bool glXMakeContextCurrent (X11_Display *, GLXDrawable, GLXDrawable, GLXContext); -extern GLXDrawable glXGetCurrentReadDrawable (); -extern X11_Display * glXGetCurrentDisplay (); -extern int glXQueryContext (X11_Display *, GLXContext, int, int *); -extern void glXSelectEvent (X11_Display *, GLXDrawable, unsigned long); -extern void glXGetSelectedEvent (X11_Display *, GLXDrawable, unsigned long *); -#endif /* GLX_GLXEXT_PROTOTYPES */ - /* drose: all of the following PFN... typedefs seemed to be - incorrect. I put a * just inside the leading parenthesis. */ -typedef GLXFBConfig * (* PFNGLXGETFBCONFIGSPROC) (X11_Display *dpy, int screen, int *nelements); -typedef GLXFBConfig * (* PFNGLXCHOOSEFBCONFIGPROC) (X11_Display *dpy, int screen, const int *attrib_list, int *nelements); -typedef int (* PFNGLXGETFBCONFIGATTRIBPROC) (X11_Display *dpy, GLXFBConfig config, int attribute, int *value); -typedef XVisualInfo * (* PFNGLXGETVISUALFROMFBCONFIGPROC) (X11_Display *dpy, GLXFBConfig config); -typedef GLXWindow (* PFNGLXCREATEWINDOWPROC) (X11_Display *dpy, GLXFBConfig config, X11_Window win, const int *attrib_list); -typedef void (* PFNGLXDESTROYWINDOWPROC) (X11_Display *dpy, GLXWindow win); -typedef GLXPixmap (* PFNGLXCREATEPIXMAPPROC) (X11_Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list); -typedef void (* PFNGLXDESTROYPIXMAPPROC) (X11_Display *dpy, GLXPixmap pixmap); -typedef GLXPbuffer (* PFNGLXCREATEPBUFFERPROC) (X11_Display *dpy, GLXFBConfig config, const int *attrib_list); -typedef void (* PFNGLXDESTROYPBUFFERPROC) (X11_Display *dpy, GLXPbuffer pbuf); -typedef void (* PFNGLXQUERYDRAWABLEPROC) (X11_Display *dpy, GLXDrawable draw, int attribute, unsigned int *value); -typedef GLXContext (* PFNGLXCREATENEWCONTEXTPROC) (X11_Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct); -typedef Bool (* PFNGLXMAKECONTEXTCURRENTPROC) (X11_Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); -typedef GLXDrawable (* PFNGLXGETCURRENTREADDRAWABLEPROC) (); -typedef X11_Display * (* PFNGLXGETCURRENTDISPLAYPROC) (); -typedef int (* PFNGLXQUERYCONTEXTPROC) (X11_Display *dpy, GLXContext ctx, int attribute, int *value); -typedef void (* PFNGLXSELECTEVENTPROC) (X11_Display *dpy, GLXDrawable draw, unsigned long event_mask); -typedef void (* PFNGLXGETSELECTEDEVENTPROC) (X11_Display *dpy, GLXDrawable draw, unsigned long *event_mask); +GLXFBConfig *glXGetFBConfigs (X11_Display *dpy, int screen, int *nelements); +GLXFBConfig *glXChooseFBConfig (X11_Display *dpy, int screen, const int *attrib_list, int *nelements); +int glXGetFBConfigAttrib (X11_Display *dpy, GLXFBConfig config, int attribute, int *value); +XVisualInfo *glXGetVisualFromFBConfig (X11_Display *dpy, GLXFBConfig config); +GLXWindow glXCreateWindow (X11_Display *dpy, GLXFBConfig config, X11_Window win, const int *attrib_list); +void glXDestroyWindow (X11_Display *dpy, GLXWindow win); +GLXPixmap glXCreatePixmap (X11_Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list); +void glXDestroyPixmap (X11_Display *dpy, GLXPixmap pixmap); +GLXPbuffer glXCreatePbuffer (X11_Display *dpy, GLXFBConfig config, const int *attrib_list); +void glXDestroyPbuffer (X11_Display *dpy, GLXPbuffer pbuf); +void glXQueryDrawable (X11_Display *dpy, GLXDrawable draw, int attribute, unsigned int *value); +GLXContext glXCreateNewContext (X11_Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct); +Bool glXMakeContextCurrent (X11_Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); +GLXDrawable glXGetCurrentReadDrawable (void); +int glXQueryContext (X11_Display *dpy, GLXContext ctx, int attribute, int *value); +void glXSelectEvent (X11_Display *dpy, GLXDrawable draw, unsigned long event_mask); +void glXGetSelectedEvent (X11_Display *dpy, GLXDrawable draw, unsigned long *event_mask); #endif +#endif /* GLX_VERSION_1_3 */ #ifndef GLX_VERSION_1_4 #define GLX_VERSION_1_4 1 +typedef void ( *__GLXextFuncPtr)(void); +#define GLX_SAMPLE_BUFFERS 100000 +#define GLX_SAMPLES 100001 +typedef __GLXextFuncPtr ( *PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName); #ifdef GLX_GLXEXT_PROTOTYPES -extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName); +__GLXextFuncPtr glXGetProcAddress (const GLubyte *procName); #endif +#endif /* GLX_VERSION_1_4 */ + +#ifndef GLX_ARB_create_context +#define GLX_ARB_create_context 1 +#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 +#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define GLX_CONTEXT_FLAGS_ARB 0x2094 +typedef GLXContext ( *PFNGLXCREATECONTEXTATTRIBSARBPROC) (X11_Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); +#ifdef GLX_GLXEXT_PROTOTYPES +GLXContext glXCreateContextAttribsARB (X11_Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); +#endif +#endif /* GLX_ARB_create_context */ + +#ifndef GLX_ARB_create_context_profile +#define GLX_ARB_create_context_profile 1 +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#endif /* GLX_ARB_create_context_profile */ + +#ifndef GLX_ARB_create_context_robustness +#define GLX_ARB_create_context_robustness 1 +#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 +#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252 +#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 +#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261 +#endif /* GLX_ARB_create_context_robustness */ + +#ifndef GLX_ARB_fbconfig_float +#define GLX_ARB_fbconfig_float 1 +#define GLX_RGBA_FLOAT_TYPE_ARB 0x20B9 +#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004 +#endif /* GLX_ARB_fbconfig_float */ + +#ifndef GLX_ARB_framebuffer_sRGB +#define GLX_ARB_framebuffer_sRGB 1 +#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2 +#endif /* GLX_ARB_framebuffer_sRGB */ #ifndef GLX_ARB_get_proc_address #define GLX_ARB_get_proc_address 1 +typedef __GLXextFuncPtr ( *PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName); #ifdef GLX_GLXEXT_PROTOTYPES -extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName); +__GLXextFuncPtr glXGetProcAddressARB (const GLubyte *procName); #endif +#endif /* GLX_ARB_get_proc_address */ #ifndef GLX_ARB_multisample #define GLX_ARB_multisample 1 -#endif +#define GLX_SAMPLE_BUFFERS_ARB 100000 +#define GLX_SAMPLES_ARB 100001 +#endif /* GLX_ARB_multisample */ -#ifndef GLX_SGIS_multisample -#define GLX_SGIS_multisample 1 +#ifndef GLX_ARB_robustness_application_isolation +#define GLX_ARB_robustness_application_isolation 1 +#define GLX_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008 +#endif /* GLX_ARB_robustness_application_isolation */ + +#ifndef GLX_ARB_robustness_share_group_isolation +#define GLX_ARB_robustness_share_group_isolation 1 +#endif /* GLX_ARB_robustness_share_group_isolation */ + +#ifndef GLX_ARB_vertex_buffer_object +#define GLX_ARB_vertex_buffer_object 1 +#define GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB 0x2095 +#endif /* GLX_ARB_vertex_buffer_object */ + +#ifndef GLX_3DFX_multisample +#define GLX_3DFX_multisample 1 +#define GLX_SAMPLE_BUFFERS_3DFX 0x8050 +#define GLX_SAMPLES_3DFX 0x8051 +#endif /* GLX_3DFX_multisample */ + +#ifndef GLX_AMD_gpu_association +#define GLX_AMD_gpu_association 1 +#define GLX_GPU_VENDOR_AMD 0x1F00 +#define GLX_GPU_RENDERER_STRING_AMD 0x1F01 +#define GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 +#define GLX_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2 +#define GLX_GPU_RAM_AMD 0x21A3 +#define GLX_GPU_CLOCK_AMD 0x21A4 +#define GLX_GPU_NUM_PIPES_AMD 0x21A5 +#define GLX_GPU_NUM_SIMD_AMD 0x21A6 +#define GLX_GPU_NUM_RB_AMD 0x21A7 +#define GLX_GPU_NUM_SPI_AMD 0x21A8 +#endif /* GLX_AMD_gpu_association */ + +#ifndef GLX_EXT_buffer_age +#define GLX_EXT_buffer_age 1 +#define GLX_BACK_BUFFER_AGE_EXT 0x20F4 +#endif /* GLX_EXT_buffer_age */ + +#ifndef GLX_EXT_create_context_es2_profile +#define GLX_EXT_create_context_es2_profile 1 +#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 +#endif /* GLX_EXT_create_context_es2_profile */ + +#ifndef GLX_EXT_create_context_es_profile +#define GLX_EXT_create_context_es_profile 1 +#define GLX_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 +#endif /* GLX_EXT_create_context_es_profile */ + +#ifndef GLX_EXT_fbconfig_packed_float +#define GLX_EXT_fbconfig_packed_float 1 +#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 +#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008 +#endif /* GLX_EXT_fbconfig_packed_float */ + +#ifndef GLX_EXT_framebuffer_sRGB +#define GLX_EXT_framebuffer_sRGB 1 +#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 +#endif /* GLX_EXT_framebuffer_sRGB */ + +#ifndef GLX_EXT_stereo_tree +#define GLX_EXT_stereo_tree 1 +typedef struct { + int type; + unsigned long serial; + Bool send_event; + X11_Display *display; + int extension; + int evtype; + GLXDrawable window; + Bool stereo_tree; +} GLXStereoNotifyEventEXT; +#define GLX_STEREO_TREE_EXT 0x20F5 +#define GLX_STEREO_NOTIFY_MASK_EXT 0x00000001 +#define GLX_STEREO_NOTIFY_EXT 0x00000000 +#endif /* GLX_EXT_stereo_tree */ + +#ifndef GLX_EXT_swap_control +#define GLX_EXT_swap_control 1 +#define GLX_SWAP_INTERVAL_EXT 0x20F1 +#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2 +typedef void ( *PFNGLXSWAPINTERVALEXTPROC) (X11_Display *dpy, GLXDrawable drawable, int interval); +#ifdef GLX_GLXEXT_PROTOTYPES +void glXSwapIntervalEXT (X11_Display *dpy, GLXDrawable drawable, int interval); #endif +#endif /* GLX_EXT_swap_control */ + +#ifndef GLX_EXT_swap_control_tear +#define GLX_EXT_swap_control_tear 1 +#define GLX_LATE_SWAPS_TEAR_EXT 0x20F3 +#endif /* GLX_EXT_swap_control_tear */ + +#ifndef GLX_EXT_texture_from_pixmap +#define GLX_EXT_texture_from_pixmap 1 +#define GLX_TEXTURE_1D_BIT_EXT 0x00000001 +#define GLX_TEXTURE_2D_BIT_EXT 0x00000002 +#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004 +#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0 +#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1 +#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2 +#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3 +#define GLX_Y_INVERTED_EXT 0x20D4 +#define GLX_TEXTURE_FORMAT_EXT 0x20D5 +#define GLX_TEXTURE_TARGET_EXT 0x20D6 +#define GLX_MIPMAP_TEXTURE_EXT 0x20D7 +#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8 +#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9 +#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA +#define GLX_TEXTURE_1D_EXT 0x20DB +#define GLX_TEXTURE_2D_EXT 0x20DC +#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD +#define GLX_FRONT_LEFT_EXT 0x20DE +#define GLX_FRONT_RIGHT_EXT 0x20DF +#define GLX_BACK_LEFT_EXT 0x20E0 +#define GLX_BACK_RIGHT_EXT 0x20E1 +#define GLX_FRONT_EXT 0x20DE +#define GLX_BACK_EXT 0x20E0 +#define GLX_AUX0_EXT 0x20E2 +#define GLX_AUX1_EXT 0x20E3 +#define GLX_AUX2_EXT 0x20E4 +#define GLX_AUX3_EXT 0x20E5 +#define GLX_AUX4_EXT 0x20E6 +#define GLX_AUX5_EXT 0x20E7 +#define GLX_AUX6_EXT 0x20E8 +#define GLX_AUX7_EXT 0x20E9 +#define GLX_AUX8_EXT 0x20EA +#define GLX_AUX9_EXT 0x20EB +typedef void ( *PFNGLXBINDTEXIMAGEEXTPROC) (X11_Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list); +typedef void ( *PFNGLXRELEASETEXIMAGEEXTPROC) (X11_Display *dpy, GLXDrawable drawable, int buffer); +#ifdef GLX_GLXEXT_PROTOTYPES +void glXBindTexImageEXT (X11_Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list); +void glXReleaseTexImageEXT (X11_Display *dpy, GLXDrawable drawable, int buffer); +#endif +#endif /* GLX_EXT_texture_from_pixmap */ #ifndef GLX_EXT_visual_info #define GLX_EXT_visual_info 1 -#endif +#define GLX_X_VISUAL_TYPE_EXT 0x22 +#define GLX_TRANSPARENT_TYPE_EXT 0x23 +#define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24 +#define GLX_TRANSPARENT_RED_VALUE_EXT 0x25 +#define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26 +#define GLX_TRANSPARENT_BLUE_VALUE_EXT 0x27 +#define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28 +#define GLX_NONE_EXT 0x8000 +#define GLX_TRUE_COLOR_EXT 0x8002 +#define GLX_DIRECT_COLOR_EXT 0x8003 +#define GLX_PSEUDO_COLOR_EXT 0x8004 +#define GLX_STATIC_COLOR_EXT 0x8005 +#define GLX_GRAY_SCALE_EXT 0x8006 +#define GLX_STATIC_GRAY_EXT 0x8007 +#define GLX_TRANSPARENT_RGB_EXT 0x8008 +#define GLX_TRANSPARENT_INDEX_EXT 0x8009 +#endif /* GLX_EXT_visual_info */ -#ifndef GLX_SGI_swap_control -#define GLX_SGI_swap_control 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern int glXSwapIntervalSGI (int); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef int (* PFNGLXSWAPINTERVALSGIPROC) (int interval); -#endif - -#ifndef GLX_SGI_video_sync -#define GLX_SGI_video_sync 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern int glXGetVideoSyncSGI (unsigned int *); -extern int glXWaitVideoSyncSGI (int, int, unsigned int *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef int (* PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count); -typedef int (* PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count); -#endif - -#ifndef GLX_SGI_make_current_read -#define GLX_SGI_make_current_read 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern Bool glXMakeCurrentReadSGI (X11_Display *, GLXDrawable, GLXDrawable, GLXContext); -extern GLXDrawable glXGetCurrentReadDrawableSGI (); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Bool (* PFNGLXMAKECURRENTREADSGIPROC) (X11_Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); -typedef GLXDrawable (* PFNGLXGETCURRENTREADDRAWABLESGIPROC) (); -#endif - -#ifndef GLX_SGIX_video_source -#define GLX_SGIX_video_source 1 -#ifdef _VL_H -#ifdef GLX_GLXEXT_PROTOTYPES -extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (X11_Display *, int, VLServer, VLPath, int, VLNode); -extern void glXDestroyGLXVideoSourceSGIX (X11_Display *, GLXVideoSourceSGIX); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef GLXVideoSourceSGIX (* PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (X11_Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode); -typedef void (* PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (X11_Display *dpy, GLXVideoSourceSGIX glxvideosource); -#endif - -#endif /* _VL_H */ #ifndef GLX_EXT_visual_rating #define GLX_EXT_visual_rating 1 -#endif +#define GLX_VISUAL_CAVEAT_EXT 0x20 +#define GLX_SLOW_VISUAL_EXT 0x8001 +#define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D +#endif /* GLX_EXT_visual_rating */ -#ifndef GLX_SGIX_fbconfig -#define GLX_SGIX_fbconfig 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern int glXGetFBConfigAttribSGIX (X11_Display *, GLXFBConfigSGIX, int, int *); -extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (X11_Display *, int, int *, int *); -extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (X11_Display *, GLXFBConfigSGIX, Pixmap); -extern GLXContext glXCreateContextWithConfigSGIX (X11_Display *, GLXFBConfigSGIX, int, GLXContext, Bool); -extern XVisualInfo * glXGetVisualFromFBConfigSGIX (X11_Display *, GLXFBConfigSGIX); -extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (X11_Display *, XVisualInfo *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef int (* PFNGLXGETFBCONFIGATTRIBSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, int attribute, int *value); -typedef GLXFBConfigSGIX * (* PFNGLXCHOOSEFBCONFIGSGIXPROC) (X11_Display *dpy, int screen, int *attrib_list, int *nelements); -typedef GLXPixmap (* PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap); -typedef GLXContext (* PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct); -typedef XVisualInfo * (* PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config); -typedef GLXFBConfigSGIX (* PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (X11_Display *dpy, XVisualInfo *vis); -#endif +#ifndef GLX_INTEL_swap_event +#define GLX_INTEL_swap_event 1 +#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK 0x04000000 +#define GLX_EXCHANGE_COMPLETE_INTEL 0x8180 +#define GLX_COPY_COMPLETE_INTEL 0x8181 +#define GLX_FLIP_COMPLETE_INTEL 0x8182 +#endif /* GLX_INTEL_swap_event */ -#ifndef GLX_SGIX_pbuffer -#define GLX_SGIX_pbuffer 1 +#ifndef GLX_MESA_agp_offset +#define GLX_MESA_agp_offset 1 +typedef unsigned int ( *PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer); #ifdef GLX_GLXEXT_PROTOTYPES -extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (X11_Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *); -extern void glXDestroyGLXPbufferSGIX (X11_Display *, GLXPbufferSGIX); -extern int glXQueryGLXPbufferSGIX (X11_Display *, GLXPbufferSGIX, int, unsigned int *); -extern void glXSelectEventSGIX (X11_Display *, GLXDrawable, unsigned long); -extern void glXGetSelectedEventSGIX (X11_Display *, GLXDrawable, unsigned long *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef GLXPbufferSGIX (* PFNGLXCREATEGLXPBUFFERSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list); -typedef void (* PFNGLXDESTROYGLXPBUFFERSGIXPROC) (X11_Display *dpy, GLXPbufferSGIX pbuf); -typedef int (* PFNGLXQUERYGLXPBUFFERSGIXPROC) (X11_Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); -typedef void (* PFNGLXSELECTEVENTSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, unsigned long mask); -typedef void (* PFNGLXGETSELECTEDEVENTSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, unsigned long *mask); -#endif - -#ifndef GLX_SGI_cushion -#define GLX_SGI_cushion 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern void glXCushionSGI (X11_Display *, X11_Window, float); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef void (* PFNGLXCUSHIONSGIPROC) (X11_Display *dpy, X11_Window window, float cushion); -#endif - -#ifndef GLX_SGIX_video_resize -#define GLX_SGIX_video_resize 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern int glXBindChannelToWindowSGIX (X11_Display *, int, int, X11_Window); -extern int glXChannelRectSGIX (X11_Display *, int, int, int, int, int, int); -extern int glXQueryChannelRectSGIX (X11_Display *, int, int, int *, int *, int *, int *); -extern int glXQueryChannelDeltasSGIX (X11_Display *, int, int, int *, int *, int *, int *); -extern int glXChannelRectSyncSGIX (X11_Display *, int, int, GLenum); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef int (* PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (X11_Display *display, int screen, int channel, X11_Window window); -typedef int (* PFNGLXCHANNELRECTSGIXPROC) (X11_Display *display, int screen, int channel, int x, int y, int w, int h); -typedef int (* PFNGLXQUERYCHANNELRECTSGIXPROC) (X11_Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh); -typedef int (* PFNGLXQUERYCHANNELDELTASSGIXPROC) (X11_Display *display, int screen, int channel, int *x, int *y, int *w, int *h); -typedef int (* PFNGLXCHANNELRECTSYNCSGIXPROC) (X11_Display *display, int screen, int channel, GLenum synctype); -#endif - -#ifndef GLX_SGIX_dmbuffer -#define GLX_SGIX_dmbuffer 1 -#ifdef _DM_BUFFER_H_ -#ifdef GLX_GLXEXT_PROTOTYPES -extern Bool glXAssociateDMPbufferSGIX (X11_Display *, GLXPbufferSGIX, DMparams *, DMbuffer); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Bool (* PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (X11_Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer); -#endif - -#endif /* _DM_BUFFER_H_ */ -#ifndef GLX_SGIX_swap_group -#define GLX_SGIX_swap_group 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern void glXJoinSwapGroupSGIX (X11_Display *, GLXDrawable, GLXDrawable); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef void (* PFNGLXJOINSWAPGROUPSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, GLXDrawable member); -#endif - -#ifndef GLX_SGIX_swap_barrier -#define GLX_SGIX_swap_barrier 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern void glXBindSwapBarrierSGIX (X11_Display *, GLXDrawable, int); -extern Bool glXQueryMaxSwapBarriersSGIX (X11_Display *, int, int *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef void (* PFNGLXBINDSWAPBARRIERSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, int barrier); -typedef Bool (* PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (X11_Display *dpy, int screen, int *max); -#endif - -#ifndef GLX_SUN_get_transparent_index -#define GLX_SUN_get_transparent_index 1 -#ifdef GLX_GLXEXT_PROTOTYPES -extern Status glXGetTransparentIndexSUN (X11_Display *, X11_Window, X11_Window, long *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Status (* PFNGLXGETTRANSPARENTINDEXSUNPROC) (X11_Display *dpy, X11_Window overlay, X11_Window underlay, long *pTransparentIndex); +unsigned int glXGetAGPOffsetMESA (const void *pointer); #endif +#endif /* GLX_MESA_agp_offset */ #ifndef GLX_MESA_copy_sub_buffer #define GLX_MESA_copy_sub_buffer 1 +typedef void ( *PFNGLXCOPYSUBBUFFERMESAPROC) (X11_Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); #ifdef GLX_GLXEXT_PROTOTYPES -extern void glXCopySubBufferMESA (X11_Display *, GLXDrawable, int, int, int, int); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef void (* PFNGLXCOPYSUBBUFFERMESAPROC) (X11_Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); +void glXCopySubBufferMESA (X11_Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); #endif +#endif /* GLX_MESA_copy_sub_buffer */ #ifndef GLX_MESA_pixmap_colormap #define GLX_MESA_pixmap_colormap 1 +typedef GLXPixmap ( *PFNGLXCREATEGLXPIXMAPMESAPROC) (X11_Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap); #ifdef GLX_GLXEXT_PROTOTYPES -extern GLXPixmap glXCreateGLXPixmapMESA (X11_Display *, XVisualInfo *, Pixmap, Colormap); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef GLXPixmap (* PFNGLXCREATEGLXPIXMAPMESAPROC) (X11_Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap); +GLXPixmap glXCreateGLXPixmapMESA (X11_Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap); #endif +#endif /* GLX_MESA_pixmap_colormap */ + +#ifndef GLX_MESA_query_renderer +#define GLX_MESA_query_renderer 1 +#define GLX_RENDERER_VENDOR_ID_MESA 0x8183 +#define GLX_RENDERER_DEVICE_ID_MESA 0x8184 +#define GLX_RENDERER_VERSION_MESA 0x8185 +#define GLX_RENDERER_ACCELERATED_MESA 0x8186 +#define GLX_RENDERER_VIDEO_MEMORY_MESA 0x8187 +#define GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA 0x8188 +#define GLX_RENDERER_PREFERRED_PROFILE_MESA 0x8189 +#define GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA 0x818A +#define GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA 0x818B +#define GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA 0x818C +#define GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA 0x818D +#define GLX_RENDERER_ID_MESA 0x818E +typedef Bool ( *PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int *value); +typedef const char *( *PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC) (int attribute); +typedef Bool ( *PFNGLXQUERYRENDERERINTEGERMESAPROC) (X11_Display *dpy, int screen, int renderer, int attribute, unsigned int *value); +typedef const char *( *PFNGLXQUERYRENDERERSTRINGMESAPROC) (X11_Display *dpy, int screen, int renderer, int attribute); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXQueryCurrentRendererIntegerMESA (int attribute, unsigned int *value); +const char *glXQueryCurrentRendererStringMESA (int attribute); +Bool glXQueryRendererIntegerMESA (X11_Display *dpy, int screen, int renderer, int attribute, unsigned int *value); +const char *glXQueryRendererStringMESA (X11_Display *dpy, int screen, int renderer, int attribute); +#endif +#endif /* GLX_MESA_query_renderer */ #ifndef GLX_MESA_release_buffers #define GLX_MESA_release_buffers 1 +typedef Bool ( *PFNGLXRELEASEBUFFERSMESAPROC) (X11_Display *dpy, GLXDrawable drawable); #ifdef GLX_GLXEXT_PROTOTYPES -extern Bool glXReleaseBuffersMESA (X11_Display *, GLXDrawable); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Bool (* PFNGLXRELEASEBUFFERSMESAPROC) (X11_Display *dpy, GLXDrawable drawable); +Bool glXReleaseBuffersMESA (X11_Display *dpy, GLXDrawable drawable); #endif +#endif /* GLX_MESA_release_buffers */ #ifndef GLX_MESA_set_3dfx_mode #define GLX_MESA_set_3dfx_mode 1 +#define GLX_3DFX_WINDOW_MODE_MESA 0x1 +#define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2 +typedef Bool ( *PFNGLXSET3DFXMODEMESAPROC) (int mode); #ifdef GLX_GLXEXT_PROTOTYPES -extern Bool glXSet3DfxModeMESA (int); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Bool (* PFNGLXSET3DFXMODEMESAPROC) (int mode); +Bool glXSet3DfxModeMESA (int mode); #endif +#endif /* GLX_MESA_set_3dfx_mode */ -#ifndef GLX_SGIX_visual_select_group -#define GLX_SGIX_visual_select_group 1 +#ifndef GLX_NV_copy_image +#define GLX_NV_copy_image 1 +typedef void ( *PFNGLXCOPYIMAGESUBDATANVPROC) (X11_Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); +#ifdef GLX_GLXEXT_PROTOTYPES +void glXCopyImageSubDataNV (X11_Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); #endif +#endif /* GLX_NV_copy_image */ + +#ifndef GLX_NV_delay_before_swap +#define GLX_NV_delay_before_swap 1 +typedef Bool ( *PFNGLXDELAYBEFORESWAPNVPROC) (X11_Display *dpy, GLXDrawable drawable, GLfloat seconds); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXDelayBeforeSwapNV (X11_Display *dpy, GLXDrawable drawable, GLfloat seconds); +#endif +#endif /* GLX_NV_delay_before_swap */ + +#ifndef GLX_NV_float_buffer +#define GLX_NV_float_buffer 1 +#define GLX_FLOAT_COMPONENTS_NV 0x20B0 +#endif /* GLX_NV_float_buffer */ + +#ifndef GLX_NV_multisample_coverage +#define GLX_NV_multisample_coverage 1 +#define GLX_COVERAGE_SAMPLES_NV 100001 +#define GLX_COLOR_SAMPLES_NV 0x20B3 +#endif /* GLX_NV_multisample_coverage */ + +#ifndef GLX_NV_present_video +#define GLX_NV_present_video 1 +#define GLX_NUM_VIDEO_SLOTS_NV 0x20F0 +typedef unsigned int *( *PFNGLXENUMERATEVIDEODEVICESNVPROC) (X11_Display *dpy, int screen, int *nelements); +typedef int ( *PFNGLXBINDVIDEODEVICENVPROC) (X11_Display *dpy, unsigned int video_slot, unsigned int video_device, const int *attrib_list); +#ifdef GLX_GLXEXT_PROTOTYPES +unsigned int *glXEnumerateVideoDevicesNV (X11_Display *dpy, int screen, int *nelements); +int glXBindVideoDeviceNV (X11_Display *dpy, unsigned int video_slot, unsigned int video_device, const int *attrib_list); +#endif +#endif /* GLX_NV_present_video */ + +#ifndef GLX_NV_swap_group +#define GLX_NV_swap_group 1 +typedef Bool ( *PFNGLXJOINSWAPGROUPNVPROC) (X11_Display *dpy, GLXDrawable drawable, GLuint group); +typedef Bool ( *PFNGLXBINDSWAPBARRIERNVPROC) (X11_Display *dpy, GLuint group, GLuint barrier); +typedef Bool ( *PFNGLXQUERYSWAPGROUPNVPROC) (X11_Display *dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier); +typedef Bool ( *PFNGLXQUERYMAXSWAPGROUPSNVPROC) (X11_Display *dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers); +typedef Bool ( *PFNGLXQUERYFRAMECOUNTNVPROC) (X11_Display *dpy, int screen, GLuint *count); +typedef Bool ( *PFNGLXRESETFRAMECOUNTNVPROC) (X11_Display *dpy, int screen); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXJoinSwapGroupNV (X11_Display *dpy, GLXDrawable drawable, GLuint group); +Bool glXBindSwapBarrierNV (X11_Display *dpy, GLuint group, GLuint barrier); +Bool glXQuerySwapGroupNV (X11_Display *dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier); +Bool glXQueryMaxSwapGroupsNV (X11_Display *dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers); +Bool glXQueryFrameCountNV (X11_Display *dpy, int screen, GLuint *count); +Bool glXResetFrameCountNV (X11_Display *dpy, int screen); +#endif +#endif /* GLX_NV_swap_group */ + +#ifndef GLX_NV_video_capture +#define GLX_NV_video_capture 1 +typedef XID GLXVideoCaptureDeviceNV; +#define GLX_DEVICE_ID_NV 0x20CD +#define GLX_UNIQUE_ID_NV 0x20CE +#define GLX_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF +typedef int ( *PFNGLXBINDVIDEOCAPTUREDEVICENVPROC) (X11_Display *dpy, unsigned int video_capture_slot, GLXVideoCaptureDeviceNV device); +typedef GLXVideoCaptureDeviceNV *( *PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC) (X11_Display *dpy, int screen, int *nelements); +typedef void ( *PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC) (X11_Display *dpy, GLXVideoCaptureDeviceNV device); +typedef int ( *PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC) (X11_Display *dpy, GLXVideoCaptureDeviceNV device, int attribute, int *value); +typedef void ( *PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (X11_Display *dpy, GLXVideoCaptureDeviceNV device); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXBindVideoCaptureDeviceNV (X11_Display *dpy, unsigned int video_capture_slot, GLXVideoCaptureDeviceNV device); +GLXVideoCaptureDeviceNV *glXEnumerateVideoCaptureDevicesNV (X11_Display *dpy, int screen, int *nelements); +void glXLockVideoCaptureDeviceNV (X11_Display *dpy, GLXVideoCaptureDeviceNV device); +int glXQueryVideoCaptureDeviceNV (X11_Display *dpy, GLXVideoCaptureDeviceNV device, int attribute, int *value); +void glXReleaseVideoCaptureDeviceNV (X11_Display *dpy, GLXVideoCaptureDeviceNV device); +#endif +#endif /* GLX_NV_video_capture */ + +#ifndef GLX_NV_video_output +#define GLX_NV_video_output 1 +typedef unsigned int GLXVideoDeviceNV; +#define GLX_VIDEO_OUT_COLOR_NV 0x20C3 +#define GLX_VIDEO_OUT_ALPHA_NV 0x20C4 +#define GLX_VIDEO_OUT_DEPTH_NV 0x20C5 +#define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 +#define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 +#define GLX_VIDEO_OUT_FRAME_NV 0x20C8 +#define GLX_VIDEO_OUT_FIELD_1_NV 0x20C9 +#define GLX_VIDEO_OUT_FIELD_2_NV 0x20CA +#define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB +#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC +typedef int ( *PFNGLXGETVIDEODEVICENVPROC) (X11_Display *dpy, int screen, int numVideoDevices, GLXVideoDeviceNV *pVideoDevice); +typedef int ( *PFNGLXRELEASEVIDEODEVICENVPROC) (X11_Display *dpy, int screen, GLXVideoDeviceNV VideoDevice); +typedef int ( *PFNGLXBINDVIDEOIMAGENVPROC) (X11_Display *dpy, GLXVideoDeviceNV VideoDevice, GLXPbuffer pbuf, int iVideoBuffer); +typedef int ( *PFNGLXRELEASEVIDEOIMAGENVPROC) (X11_Display *dpy, GLXPbuffer pbuf); +typedef int ( *PFNGLXSENDPBUFFERTOVIDEONVPROC) (X11_Display *dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock); +typedef int ( *PFNGLXGETVIDEOINFONVPROC) (X11_Display *dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXGetVideoDeviceNV (X11_Display *dpy, int screen, int numVideoDevices, GLXVideoDeviceNV *pVideoDevice); +int glXReleaseVideoDeviceNV (X11_Display *dpy, int screen, GLXVideoDeviceNV VideoDevice); +int glXBindVideoImageNV (X11_Display *dpy, GLXVideoDeviceNV VideoDevice, GLXPbuffer pbuf, int iVideoBuffer); +int glXReleaseVideoImageNV (X11_Display *dpy, GLXPbuffer pbuf); +int glXSendPbufferToVideoNV (X11_Display *dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock); +int glXGetVideoInfoNV (X11_Display *dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); +#endif +#endif /* GLX_NV_video_output */ #ifndef GLX_OML_swap_method #define GLX_OML_swap_method 1 -#endif +#define GLX_SWAP_METHOD_OML 0x8060 +#define GLX_SWAP_EXCHANGE_OML 0x8061 +#define GLX_SWAP_COPY_OML 0x8062 +#define GLX_SWAP_UNDEFINED_OML 0x8063 +#endif /* GLX_OML_swap_method */ #ifndef GLX_OML_sync_control #define GLX_OML_sync_control 1 -#if defined(__STDC_VERSION__) -#if __STDC_VERSION__ >= 199901L -/* Include ISO C99 integer types for OML_sync_control; need a better test */ +#ifndef GLEXT_64_TYPES_DEFINED +/* This code block is duplicated in glext.h, so must be protected */ +#define GLEXT_64_TYPES_DEFINED +/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ +/* (as used in the GLX_OML_sync_control extension). */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#include +#elif defined(__sun__) || defined(__digital__) +#include +#if defined(__STDC__) +#if defined(__arch64__) || defined(_LP64) +typedef long int int64_t; +typedef unsigned long int uint64_t; +#else +typedef long long int int64_t; +typedef unsigned long long int uint64_t; +#endif /* __arch64__ */ +#endif /* __STDC__ */ +#elif defined( __VMS ) || defined(__sgi) +#include +#elif defined(__SCO__) || defined(__USLC__) +#include +#elif defined(__UNIXOS2__) || defined(__SOL64__) +typedef long int int32_t; +typedef long long int int64_t; +typedef unsigned long long int uint64_t; +#elif defined(_WIN32) && defined(__GNUC__) +#include +#elif defined(_WIN32) +typedef __int32 int32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +/* Fallback if nothing above works */ #include - -#ifdef GLX_GLXEXT_PROTOTYPES -extern Bool glXGetSyncValuesOML (X11_Display *, GLXDrawable, int64_t *, int64_t *, int64_t *); -extern Bool glXGetMscRateOML (X11_Display *, GLXDrawable, int32_t *, int32_t *); -extern int64_t glXSwapBuffersMscOML (X11_Display *, GLXDrawable, int64_t, int64_t, int64_t); -extern Bool glXWaitForMscOML (X11_Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *); -extern Bool glXWaitForSbcOML (X11_Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *); -#endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Bool (* PFNGLXGETSYNCVALUESOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc); -typedef Bool (* PFNGLXGETMSCRATEOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); -typedef int64_t (* PFNGLXSWAPBUFFERSMSCOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder); -typedef Bool (* PFNGLXWAITFORMSCOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc); -typedef Bool (* PFNGLXWAITFORSBCOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc); #endif +#endif +typedef Bool ( *PFNGLXGETSYNCVALUESOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc); +typedef Bool ( *PFNGLXGETMSCRATEOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); +typedef int64_t ( *PFNGLXSWAPBUFFERSMSCOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder); +typedef Bool ( *PFNGLXWAITFORMSCOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc); +typedef Bool ( *PFNGLXWAITFORSBCOMLPROC) (X11_Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXGetSyncValuesOML (X11_Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc); +Bool glXGetMscRateOML (X11_Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); +int64_t glXSwapBuffersMscOML (X11_Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder); +Bool glXWaitForMscOML (X11_Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc); +Bool glXWaitForSbcOML (X11_Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc); +#endif +#endif /* GLX_OML_sync_control */ -#endif /* C99 version test */ -#endif /* STDC test */ +#ifndef GLX_SGIS_blended_overlay +#define GLX_SGIS_blended_overlay 1 +#define GLX_BLENDED_RGBA_SGIS 0x8025 +#endif /* GLX_SGIS_blended_overlay */ + +#ifndef GLX_SGIS_multisample +#define GLX_SGIS_multisample 1 +#define GLX_SAMPLE_BUFFERS_SGIS 100000 +#define GLX_SAMPLES_SGIS 100001 +#endif /* GLX_SGIS_multisample */ + +#ifndef GLX_SGIS_shared_multisample +#define GLX_SGIS_shared_multisample 1 +#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026 +#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027 +#endif /* GLX_SGIS_shared_multisample */ + +#ifndef GLX_SGIX_dmbuffer +#define GLX_SGIX_dmbuffer 1 +typedef XID GLXPbufferSGIX; +#ifdef _DM_BUFFER_H_ +#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX 0x8024 +typedef Bool ( *PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (X11_Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXAssociateDMPbufferSGIX (X11_Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer); +#endif +#endif /* _DM_BUFFER_H_ */ +#endif /* GLX_SGIX_dmbuffer */ + +#ifndef GLX_SGIX_fbconfig +#define GLX_SGIX_fbconfig 1 +typedef struct __GLXFBConfigRec *GLXFBConfigSGIX; +#define GLX_WINDOW_BIT_SGIX 0x00000001 +#define GLX_PIXMAP_BIT_SGIX 0x00000002 +#define GLX_RGBA_BIT_SGIX 0x00000001 +#define GLX_COLOR_INDEX_BIT_SGIX 0x00000002 +#define GLX_DRAWABLE_TYPE_SGIX 0x8010 +#define GLX_RENDER_TYPE_SGIX 0x8011 +#define GLX_X_RENDERABLE_SGIX 0x8012 +#define GLX_FBCONFIG_ID_SGIX 0x8013 +#define GLX_RGBA_TYPE_SGIX 0x8014 +#define GLX_COLOR_INDEX_TYPE_SGIX 0x8015 +typedef int ( *PFNGLXGETFBCONFIGATTRIBSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, int attribute, int *value); +typedef GLXFBConfigSGIX *( *PFNGLXCHOOSEFBCONFIGSGIXPROC) (X11_Display *dpy, int screen, int *attrib_list, int *nelements); +typedef GLXPixmap ( *PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap); +typedef GLXContext ( *PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct); +typedef XVisualInfo *( *PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config); +typedef GLXFBConfigSGIX ( *PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (X11_Display *dpy, XVisualInfo *vis); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXGetFBConfigAttribSGIX (X11_Display *dpy, GLXFBConfigSGIX config, int attribute, int *value); +GLXFBConfigSGIX *glXChooseFBConfigSGIX (X11_Display *dpy, int screen, int *attrib_list, int *nelements); +GLXPixmap glXCreateGLXPixmapWithConfigSGIX (X11_Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap); +GLXContext glXCreateContextWithConfigSGIX (X11_Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct); +XVisualInfo *glXGetVisualFromFBConfigSGIX (X11_Display *dpy, GLXFBConfigSGIX config); +GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (X11_Display *dpy, XVisualInfo *vis); +#endif +#endif /* GLX_SGIX_fbconfig */ + +#ifndef GLX_SGIX_hyperpipe +#define GLX_SGIX_hyperpipe 1 +typedef struct { + char pipeName[80]; /* Should be [GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX] */ + int networkId; +} GLXHyperpipeNetworkSGIX; +typedef struct { + char pipeName[80]; /* Should be [GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX] */ + int channel; + unsigned int participationType; + int timeSlice; +} GLXHyperpipeConfigSGIX; +typedef struct { + char pipeName[80]; /* Should be [GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX] */ + int srcXOrigin, srcYOrigin, srcWidth, srcHeight; + int destXOrigin, destYOrigin, destWidth, destHeight; +} GLXPipeRect; +typedef struct { + char pipeName[80]; /* Should be [GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX] */ + int XOrigin, YOrigin, maxHeight, maxWidth; +} GLXPipeRectLimits; +#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80 +#define GLX_BAD_HYPERPIPE_CONFIG_SGIX 91 +#define GLX_BAD_HYPERPIPE_SGIX 92 +#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX 0x00000001 +#define GLX_HYPERPIPE_RENDER_PIPE_SGIX 0x00000002 +#define GLX_PIPE_RECT_SGIX 0x00000001 +#define GLX_PIPE_RECT_LIMITS_SGIX 0x00000002 +#define GLX_HYPERPIPE_STEREO_SGIX 0x00000003 +#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX 0x00000004 +#define GLX_HYPERPIPE_ID_SGIX 0x8030 +typedef GLXHyperpipeNetworkSGIX *( *PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (X11_Display *dpy, int *npipes); +typedef int ( *PFNGLXHYPERPIPECONFIGSGIXPROC) (X11_Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId); +typedef GLXHyperpipeConfigSGIX *( *PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (X11_Display *dpy, int hpId, int *npipes); +typedef int ( *PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (X11_Display *dpy, int hpId); +typedef int ( *PFNGLXBINDHYPERPIPESGIXPROC) (X11_Display *dpy, int hpId); +typedef int ( *PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (X11_Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList); +typedef int ( *PFNGLXHYPERPIPEATTRIBSGIXPROC) (X11_Display *dpy, int timeSlice, int attrib, int size, void *attribList); +typedef int ( *PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (X11_Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList); +#ifdef GLX_GLXEXT_PROTOTYPES +GLXHyperpipeNetworkSGIX *glXQueryHyperpipeNetworkSGIX (X11_Display *dpy, int *npipes); +int glXHyperpipeConfigSGIX (X11_Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId); +GLXHyperpipeConfigSGIX *glXQueryHyperpipeConfigSGIX (X11_Display *dpy, int hpId, int *npipes); +int glXDestroyHyperpipeConfigSGIX (X11_Display *dpy, int hpId); +int glXBindHyperpipeSGIX (X11_Display *dpy, int hpId); +int glXQueryHyperpipeBestAttribSGIX (X11_Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList); +int glXHyperpipeAttribSGIX (X11_Display *dpy, int timeSlice, int attrib, int size, void *attribList); +int glXQueryHyperpipeAttribSGIX (X11_Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList); +#endif +#endif /* GLX_SGIX_hyperpipe */ + +#ifndef GLX_SGIX_pbuffer +#define GLX_SGIX_pbuffer 1 +#define GLX_PBUFFER_BIT_SGIX 0x00000004 +#define GLX_BUFFER_CLOBBER_MASK_SGIX 0x08000000 +#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX 0x00000001 +#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX 0x00000002 +#define GLX_BACK_LEFT_BUFFER_BIT_SGIX 0x00000004 +#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX 0x00000008 +#define GLX_AUX_BUFFERS_BIT_SGIX 0x00000010 +#define GLX_DEPTH_BUFFER_BIT_SGIX 0x00000020 +#define GLX_STENCIL_BUFFER_BIT_SGIX 0x00000040 +#define GLX_ACCUM_BUFFER_BIT_SGIX 0x00000080 +#define GLX_SAMPLE_BUFFERS_BIT_SGIX 0x00000100 +#define GLX_MAX_PBUFFER_WIDTH_SGIX 0x8016 +#define GLX_MAX_PBUFFER_HEIGHT_SGIX 0x8017 +#define GLX_MAX_PBUFFER_PIXELS_SGIX 0x8018 +#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX 0x8019 +#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX 0x801A +#define GLX_PRESERVED_CONTENTS_SGIX 0x801B +#define GLX_LARGEST_PBUFFER_SGIX 0x801C +#define GLX_WIDTH_SGIX 0x801D +#define GLX_HEIGHT_SGIX 0x801E +#define GLX_EVENT_MASK_SGIX 0x801F +#define GLX_DAMAGED_SGIX 0x8020 +#define GLX_SAVED_SGIX 0x8021 +#define GLX_WINDOW_SGIX 0x8022 +#define GLX_PBUFFER_SGIX 0x8023 +typedef GLXPbufferSGIX ( *PFNGLXCREATEGLXPBUFFERSGIXPROC) (X11_Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list); +typedef void ( *PFNGLXDESTROYGLXPBUFFERSGIXPROC) (X11_Display *dpy, GLXPbufferSGIX pbuf); +typedef int ( *PFNGLXQUERYGLXPBUFFERSGIXPROC) (X11_Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); +typedef void ( *PFNGLXSELECTEVENTSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, unsigned long mask); +typedef void ( *PFNGLXGETSELECTEDEVENTSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, unsigned long *mask); +#ifdef GLX_GLXEXT_PROTOTYPES +GLXPbufferSGIX glXCreateGLXPbufferSGIX (X11_Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list); +void glXDestroyGLXPbufferSGIX (X11_Display *dpy, GLXPbufferSGIX pbuf); +int glXQueryGLXPbufferSGIX (X11_Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value); +void glXSelectEventSGIX (X11_Display *dpy, GLXDrawable drawable, unsigned long mask); +void glXGetSelectedEventSGIX (X11_Display *dpy, GLXDrawable drawable, unsigned long *mask); +#endif +#endif /* GLX_SGIX_pbuffer */ + +#ifndef GLX_SGIX_swap_barrier +#define GLX_SGIX_swap_barrier 1 +typedef void ( *PFNGLXBINDSWAPBARRIERSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, int barrier); +typedef Bool ( *PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (X11_Display *dpy, int screen, int *max); +#ifdef GLX_GLXEXT_PROTOTYPES +void glXBindSwapBarrierSGIX (X11_Display *dpy, GLXDrawable drawable, int barrier); +Bool glXQueryMaxSwapBarriersSGIX (X11_Display *dpy, int screen, int *max); +#endif +#endif /* GLX_SGIX_swap_barrier */ + +#ifndef GLX_SGIX_swap_group +#define GLX_SGIX_swap_group 1 +typedef void ( *PFNGLXJOINSWAPGROUPSGIXPROC) (X11_Display *dpy, GLXDrawable drawable, GLXDrawable member); +#ifdef GLX_GLXEXT_PROTOTYPES +void glXJoinSwapGroupSGIX (X11_Display *dpy, GLXDrawable drawable, GLXDrawable member); +#endif +#endif /* GLX_SGIX_swap_group */ + +#ifndef GLX_SGIX_video_resize +#define GLX_SGIX_video_resize 1 +#define GLX_SYNC_FRAME_SGIX 0x00000000 +#define GLX_SYNC_SWAP_SGIX 0x00000001 +typedef int ( *PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (X11_Display *display, int screen, int channel, X11_Window window); +typedef int ( *PFNGLXCHANNELRECTSGIXPROC) (X11_Display *display, int screen, int channel, int x, int y, int w, int h); +typedef int ( *PFNGLXQUERYCHANNELRECTSGIXPROC) (X11_Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh); +typedef int ( *PFNGLXQUERYCHANNELDELTASSGIXPROC) (X11_Display *display, int screen, int channel, int *x, int *y, int *w, int *h); +typedef int ( *PFNGLXCHANNELRECTSYNCSGIXPROC) (X11_Display *display, int screen, int channel, GLenum synctype); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXBindChannelToWindowSGIX (X11_Display *display, int screen, int channel, X11_Window window); +int glXChannelRectSGIX (X11_Display *display, int screen, int channel, int x, int y, int w, int h); +int glXQueryChannelRectSGIX (X11_Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh); +int glXQueryChannelDeltasSGIX (X11_Display *display, int screen, int channel, int *x, int *y, int *w, int *h); +int glXChannelRectSyncSGIX (X11_Display *display, int screen, int channel, GLenum synctype); +#endif +#endif /* GLX_SGIX_video_resize */ + +#ifndef GLX_SGIX_video_source +#define GLX_SGIX_video_source 1 +typedef XID GLXVideoSourceSGIX; +#ifdef _VL_H +typedef GLXVideoSourceSGIX ( *PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (X11_Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode); +typedef void ( *PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (X11_Display *dpy, GLXVideoSourceSGIX glxvideosource); +#ifdef GLX_GLXEXT_PROTOTYPES +GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (X11_Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode); +void glXDestroyGLXVideoSourceSGIX (X11_Display *dpy, GLXVideoSourceSGIX glxvideosource); +#endif +#endif /* _VL_H */ +#endif /* GLX_SGIX_video_source */ + +#ifndef GLX_SGIX_visual_select_group +#define GLX_SGIX_visual_select_group 1 +#define GLX_VISUAL_SELECT_GROUP_SGIX 0x8028 +#endif /* GLX_SGIX_visual_select_group */ + +#ifndef GLX_SGI_cushion +#define GLX_SGI_cushion 1 +typedef void ( *PFNGLXCUSHIONSGIPROC) (X11_Display *dpy, X11_Window window, float cushion); +#ifdef GLX_GLXEXT_PROTOTYPES +void glXCushionSGI (X11_Display *dpy, X11_Window window, float cushion); +#endif +#endif /* GLX_SGI_cushion */ + +#ifndef GLX_SGI_make_current_read +#define GLX_SGI_make_current_read 1 +typedef Bool ( *PFNGLXMAKECURRENTREADSGIPROC) (X11_Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); +typedef GLXDrawable ( *PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void); +#ifdef GLX_GLXEXT_PROTOTYPES +Bool glXMakeCurrentReadSGI (X11_Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); +GLXDrawable glXGetCurrentReadDrawableSGI (void); +#endif +#endif /* GLX_SGI_make_current_read */ + +#ifndef GLX_SGI_swap_control +#define GLX_SGI_swap_control 1 +typedef int ( *PFNGLXSWAPINTERVALSGIPROC) (int interval); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXSwapIntervalSGI (int interval); +#endif +#endif /* GLX_SGI_swap_control */ + +#ifndef GLX_SGI_video_sync +#define GLX_SGI_video_sync 1 +typedef int ( *PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count); +typedef int ( *PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count); +#ifdef GLX_GLXEXT_PROTOTYPES +int glXGetVideoSyncSGI (unsigned int *count); +int glXWaitVideoSyncSGI (int divisor, int remainder, unsigned int *count); +#endif +#endif /* GLX_SGI_video_sync */ + +#ifndef GLX_SUN_get_transparent_index +#define GLX_SUN_get_transparent_index 1 +typedef Status ( *PFNGLXGETTRANSPARENTINDEXSUNPROC) (X11_Display *dpy, X11_Window overlay, X11_Window underlay, long *pTransparentIndex); +#ifdef GLX_GLXEXT_PROTOTYPES +Status glXGetTransparentIndexSUN (X11_Display *dpy, X11_Window overlay, X11_Window underlay, long *pTransparentIndex); +#endif +#endif /* GLX_SUN_get_transparent_index */ #ifdef __cplusplus } diff --git a/panda/src/glxdisplay/posixGraphicsStateGuardian.cxx b/panda/src/glxdisplay/posixGraphicsStateGuardian.cxx index cdba89853d..25ec38afac 100644 --- a/panda/src/glxdisplay/posixGraphicsStateGuardian.cxx +++ b/panda/src/glxdisplay/posixGraphicsStateGuardian.cxx @@ -53,13 +53,11 @@ PosixGraphicsStateGuardian:: // not defined. //////////////////////////////////////////////////////////////////// void *PosixGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - nassertr(prefix != NULL, NULL); +do_get_extension_func(const char *name) { nassertr(name != NULL, NULL); - string fullname = string(prefix) + string(name); if (glx_get_os_address) { - return get_system_func(fullname.c_str()); + return get_system_func(name); } return NULL; diff --git a/panda/src/glxdisplay/posixGraphicsStateGuardian.h b/panda/src/glxdisplay/posixGraphicsStateGuardian.h index 950844951c..04e4850ea2 100644 --- a/panda/src/glxdisplay/posixGraphicsStateGuardian.h +++ b/panda/src/glxdisplay/posixGraphicsStateGuardian.h @@ -32,7 +32,7 @@ public: ~PosixGraphicsStateGuardian(); protected: - virtual void *do_get_extension_func(const char *prefix, const char *name); + virtual void *do_get_extension_func(const char *name); void *get_system_func(const char *name); private: diff --git a/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx b/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx index 1b693800f4..6d4ad703aa 100644 --- a/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx +++ b/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx @@ -38,14 +38,14 @@ TypeHandle osxGraphicsStateGuardian::_type_handle; // not defined. //////////////////////////////////////////////////////////////////// void *osxGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - string fullname = "_" + string(prefix) + string(name); +do_get_extension_func(const char *name) { + string fullname = "_" + string(name); NSSymbol symbol = NULL; - - if (NSIsSymbolNameDefined (fullname.c_str())) { - symbol = NSLookupAndBindSymbol (fullname.c_str()); + + if (NSIsSymbolNameDefined(fullname.c_str())) { + symbol = NSLookupAndBindSymbol(fullname.c_str()); } - + return symbol ? NSAddressOfSymbol(symbol) : NULL; } diff --git a/panda/src/osxdisplay/osxGraphicsStateGuardian.h b/panda/src/osxdisplay/osxGraphicsStateGuardian.h index cb901fa1bc..855965c6ed 100644 --- a/panda/src/osxdisplay/osxGraphicsStateGuardian.h +++ b/panda/src/osxdisplay/osxGraphicsStateGuardian.h @@ -17,7 +17,7 @@ #define __glext_h_ #include #include - + #include "pandabase.h" #include "glgsg.h" @@ -38,20 +38,20 @@ public: virtual void reset(); void draw_resize_box(); - + bool get_gamma_table(); bool static_set_gamma(bool restore, PN_stdfloat gamma); bool set_gamma(PN_stdfloat gamma); void atexit_function(); void restore_gamma(); - + protected: - virtual void *do_get_extension_func(const char *prefix, const char *name); - + virtual void *do_get_extension_func(const char *name); + public: OSStatus build_gl(bool full_screen, bool pbuffer, FrameBufferProperties &fb_props); AGLContext get_context() { return _aglcontext; }; - + const AGLPixelFormat get_agl_pixel_format() const { return _aglPixFmt; }; private: diff --git a/panda/src/wgldisplay/wglGraphicsStateGuardian.cxx b/panda/src/wgldisplay/wglGraphicsStateGuardian.cxx index dc34fb3b9e..11c450b0af 100755 --- a/panda/src/wgldisplay/wglGraphicsStateGuardian.cxx +++ b/panda/src/wgldisplay/wglGraphicsStateGuardian.cxx @@ -583,9 +583,8 @@ get_extra_extensions() { // not defined. //////////////////////////////////////////////////////////////////// void *wglGraphicsStateGuardian:: -do_get_extension_func(const char *prefix, const char *name) { - string fullname = string(prefix) + string(name); - return (void*) wglGetProcAddress(fullname.c_str()); +do_get_extension_func(const char *name) { + return (void*) wglGetProcAddress(name); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/wgldisplay/wglGraphicsStateGuardian.h b/panda/src/wgldisplay/wglGraphicsStateGuardian.h index e8fe61177a..4fa70b2a46 100755 --- a/panda/src/wgldisplay/wglGraphicsStateGuardian.h +++ b/panda/src/wgldisplay/wglGraphicsStateGuardian.h @@ -58,7 +58,7 @@ public: protected: virtual void get_extra_extensions(); - virtual void *do_get_extension_func(const char *prefix, const char *name); + virtual void *do_get_extension_func(const char *name); private: void make_context(HDC hdc);