* updated build opengl headers to 7.2

* added opengl to build be api headers
* define USES_BE_API for gen_matypes
this should fix the build for Linux which don't provide GL headers :)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28050 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/jam/BuildSetup

@@ -734,6 +734,7 @@ if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 		[ FDirName $(HAIKU_TOP) headers build os drivers ]
 		[ FDirName $(HAIKU_TOP) headers build os kernel ]
 		[ FDirName $(HAIKU_TOP) headers build os interface ]
+		[ FDirName $(HAIKU_TOP) headers build os opengl ]
 		[ FDirName $(HAIKU_TOP) headers build os storage ]
 		[ FDirName $(HAIKU_TOP) headers build os support ]
 	;

headers/build/os/opengl/GL/gl.h

@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,7 +39,6 @@
 #if !defined(__SCITECH_SNAP__)
 
 #if defined(__BEOS__)
-#include <BeBuild.h>
 #include <stdlib.h>     /* to get some BeOS-isms */
 #endif
 
@@ -63,6 +62,9 @@
 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
+#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#  define GLAPI __attribute__((visibility("default")))
+#  define GLAPIENTRY
 #endif /* WIN32 && !CYGWIN */
 
 #if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
@@ -82,7 +84,8 @@
 #include <windows.h>
 #endif
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
+     && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
 #include <GL/mesa_wgl.h>
 #endif
 
@@ -102,7 +105,7 @@
 #define APIENTRY GLAPIENTRY
 #endif
 
-/* "P" suffix for when function returns a pointer */
+/* "P" suffix to be used for a pointer to a function */
 #ifndef APIENTRYP
 #define APIENTRYP APIENTRY *
 #endif
@@ -439,16 +442,16 @@ typedef double		GLclampd;	/* double precision float in [0,1] */
 #define GL_OR_INVERTED				0x150D
 
 /* Stencil */
-#define GL_STENCIL_TEST				0x0B90
-#define GL_STENCIL_WRITEMASK			0x0B98
 #define GL_STENCIL_BITS				0x0D57
+#define GL_STENCIL_TEST				0x0B90
+#define GL_STENCIL_CLEAR_VALUE			0x0B91
 #define GL_STENCIL_FUNC				0x0B92
 #define GL_STENCIL_VALUE_MASK			0x0B93
-#define GL_STENCIL_REF				0x0B97
 #define GL_STENCIL_FAIL				0x0B94
-#define GL_STENCIL_PASS_DEPTH_PASS		0x0B96
 #define GL_STENCIL_PASS_DEPTH_FAIL		0x0B95
-#define GL_STENCIL_CLEAR_VALUE			0x0B91
+#define GL_STENCIL_PASS_DEPTH_PASS		0x0B96
+#define GL_STENCIL_REF				0x0B97
+#define GL_STENCIL_WRITEMASK			0x0B98
 #define GL_STENCIL_INDEX			0x1901
 #define GL_KEEP					0x1E00
 #define GL_REPLACE				0x1E01
@@ -498,16 +501,16 @@ typedef double		GLclampd;	/* double precision float in [0,1] */
 
 /* Implementation limits */
 #define GL_MAX_LIST_NESTING			0x0B31
-#define GL_MAX_ATTRIB_STACK_DEPTH		0x0D35
-#define GL_MAX_MODELVIEW_STACK_DEPTH		0x0D36
-#define GL_MAX_NAME_STACK_DEPTH			0x0D37
-#define GL_MAX_PROJECTION_STACK_DEPTH		0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH		0x0D39
 #define GL_MAX_EVAL_ORDER			0x0D30
 #define GL_MAX_LIGHTS				0x0D31
 #define GL_MAX_CLIP_PLANES			0x0D32
 #define GL_MAX_TEXTURE_SIZE			0x0D33
 #define GL_MAX_PIXEL_MAP_TABLE			0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH		0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH		0x0D36
+#define GL_MAX_NAME_STACK_DEPTH			0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH		0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH		0x0D39
 #define GL_MAX_VIEWPORT_DIMS			0x0D3A
 #define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH	0x0D3B
 
