make headers include headers they depend on, don't rely on the c(xx)

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

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index cf633c1144421b7a8ac43236467990fff2dcb94a..aa5dd3c7626c6472c34a6e4222bf559d69a4cfc4 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -429,10 +429,14 @@ typedef BOOL (APIENTRY * wglSetPbufferAttribARBProc) (HPBUFFERARB hPbuffer, cons
 #endif
 
 #ifndef GLXPbuffer
-#define GLXPbuffer GLXPbufferSGIX
+# ifdef GLXPbufferSGIX
+#  define GLXPbuffer GLXPbufferSGIX
+# endif
 #endif
 #ifndef GLXFBConfig
-#define GLXFBConfig GLXFBConfigSGIX
+# ifdef GLXFBConfigSGIX
+#  define GLXFBConfig GLXFBConfigSGIX
+# endif
 #endif
 
 typedef GLXFBConfig *(*glXChooseFBConfigProc) (Display *dpy, int screen, int *attribList, int *nitems);
@@ -442,7 +446,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 */
 
@@ -461,6 +465,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
  */
@@ -564,6 +580,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
  */
@@ -876,5 +913,6 @@ typedef void (APIENTRY * glProgramParameter4fvNVProc) (GLenum target, GLuint ind
 }
 #endif
 
+
 #endif // !__SG_EXTENSIONS_HXX