easyxml.cxx: add missing endXML visitor call

[simgear.git] / simgear / screen / extensions.hxx

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index 1391a6a821a76ed8285f190cbbcffaae94949448..d380d9a3f34cb8bfc814f25e76cda881034972e1 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -32,12 +32,11 @@
 # include <windows.h>
 #endif
 
-#if !defined(WIN32)
-# include <dlfcn.h>
-#endif
-
 #include <simgear/compiler.h>
 
+#if !defined(WIN32)
+# include SG_GLX_H
+#endif
 #include SG_GL_H
 
 
@@ -70,8 +69,7 @@ inline void (*SGLookupFunction(const char *func))()
 #elif defined( __APPLE__ )
     return (void (*)()) macosxGetGLProcAddress(func);
 
-#else // UNIX
-
+#else // UNIX, default
     return (void (*)()) SGGetGLProcAddress(func);
 #endif
 }
@@ -446,7 +444,7 @@ typedef XVisualInfo *(*glXGetVisualFromFBConfigProc) (Display *dpy, GLXFBConfig
 typedef GLXContext (*glXCreateContextWithConfigProc) (Display *dpy,  GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
 typedef GLXContext (*glXCreateContextProc) (Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
 typedef void (*glXDestroyPbufferProc) (Display *dpy, GLXPbuffer pbuf);
-typedef int (*glXQueryGLXPbufferSGIXProc) (Display *, GLXPbufferSGIX, int, unsigned int *);
+typedef int (*glXQueryGLXPbufferSGIXProc) (Display *, GLXPbuffer, int, unsigned int *);
 typedef void (*glXQueryDrawableProc) (Display *, GLXDrawable, int, unsigned int *);
 #endif /* WIN32 */
 
@@ -465,6 +463,18 @@ typedef void (*glXQueryDrawableProc) (Display *, GLXDrawable, int, unsigned int
 #define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV                       0x84F8
 #endif
 
+/*
+ * NV_texture_rectangle
+ */
+
+#ifndef GL_EXT_texture_rectangle
+#define GL_EXT_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_EXT                               0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_EXT                       0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_EXT                         0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT                      0x84F8
+#endif
+
 /*
  * WGL_NV_texture_rectangle
  */
@@ -568,6 +578,27 @@ typedef void (*glXQueryDrawableProc) (Display *, GLXDrawable, int, unsigned int
 #define GL_LUMINANCE_ALPHA_FLOAT16_ATI                         0x881F
 #endif
 
+/*
+ * ARB point sprite
+ */
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#endif
+
 /*
  * ARB_vertex_program
  */
@@ -880,5 +911,6 @@ typedef void (APIENTRY * glProgramParameter4fvNVProc) (GLenum target, GLuint ind
 }
 #endif
 
+
 #endif // !__SG_EXTENSIONS_HXX