@@ -565,22 +568,22 @@ typedef double		GLclampd;	/* double precision float in [0,1] */
 #define GL_MAP2_GRID_DOMAIN			0x0DD2
 #define GL_MAP2_GRID_SEGMENTS			0x0DD3
 #define GL_COEFF				0x0A00
-#define GL_DOMAIN				0x0A02
 #define GL_ORDER				0x0A01
+#define GL_DOMAIN				0x0A02
 
 /* Hints */
-#define GL_FOG_HINT				0x0C54
-#define GL_LINE_SMOOTH_HINT			0x0C52
 #define GL_PERSPECTIVE_CORRECTION_HINT		0x0C50
 #define GL_POINT_SMOOTH_HINT			0x0C51
+#define GL_LINE_SMOOTH_HINT			0x0C52
 #define GL_POLYGON_SMOOTH_HINT			0x0C53
+#define GL_FOG_HINT				0x0C54
 #define GL_DONT_CARE				0x1100
 #define GL_FASTEST				0x1101
 #define GL_NICEST				0x1102
 
 /* Scissor box */
-#define GL_SCISSOR_TEST				0x0C11
 #define GL_SCISSOR_BOX				0x0C10
+#define GL_SCISSOR_TEST				0x0C11
 
 /* Pixel Mode / Transfer */
 #define GL_MAP_COLOR				0x0D10
@@ -685,8 +688,8 @@ typedef double		GLclampd;	/* double precision float in [0,1] */
 
 /* Errors */
 #define GL_NO_ERROR 				0x0
-#define GL_INVALID_VALUE			0x0501
 #define GL_INVALID_ENUM				0x0500
+#define GL_INVALID_VALUE			0x0501
 #define GL_INVALID_OPERATION			0x0502
 #define GL_STACK_OVERFLOW			0x0503
 #define GL_STACK_UNDERFLOW			0x0504
@@ -851,7 +854,7 @@ GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
 
 GLAPI GLenum GLAPIENTRY glGetError( void );
 
-GLAPI const GLubyte GLAPIENTRYP glGetString( GLenum name );
+GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
 
 GLAPI void GLAPIENTRY glFinish( void );
 
@@ -2150,35 +2153,24 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh
 
 
 
-/*
+#if GL_ARB_shader_objects
- * ???. GL_MESA_trace
- * XXX obsolete
- */
-#ifndef GL_MESA_trace
-#define GL_MESA_trace 1
 
-#define GL_TRACE_ALL_BITS_MESA			0xFFFF
+#ifndef GL_MESA_shader_debug
-#define GL_TRACE_OPERATIONS_BIT_MESA		0x0001
+#define GL_MESA_shader_debug 1
-#define GL_TRACE_PRIMITIVES_BIT_MESA		0x0002
-#define GL_TRACE_ARRAYS_BIT_MESA		0x0004
-#define GL_TRACE_TEXTURES_BIT_MESA		0x0008
-#define GL_TRACE_PIXELS_BIT_MESA		0x0010
-#define GL_TRACE_ERRORS_BIT_MESA		0x0020
-#define GL_TRACE_MASK_MESA			0x8755
-#define GL_TRACE_NAME_MESA			0x8756
 
-GLAPI void GLAPIENTRY glEnableTraceMESA( GLbitfield mask );
+#define GL_DEBUG_OBJECT_MESA              0x8759
-GLAPI void GLAPIENTRY glDisableTraceMESA( GLbitfield mask );
+#define GL_DEBUG_PRINT_MESA               0x875A
-GLAPI void GLAPIENTRY glNewTraceMESA( GLbitfield mask, const GLubyte * traceName );
+#define GL_DEBUG_ASSERT_MESA              0x875B
-GLAPI void GLAPIENTRY glEndTraceMESA( void );
-GLAPI void GLAPIENTRY glTraceAssertAttribMESA( GLbitfield attribMask );
-GLAPI void GLAPIENTRY glTraceCommentMESA( const GLubyte * comment );
-GLAPI void GLAPIENTRY glTraceTextureMESA( GLuint name, const GLubyte* comment );
-GLAPI void GLAPIENTRY glTraceListMESA( GLuint name, const GLubyte* comment );
-GLAPI void GLAPIENTRY glTracePointerMESA( GLvoid* pointer, const GLubyte* comment );
-GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid* last, const GLubyte* comment );
 
-#endif /* GL_MESA_trace */
+GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
+GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
+                                         GLsizei *length, GLcharARB *debugLog);
+GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+
+#endif /* GL_MESA_shader_debug */
+
+#endif /* GL_ARB_shader_objects */
 
 
 /*
@@ -2211,17 +2203,46 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid
 
 typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
 
-extern void
+GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
-glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
-                      GLvoid *data);
 
-extern void
+GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
-glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name,
-                           GLfloat *v);
 
 #endif /* GL_MESA_program_debug */
 
 
+#ifndef GL_MESA_texture_array
+#define GL_MESA_texture_array 1
+
+/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array.
+ */
+#ifndef GL_EXT_texture_array
+
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,
+    GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif /* GL_GLEXT_PROTOTYPES */
+
+#if 0
+/* (temporarily) disabled because of collision with typedef in glext.h
+ * that happens if apps include both gl.h and glext.h
+ */
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,
+    GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#define GL_TEXTURE_1D_ARRAY_EXT         0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT   0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT         0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT   0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#endif
+
+#endif
+
+
 #ifndef GL_ATI_blend_equation_separate
 #define GL_ATI_blend_equation_separate 1
 
@@ -2233,16 +2254,6 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
 #endif /* GL_ATI_blend_equation_separate */
 
 
-/* As soon as the official glext.h is updated to include this, it will be 
- * removed from here.
- */
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES   0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-
-#endif /* GL_OES_read_format */
 
 /**
  ** NOTE!!!!!  If you add new functions to this file, or update
@@ -2251,6 +2262,7 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
  **/
 
 
+
 /**********************************************************************
  * Begin system-specific stuff
  */

headers/build/os/opengl/GL/glu.h

@@ -1,35 +1,40 @@
 /*
-** License Applicability. Except to the extent portions of this file are
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-** made subject to an alternative license as permitted in the SGI Free
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
-** 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
+ * Permission is hereby granted, free of charge, to any person obtaining a
-** this file except in compliance with the License. You may obtain a copy
+ * copy of this software and associated documentation files (the "Software"),
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+ * to deal in the Software without restriction, including without limitation
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-** 
+ * and/or sell copies of the Software, and to permit persons to whom the
-** http://oss.sgi.com/projects/FreeB
+ * Software is furnished to do so, subject to the following conditions:
-** 
+ *
-** Note that, as provided in the License, the Software is distributed on an
+ * The above copyright notice including the dates of first publication and
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+ * either this permission notice or a reference to
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+ * http://oss.sgi.com/projects/FreeB/
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+ * shall be included in all copies or substantial portions of the Software.
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+ *
-** 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-** Original Code. The Original Code is: OpenGL Sample Implementation,
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-** Copyright in any portions created by third parties is as indicated
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-** elsewhere herein. All Rights Reserved.
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-** 
+ * SOFTWARE.
-** Additional Notice Provisions: This software was created using the
+ *
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
-** not been independently verified as being compliant with the OpenGL(R)
+ * shall not be used in advertising or otherwise to promote the sale, use or
-** version 1.2.1 Specification.
+ * other dealings in this Software without prior written authorization from
-*/
+ * Silicon Graphics, Inc.
+ */
 
 #ifndef __glu_h__
 #define __glu_h__
 
+#if defined(USE_MGL_NAMESPACE)
+#include "glu_mangle.h"
+#endif
+
 #include <GL/gl.h>
 
 #ifndef GLAPIENTRY
@@ -40,10 +45,21 @@
 #define GLAPIENTRYP GLAPIENTRY *
 #endif
 
-#ifndef GLAPI
+#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
-#define GLAPI	_IMPEXP_GL
+# undef GLAPI
-#endif
+# define GLAPI __declspec(dllexport)
+#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL)
+/* tag specifying we're building for DLL runtime support */
+# undef GLAPI
+# define GLAPI __declspec(dllimport)
+#elif !defined(GLAPI)
+/* for use with static link lib build of Win32 edition only */
+# define GLAPI extern
+#endif /* _STATIC_MESA support */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*************************************************************/
 
@@ -250,17 +266,16 @@
 class GLUnurbs;
 class GLUquadric;
 class GLUtesselator;
-extern "C" {
 #else
 typedef struct GLUnurbs GLUnurbs;
 typedef struct GLUquadric GLUquadric;
 typedef struct GLUtesselator GLUtesselator;
 #endif
 
-typedef struct GLUnurbs GLUnurbsObj;
+typedef GLUnurbs GLUnurbsObj;
-typedef struct GLUquadric GLUquadricObj;
+typedef GLUquadric GLUquadricObj;
-typedef struct GLUtesselator GLUtesselatorObj;
+typedef GLUtesselator GLUtesselatorObj;
-typedef struct GLUtesselator GLUtriangulatorObj;
+typedef GLUtesselator GLUtriangulatorObj;
 
 #define GLU_TESS_MAX_COORD 1.0e150
 

headers/build/os/opengl/GL/glut.h

@@ -10,6 +10,10 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
+#if defined(__MINGW32__)
+#include <GL/mesa_wgl.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -115,7 +119,7 @@ extern _CRTIMP void __cdecl exit(int);
 #endif
 
 /* GLUT API entry point declarations for Win32. */
-#if defined(GLUT_BUILDING_LIB) && defined(_DLL)
+#if (defined(BUILD_GLUT32) || defined(GLUT_BUILDING_LIB)) && defined(_DLL)
 # 	define GLUTAPI __declspec(dllexport)
 #elif defined(_DLL)
 #   define GLUTAPI __declspec(dllimport)
@@ -130,9 +134,12 @@ extern _CRTIMP void __cdecl exit(int);
 #		pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/glut.h" )
 #	endif
 #	define CALLBACK __stdcall
-typedef int (GLUTAPIENTRY *PROC)();
+
-typedef void *HGLRC;
+#if !defined(__MINGW32__)
-typedef void *HDC;
+	typedef int (GLUTAPIENTRY *PROC)();
+	typedef void *HGLRC;
+	typedef void *HDC;
+#endif
 typedef unsigned long COLORREF;
 #endif
 
@@ -193,13 +200,11 @@ WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
 #else /* _WIN32 not defined */
 
 /* Define GLUTAPIENTRY and GLUTCALLBACK to nothing if we aren't on Win32. */
-#  define GLUTAPIENTRY
+#  define GLUTAPIENTRY GLAPIENTRY
 #  define GLUTAPIENTRYV
-#  define GLUT_APIENTRY_DEFINED
 #  define GLUTCALLBACK
 #  define GLUTAPI extern
-/* Prototype exit for the non-Win32 case (see above). */
+
-/*extern void exit(int);  this screws up gcc -ansi -pedantic! */
 #endif
 
 
@@ -747,26 +752,4 @@ GLUTAPI int GLUTAPIENTRY glutGameModeGet(GLenum mode);
 }
 #endif
 
-#if 0
-#ifdef GLUT_APIENTRY_DEFINED
-# undef GLUT_APIENTRY_DEFINED
-# undef APIENTRY
-#endif
-
-#ifdef GLUT_WINGDIAPI_DEFINED
-# undef GLUT_WINGDIAPI_DEFINED
-# undef WINGDIAPI
-#endif
-
-#ifdef GLUT_DEFINED___CDECL
-# undef GLUT_DEFINED___CDECL
-# undef __cdecl
-#endif
-
-#ifdef GLUT_DEFINED__CRTIMP
-# undef GLUT_DEFINED__CRTIMP
-# undef _CRTIMP
-#endif
-#endif
-
 #endif                  /* __glut_h__ */

src/kits/opengl/mesa/Jamfile

@@ -36,6 +36,8 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) tnl ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) vbo ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(TARGET_ARCH) ] ;
 
+USES_BE_API on gen_matypes = true ;
+
 BuildPlatformMain gen_matypes :
 	gen_matypes.c ;