[blight] 19004: Merge changes from Mesa-6.4 vendor drop and apply fixes needed to get it compiling/working.
Merge changes from Mesa-6.4 vendor drop and apply fixes needed to get it compiling/working. Added: trunk/reactos/lib/mesa32/Makefile.ReactOS Modified: trunk/reactos/lib/mesa32/README.ReactOS Added: trunk/reactos/lib/mesa32/include/GL/directfbgl.h Modified: trunk/reactos/lib/mesa32/include/GL/dmesa.h Modified: trunk/reactos/lib/mesa32/include/GL/fxmesa.h Modified: trunk/reactos/lib/mesa32/include/GL/gl.h Modified: trunk/reactos/lib/mesa32/include/GL/gl_mangle.h Modified: trunk/reactos/lib/mesa32/include/GL/glext.h Modified: trunk/reactos/lib/mesa32/include/GL/glx.h Modified: trunk/reactos/lib/mesa32/include/GL/glxext.h Added: trunk/reactos/lib/mesa32/include/GL/internal/dri_interface.h Added: trunk/reactos/lib/mesa32/include/GL/internal/sarea.h Modified: trunk/reactos/lib/mesa32/include/GL/osmesa.h Modified: trunk/reactos/lib/mesa32/include/GL/xmesa.h Added: trunk/reactos/lib/mesa32/include/GLView.h Deleted: trunk/reactos/lib/mesa32/mesa32.def Modified: trunk/reactos/lib/mesa32/mesa32.xml Modified: trunk/reactos/lib/mesa32/src/Makefile Modified: trunk/reactos/lib/mesa32/src/Makefile.DJ Modified: trunk/reactos/lib/mesa32/src/Makefile.mgw Modified: trunk/reactos/lib/mesa32/src/array_cache/ac_import.c Deleted: trunk/reactos/lib/mesa32/src/array_cache/array_cache.dsp Modified: trunk/reactos/lib/mesa32/src/depend Modified: trunk/reactos/lib/mesa32/src/drivers/beos/GLView.cpp Modified: trunk/reactos/lib/mesa32/src/drivers/beos/Makefile Modified: trunk/reactos/lib/mesa32/src/drivers/common/driverfuncs.c Added: trunk/reactos/lib/mesa32/src/drivers/directfb/ Modified: trunk/reactos/lib/mesa32/src/drivers/dos/blit.S Modified: trunk/reactos/lib/mesa32/src/drivers/dos/dmesa.c Modified: trunk/reactos/lib/mesa32/src/drivers/dos/dpmi.c Modified: trunk/reactos/lib/mesa32/src/drivers/dos/internal.h Modified: trunk/reactos/lib/mesa32/src/drivers/dos/null.c Modified: trunk/reactos/lib/mesa32/src/drivers/dos/vesa.c Modified: trunk/reactos/lib/mesa32/src/drivers/dos/vga.c Modified: trunk/reactos/lib/mesa32/src/drivers/dos/video.c Modified: trunk/reactos/lib/mesa32/src/drivers/dos/virtual.S Added: trunk/reactos/lib/mesa32/src/drivers/dri/Makefile Added: trunk/reactos/lib/mesa32/src/drivers/dri/Makefile.template Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/depthtmp.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/dri_util.c Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/dri_util.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/drirenderbuffer.c Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/drirenderbuffer.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/extension_helper.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/glcontextmodes.c Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/glcontextmodes.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/memops.h Deleted: trunk/reactos/lib/mesa32/src/drivers/dri/common/mm.c Deleted: trunk/reactos/lib/mesa32/src/drivers/dri/common/mm.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/mmio.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/spantmp.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/spantmp2.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/spantmp_common.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/stenciltmp.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/texmem.c Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/texmem.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/utils.c Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/utils.h Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/vblank.c Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/xmlconfig.c Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/xmlpool/ Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/xmlpool.h Added: trunk/reactos/lib/mesa32/src/drivers/dri/dri_client/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/fb/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/ffb/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/gamma/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/i810/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/i830/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/i915/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/mach64/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/mga/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/r128/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/r200/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/r300/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/radeon/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/s3v/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/savage/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/sis/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/tdfx/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/trident/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/unichrome/ Added: trunk/reactos/lib/mesa32/src/drivers/dri/x11/ Modified: trunk/reactos/lib/mesa32/src/drivers/fbdev/glfbdev.c Modified: trunk/reactos/lib/mesa32/src/drivers/ggi/ggimesa.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxapi.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxdd.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxddspan.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxddtex.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxdrv.h Deleted: trunk/reactos/lib/mesa32/src/drivers/glide/fxopengl.def Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxsetup.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxsetup.h Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxtexman.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxtris.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxvb.c Modified: trunk/reactos/lib/mesa32/src/drivers/glide/fxvbtmp.h Deleted: trunk/reactos/lib/mesa32/src/drivers/glide/fxwgl.c Modified: trunk/reactos/lib/mesa32/src/drivers/osmesa/osmesa.c Deleted: trunk/reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp Modified: trunk/reactos/lib/mesa32/src/drivers/svga/svgamesa.c [truncated at 100 lines; 294 more skipped] _____
Added: trunk/reactos/lib/mesa32/Makefile.ReactOS --- trunk/reactos/lib/mesa32/Makefile.ReactOS 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/Makefile.ReactOS 2005-11-04 20:28:07 UTC (rev 19004) @@ -0,0 +1,82 @@
+# Makefile to import Mesa3D into ReactOS +# +# Place this into Mesa/src/mesa and run make -f Makefile.ReactOS to create +# a mesa32 output directory which contains the source code and a mesa32.xml +# rbuild file. + +.PHONY: import_mesa3d +doonly: import_mesa3d + +# Output directory +OUTPUT = mesa32 + +# Enable the OpenGL ICD interface +ICD=1 + +# Enable x86 optimizations +X86=1 + +include Makefile.mgw + +# rbuild XML creation + +RBUILD_OUTPUT = + +RBUILD_HEADER = '<!-- Autogeneratd by Makefile.ReactOS -->\n' +RBUILD_HEADER += '<module name="mesa32" type="win32dll" baseaddress="$${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true">\n' +RBUILD_HEADER += '\t<importlibrary definition="src/$(GL_DEF)" />\n' +RBUILD_HEADER += '\t<linkerflag>-Wl,--enable-stdcall-fixup</linkerflag>\n' +RBUILD_HEADER += '\t<library>ntdll</library>\n' +RBUILD_HEADER += '\t<library>kernel32</library>\n' +RBUILD_HEADER += '\t<define name="__USE_W32API" />\n' +RBUILD_HEADER += '\t<define name="USE_EXTERNAL_DXTN_LIB" />\n' +RBUILD_HEADER += '\t<!-- The following is autogenrated by Makefile.ReactOS -->\n' + +RBUILD_FOOTER += '</module>\n' + +define rbuild_xml_include + INC = $(1:-I$(TOP)/src/mesa%=src%) + INC2 = $(INC:-I$(TOP)/%=%) + ifneq ($(INC2),) + RBUILD_OUTPUT += '\t<include base="mesa32">$(INC2)</include>\n' + endif +endef + +define rbuild_xml_library + RBUILD_OUTPUT += '\t<library>$(1:-l%=%)</library>\n' +endef + +define rbuild_xml_define + RBUILD_OUTPUT += '\t<define name="$(1:-D%=%)" />\n' +endef + +define rbuild_xml_file + RBUILD_OUTPUT += '\t<file>src/$(1)</file>\n' +endef + +rbuild_makefile: + $(foreach library,$(filter -l%,$(LDLIBS)),$(eval $(call rbuild_xml_library,$(library)))) + $(foreach define,$(filter -D%,$(CFLAGS)),$(eval $(call rbuild_xml_define,$(define)))) + $(foreach include,$(filter -I%,$(INCLUDE_DIRS)),$(eval $(call rbuild_xml_include,$(include)))) + $(foreach file,$(SOURCES),$(eval $(call rbuild_xml_file,$(file)))) + @echo -ne $(RBUILD_HEADER)$(RBUILD_OUTPUT)$(RBUILD_FOOTER) > $(OUTPUT)/mesa32.xml + +# Main import target + +SOURCE_DIRS = + +define import_add_dir + DIR = $(firstword $(subst /, ,$(dir $(1)))) + ifeq ($(filter $(DIR),$(SOURCE_DIRS)),) + SOURCE_DIRS += $(DIR) + endif +endef + +$(OUTPUT): + test -d $(OUTPUT) || mkdir -p $(OUTPUT) + +import_mesa3d: $(OUTPUT) rbuild_makefile + $(foreach file,$(SOURCES),$(eval $(call import_add_dir,$(file)))) + cp -r $(TOP)/include $(OUTPUT) + test -d $(OUTPUT)/src || mkdir -p $(OUTPUT)/src + cp -r $(SOURCE_DIRS) $(OUTPUT)/src _____
Modified: trunk/reactos/lib/mesa32/README.ReactOS --- trunk/reactos/lib/mesa32/README.ReactOS 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/README.ReactOS 2005-11-04 20:28:07 UTC (rev 19004) @@ -1,8 +1,8 @@
-This is Mesa-6.2 (http://www.mesa3d.org/) with an ICD interface. +This is Mesa-6.4 (http://www.mesa3d.org/) with an ICD interface.
The ICD functions are in src/drivers/windows/icd/icd.c -I have created a new Makefile for ReactOS which will build Mesa with the ICD -interface. I have not adjusted the Visual C++ project/workspace files. +I have created a Makefile.ReactOS which will generate a mesa32 output directory +containing the needed sources and a mesa32.xml rbuild file.
--blight
_____
Copied: trunk/reactos/lib/mesa32/include/GL/directfbgl.h (from rev 19002, vendor/Mesa3D/current/include/GL/directfbgl.h) _____
Modified: trunk/reactos/lib/mesa32/include/GL/dmesa.h --- trunk/reactos/lib/mesa32/include/GL/dmesa.h 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/include/GL/dmesa.h 2005-11-04 20:28:07 UTC (rev 19004) @@ -23,9 +23,9 @@
*/
/* - * DOS/DJGPP device driver v1.6 for Mesa + * DOS/DJGPP device driver v1.7 for Mesa * - * Copyright (C) 2002 - Borca Daniel + * Copyright (C) 2002 - Daniel Borca * Email : dborca@users.sourceforge.net * Web : http://www.geocities.com/dborca */ @@ -35,7 +35,7 @@ #define DMESA_H_included
#define DMESA_MAJOR_VERSION 6 -#define DMESA_MINOR_VERSION 1 +#define DMESA_MINOR_VERSION 3
/* Sample Usage: * @@ -138,7 +138,8 @@ /* * DMesa functions */ -void *DMesaGetProcAddress (const char *name); +typedef void (*DMesaProc) (void); +DMesaProc DMesaGetProcAddress (const char *name);
/* * DMesa state retrieval. _____
Modified: trunk/reactos/lib/mesa32/include/GL/fxmesa.h --- trunk/reactos/lib/mesa32/include/GL/fxmesa.h 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/include/GL/fxmesa.h 2005-11-04 20:28:07 UTC (rev 19004) @@ -38,8 +38,8 @@
#endif
-#define FXMESA_MAJOR_VERSION 5 -#define FXMESA_MINOR_VERSION 0 +#define FXMESA_MAJOR_VERSION 6 +#define FXMESA_MINOR_VERSION 3
/* _____
Modified: trunk/reactos/lib/mesa32/include/GL/gl.h --- trunk/reactos/lib/mesa32/include/GL/gl.h 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/include/GL/gl.h 2005-11-04 20:28:07 UTC (rev 19004) @@ -1,8 +1,8 @@
/* * Mesa 3-D graphics library - * Version: 6.2 + * Version: 6.3 * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2005 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"), @@ -38,8 +38,6 @@ */ #if !defined(__SCITECH_SNAP__)
-#include <stddef.h> /* to get ptrdiff_t, used below */ - #if defined(__BEOS__) #include <stdlib.h> /* to get some BeOS-isms */ #endif @@ -64,11 +62,10 @@ #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */ # define GLAPI extern # define GLAPIENTRY __stdcall -#else -/* non-Windows compilation */ -# define GLAPI extern +#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 +# define GLAPI __attribute__((visibility("default"))) # define GLAPIENTRY -#endif /* WIN32 / CYGWIN bracket */ +#endif /* WIN32 && !CYGWIN */
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) # define PRAGMA_EXPORT_SUPPORTED 1 @@ -95,10 +92,22 @@ #pragma import on #endif
+#ifndef GLAPI +#define GLAPI extern +#endif + +#ifndef GLAPIENTRY +#define GLAPIENTRY +#endif + #ifndef APIENTRY #define APIENTRY GLAPIENTRY #endif + +/* "P" suffix to be used for a pointer to a function */ +#ifndef APIENTRYP #define APIENTRYP APIENTRY * +#endif
#ifndef GLAPIENTRYP #define GLAPIENTRYP GLAPIENTRY * @@ -844,7 +853,7 @@
GLAPI GLenum GLAPIENTRY glGetError( void );
-GLAPI const GLubyte* GLAPIENTRY glGetString( GLenum name ); +GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
GLAPI void GLAPIENTRY glFinish( void );
@@ -2204,13 +2213,9 @@
typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
-extern void -glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, - GLvoid *data); +GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
-extern void -glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, - GLfloat *v); +GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
#endif /* GL_MESA_program_debug */
@@ -2233,6 +2238,7 @@ **/
+ /********************************************************************** * Begin system-specific stuff */ _____
Modified: trunk/reactos/lib/mesa32/include/GL/gl_mangle.h --- trunk/reactos/lib/mesa32/include/GL/gl_mangle.h 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/include/GL/gl_mangle.h 2005-11-04 20:28:07 UTC (rev 19004) @@ -30,7 +30,6 @@
/* Internal symbols which may collide with other OpenGL implementations. */ #define __glCoreCreateContext __mglCoreCreateContext #define __glCoreNopDispatch __mglCoreNopDispatch -#define gl__unused413 MANGLE(__unused413)
/*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
@@ -51,6 +50,7 @@ #define glArrayObjectATI MANGLE(ArrayObjectATI) #define glAsyncMarkerSGIX MANGLE(AsyncMarkerSGIX) #define glAttachObjectARB MANGLE(AttachObjectARB) +#define glAttachShader MANGLE(AttachShader) #define glBeginFragmentShaderATI MANGLE(BeginFragmentShaderATI) #define glBegin MANGLE(Begin) #define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV) @@ -58,14 +58,17 @@ #define glBeginQuery MANGLE(BeginQuery) #define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT) #define glBindAttribLocationARB MANGLE(BindAttribLocationARB) +#define glBindAttribLocation MANGLE(BindAttribLocation) #define glBindBufferARB MANGLE(BindBufferARB) #define glBindBuffer MANGLE(BindBuffer) #define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI) +#define glBindFramebufferEXT MANGLE(BindFramebufferEXT) #define glBindLightParameterEXT MANGLE(BindLightParameterEXT) #define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT) #define glBindParameterEXT MANGLE(BindParameterEXT) #define glBindProgramARB MANGLE(BindProgramARB) #define glBindProgramNV MANGLE(BindProgramNV) +#define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT) #define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT) #define glBindTextureEXT MANGLE(BindTextureEXT) #define glBindTexture MANGLE(BindTexture) @@ -90,6 +93,7 @@ #define glBlendEquation MANGLE(BlendEquation) #define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI) #define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT) +#define glBlendEquationSeparate MANGLE(BlendEquationSeparate) #define glBlendFunc MANGLE(BlendFunc) #define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT) #define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR) @@ -100,6 +104,8 @@ #define glBufferSubData MANGLE(BufferSubData) #define glCallList MANGLE(CallList) #define glCallLists MANGLE(CallLists) +#define glCheckFramebufferStatusEXT MANGLE(CheckFramebufferStatusEXT) +#define glClampColorARB MANGLE(ClampColorARB) #define glClearAccum MANGLE(ClearAccum) #define glClearColor MANGLE(ClearColor) #define glClearDepth MANGLE(ClearDepth) @@ -180,6 +186,7 @@ #define glCombinerParameterivNV MANGLE(CombinerParameterivNV) #define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV) #define glCompileShaderARB MANGLE(CompileShaderARB) +#define glCompileShader MANGLE(CompileShader) #define glCompressedTexImage1DARB MANGLE(CompressedTexImage1DARB) #define glCompressedTexImage1D MANGLE(CompressedTexImage1D) #define glCompressedTexImage2DARB MANGLE(CompressedTexImage2DARB) @@ -223,7 +230,9 @@ #define glCopyTexSubImage2D MANGLE(CopyTexSubImage2D) #define glCopyTexSubImage3DEXT MANGLE(CopyTexSubImage3DEXT) #define glCopyTexSubImage3D MANGLE(CopyTexSubImage3D) +#define glCreateProgram MANGLE(CreateProgram) #define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB) +#define glCreateShader MANGLE(CreateShader) #define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB) #define glCullFace MANGLE(CullFace) #define glCullParameterdvEXT MANGLE(CullParameterdvEXT) @@ -238,13 +247,17 @@ #define glDeleteFencesAPPLE MANGLE(DeleteFencesAPPLE) #define glDeleteFencesNV MANGLE(DeleteFencesNV) #define glDeleteFragmentShaderATI MANGLE(DeleteFragmentShaderATI) +#define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT) #define glDeleteLists MANGLE(DeleteLists) #define glDeleteObjectARB MANGLE(DeleteObjectARB) #define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV) +#define glDeleteProgram MANGLE(DeleteProgram) #define glDeleteProgramsARB MANGLE(DeleteProgramsARB) #define glDeleteProgramsNV MANGLE(DeleteProgramsNV) #define glDeleteQueriesARB MANGLE(DeleteQueriesARB) #define glDeleteQueries MANGLE(DeleteQueries) +#define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT) +#define glDeleteShader MANGLE(DeleteShader) #define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT) #define glDeleteTextures MANGLE(DeleteTextures) #define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE) @@ -254,16 +267,20 @@ #define glDepthMask MANGLE(DepthMask) #define glDepthRange MANGLE(DepthRange) #define glDetachObjectARB MANGLE(DetachObjectARB) +#define glDetachShader MANGLE(DetachShader) #define glDetailTexFuncSGIS MANGLE(DetailTexFuncSGIS) #define glDisableClientState MANGLE(DisableClientState) #define glDisable MANGLE(Disable) #define glDisableTraceMESA MANGLE(DisableTraceMESA) #define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT) #define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB) +#define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray) #define glDrawArraysEXT MANGLE(DrawArraysEXT) #define glDrawArrays MANGLE(DrawArrays) #define glDrawBuffer MANGLE(DrawBuffer) +#define glDrawBuffersARB MANGLE(DrawBuffersARB) #define glDrawBuffersATI MANGLE(DrawBuffersATI) +#define glDrawBuffers MANGLE(DrawBuffers) #define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE) #define glDrawElementArrayATI MANGLE(DrawElementArrayATI) #define glDrawElements MANGLE(DrawElements) @@ -285,6 +302,7 @@ #define glEnableTraceMESA MANGLE(EnableTraceMESA) #define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT) #define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB) +#define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray) #define glEndFragmentShaderATI MANGLE(EndFragmentShaderATI) #define glEndList MANGLE(EndList) #define glEnd MANGLE(End) @@ -352,6 +370,10 @@ #define glFragmentMaterialfvSGIX MANGLE(FragmentMaterialfvSGIX) #define glFragmentMaterialiSGIX MANGLE(FragmentMaterialiSGIX) #define glFragmentMaterialivSGIX MANGLE(FragmentMaterialivSGIX) +#define glFramebufferRenderbufferEXT MANGLE(FramebufferRenderbufferEXT) +#define glFramebufferTexture1DEXT MANGLE(FramebufferTexture1DEXT) +#define glFramebufferTexture2DEXT MANGLE(FramebufferTexture2DEXT) +#define glFramebufferTexture3DEXT MANGLE(FramebufferTexture3DEXT) #define glFrameZoomSGIX MANGLE(FrameZoomSGIX) #define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI) #define glFrontFace MANGLE(FrontFace) @@ -359,26 +381,33 @@ #define glGenAsyncMarkersSGIX MANGLE(GenAsyncMarkersSGIX) #define glGenBuffersARB MANGLE(GenBuffersARB) #define glGenBuffers MANGLE(GenBuffers) +#define glGenerateMipmapEXT MANGLE(GenerateMipmapEXT) #define glGenFencesAPPLE MANGLE(GenFencesAPPLE) #define glGenFencesNV MANGLE(GenFencesNV) #define glGenFragmentShadersATI MANGLE(GenFragmentShadersATI) +#define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT) #define glGenLists MANGLE(GenLists) #define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV) #define glGenProgramsARB MANGLE(GenProgramsARB) #define glGenProgramsNV MANGLE(GenProgramsNV) #define glGenQueriesARB MANGLE(GenQueriesARB) #define glGenQueries MANGLE(GenQueries) +#define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT) #define glGenSymbolsEXT MANGLE(GenSymbolsEXT) #define glGenTexturesEXT MANGLE(GenTexturesEXT) #define glGenTextures MANGLE(GenTextures) #define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE) #define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT) #define glGetActiveAttribARB MANGLE(GetActiveAttribARB) +#define glGetActiveAttrib MANGLE(GetActiveAttrib) #define glGetActiveUniformARB MANGLE(GetActiveUniformARB) +#define glGetActiveUniform MANGLE(GetActiveUniform) #define glGetArrayObjectfvATI MANGLE(GetArrayObjectfvATI) #define glGetArrayObjectivATI MANGLE(GetArrayObjectivATI) #define glGetAttachedObjectsARB MANGLE(GetAttachedObjectsARB) +#define glGetAttachedShaders MANGLE(GetAttachedShaders) #define glGetAttribLocationARB MANGLE(GetAttribLocationARB) +#define glGetAttribLocation MANGLE(GetAttribLocation) #define glGetBooleanv MANGLE(GetBooleanv) #define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB) #define glGetBufferParameteriv MANGLE(GetBufferParameteriv) @@ -421,6 +450,7 @@ #define glGetFragmentLightivSGIX MANGLE(GetFragmentLightivSGIX) #define glGetFragmentMaterialfvSGIX MANGLE(GetFragmentMaterialfvSGIX) #define glGetFragmentMaterialivSGIX MANGLE(GetFragmentMaterialivSGIX) +#define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT) #define glGetHandleARB MANGLE(GetHandleARB) #define glGetHistogramEXT MANGLE(GetHistogramEXT) #define glGetHistogram MANGLE(GetHistogram) @@ -475,7 +505,9 @@ #define glGetPolygonStipple MANGLE(GetPolygonStipple) #define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB) #define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB) +#define glGetProgramInfoLog MANGLE(GetProgramInfoLog) #define glGetProgramivARB MANGLE(GetProgramivARB) +#define glGetProgramiv MANGLE(GetProgramiv) #define glGetProgramivNV MANGLE(GetProgramivNV) #define glGetProgramLocalParameterdvARB MANGLE(GetProgramLocalParameterdvARB) #define glGetProgramLocalParameterfvARB MANGLE(GetProgramLocalParameterfvARB) @@ -483,6 +515,7 @@ #define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV) #define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV) #define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV) +#define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA) #define glGetProgramStringARB MANGLE(GetProgramStringARB) #define glGetProgramStringNV MANGLE(GetProgramStringNV) #define glGetQueryivARB MANGLE(GetQueryivARB) @@ -491,9 +524,13 @@ #define glGetQueryObjectiv MANGLE(GetQueryObjectiv) #define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB) #define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv) +#define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT) #define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT) #define glGetSeparableFilter MANGLE(GetSeparableFilter) +#define glGetShaderInfoLog MANGLE(GetShaderInfoLog) +#define glGetShaderiv MANGLE(GetShaderiv) #define glGetShaderSourceARB MANGLE(GetShaderSourceARB) +#define glGetShaderSource MANGLE(GetShaderSource) #define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS) #define glGetString MANGLE(GetString) #define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI) @@ -511,8 +548,11 @@ #define glGetTexParameteriv MANGLE(GetTexParameteriv) #define glGetTrackMatrixivNV MANGLE(GetTrackMatrixivNV) #define glGetUniformfvARB MANGLE(GetUniformfvARB) +#define glGetUniformfv MANGLE(GetUniformfv) #define glGetUniformivARB MANGLE(GetUniformivARB) +#define glGetUniformiv MANGLE(GetUniformiv) #define glGetUniformLocationARB MANGLE(GetUniformLocationARB) +#define glGetUniformLocation MANGLE(GetUniformLocation) #define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI) #define glGetVariantArrayObjectivATI MANGLE(GetVariantArrayObjectivATI) #define glGetVariantBooleanvEXT MANGLE(GetVariantBooleanvEXT) @@ -522,12 +562,16 @@ #define glGetVertexAttribArrayObjectfvATI MANGLE(GetVertexAttribArrayObjectfvATI) #define glGetVertexAttribArrayObjectivATI MANGLE(GetVertexAttribArrayObjectivATI) #define glGetVertexAttribdvARB MANGLE(GetVertexAttribdvARB) +#define glGetVertexAttribdv MANGLE(GetVertexAttribdv) #define glGetVertexAttribdvNV MANGLE(GetVertexAttribdvNV) #define glGetVertexAttribfvARB MANGLE(GetVertexAttribfvARB) +#define glGetVertexAttribfv MANGLE(GetVertexAttribfv) #define glGetVertexAttribfvNV MANGLE(GetVertexAttribfvNV) #define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB) +#define glGetVertexAttribiv MANGLE(GetVertexAttribiv) #define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV) #define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB) +#define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv) #define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV) #define glGlobalAlphaFactorbSUN MANGLE(GlobalAlphaFactorbSUN) #define glGlobalAlphaFactordSUN MANGLE(GlobalAlphaFactordSUN) @@ -572,13 +616,17 @@ #define glIsEnabled MANGLE(IsEnabled) #define glIsFenceAPPLE MANGLE(IsFenceAPPLE) #define glIsFenceNV MANGLE(IsFenceNV) +#define glIsFramebufferEXT MANGLE(IsFramebufferEXT) #define glIsList MANGLE(IsList) #define glIsObjectBufferATI MANGLE(IsObjectBufferATI) #define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV) #define glIsProgramARB MANGLE(IsProgramARB) +#define glIsProgram MANGLE(IsProgram) #define glIsProgramNV MANGLE(IsProgramNV) #define glIsQueryARB MANGLE(IsQueryARB) #define glIsQuery MANGLE(IsQuery) +#define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT) +#define glIsShader MANGLE(IsShader) #define glIsTextureEXT MANGLE(IsTextureEXT) #define glIsTexture MANGLE(IsTexture) #define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT) @@ -595,6 +643,7 @@ #define glLineStipple MANGLE(LineStipple) #define glLineWidth MANGLE(LineWidth) #define glLinkProgramARB MANGLE(LinkProgramARB) +#define glLinkProgram MANGLE(LinkProgram) #define glListBase MANGLE(ListBase) #define glListParameterfSGIX MANGLE(ListParameterfSGIX) #define glListParameterfvSGIX MANGLE(ListParameterfvSGIX) @@ -804,6 +853,7 @@ #define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV) #define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT) #define glPrioritizeTextures MANGLE(PrioritizeTextures) +#define glProgramCallbackMESA MANGLE(ProgramCallbackMESA) #define glProgramEnvParameter4dARB MANGLE(ProgramEnvParameter4dARB) #define glProgramEnvParameter4dvARB MANGLE(ProgramEnvParameter4dvARB) #define glProgramEnvParameter4fARB MANGLE(ProgramEnvParameter4fARB) @@ -863,6 +913,7 @@ #define glRects MANGLE(Rects) #define glRectsv MANGLE(Rectsv) #define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX) +#define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT) #define glRenderMode MANGLE(RenderMode) #define glReplacementCodePointerSUN MANGLE(ReplacementCodePointerSUN) #define glReplacementCodeubSUN MANGLE(ReplacementCodeubSUN) @@ -955,6 +1006,7 @@ #define glShaderOp2EXT MANGLE(ShaderOp2EXT) #define glShaderOp3EXT MANGLE(ShaderOp3EXT) #define glShaderSourceARB MANGLE(ShaderSourceARB) +#define glShaderSource MANGLE(ShaderSource) #define glSharpenTexFuncSGIS MANGLE(SharpenTexFuncSGIS) #define glSpriteParameterfSGIX MANGLE(SpriteParameterfSGIX) #define glSpriteParameterfvSGIX MANGLE(SpriteParameterfvSGIX) @@ -963,10 +1015,14 @@ #define glStartInstrumentsSGIX MANGLE(StartInstrumentsSGIX) #define glStencilFunc MANGLE(StencilFunc) #define glStencilFuncSeparateATI MANGLE(StencilFuncSeparateATI) +#define glStencilFuncSeparate MANGLE(StencilFuncSeparate) #define glStencilMask MANGLE(StencilMask) +#define glStencilMaskSeparate MANGLE(StencilMaskSeparate) #define glStencilOp MANGLE(StencilOp) #define glStencilOpSeparateATI MANGLE(StencilOpSeparateATI) +#define glStencilOpSeparate MANGLE(StencilOpSeparate) #define glStopInstrumentsSGIX MANGLE(StopInstrumentsSGIX) +#define glStringMarkerGREMEDY MANGLE(StringMarkerGREMEDY) #define glSwizzleEXT MANGLE(SwizzleEXT) #define glTagSampleBufferSGIX MANGLE(TagSampleBufferSGIX) #define glTangent3bEXT MANGLE(Tangent3bEXT) @@ -1085,31 +1141,52 @@ #define glTranslated MANGLE(Translated) #define glTranslatef MANGLE(Translatef) #define glUniform1fARB MANGLE(Uniform1fARB) +#define glUniform1f MANGLE(Uniform1f) #define glUniform1fvARB MANGLE(Uniform1fvARB) +#define glUniform1fv MANGLE(Uniform1fv) #define glUniform1iARB MANGLE(Uniform1iARB) +#define glUniform1i MANGLE(Uniform1i) #define glUniform1ivARB MANGLE(Uniform1ivARB) +#define glUniform1iv MANGLE(Uniform1iv) #define glUniform2fARB MANGLE(Uniform2fARB) +#define glUniform2f MANGLE(Uniform2f) #define glUniform2fvARB MANGLE(Uniform2fvARB) +#define glUniform2fv MANGLE(Uniform2fv) #define glUniform2iARB MANGLE(Uniform2iARB) +#define glUniform2i MANGLE(Uniform2i) #define glUniform2ivARB MANGLE(Uniform2ivARB) +#define glUniform2iv MANGLE(Uniform2iv) #define glUniform3fARB MANGLE(Uniform3fARB) +#define glUniform3f MANGLE(Uniform3f) #define glUniform3fvARB MANGLE(Uniform3fvARB) +#define glUniform3fv MANGLE(Uniform3fv) #define glUniform3iARB MANGLE(Uniform3iARB) +#define glUniform3i MANGLE(Uniform3i) #define glUniform3ivARB MANGLE(Uniform3ivARB) +#define glUniform3iv MANGLE(Uniform3iv) #define glUniform4fARB MANGLE(Uniform4fARB) +#define glUniform4f MANGLE(Uniform4f) #define glUniform4fvARB MANGLE(Uniform4fvARB) +#define glUniform4fv MANGLE(Uniform4fv) #define glUniform4iARB MANGLE(Uniform4iARB) +#define glUniform4i MANGLE(Uniform4i) #define glUniform4ivARB MANGLE(Uniform4ivARB) +#define glUniform4iv MANGLE(Uniform4iv) #define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB) +#define glUniformMatrix2fv MANGLE(UniformMatrix2fv) #define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB) +#define glUniformMatrix3fv MANGLE(UniformMatrix3fv) #define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB) +#define glUniformMatrix4fv MANGLE(UniformMatrix4fv) #define glUnlockArraysEXT MANGLE(UnlockArraysEXT) #define glUnmapBufferARB MANGLE(UnmapBufferARB) #define glUnmapBuffer MANGLE(UnmapBuffer) #define glUnmapObjectBufferATI MANGLE(UnmapObjectBufferATI) #define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI) +#define glUseProgram MANGLE(UseProgram) #define glUseProgramObjectARB MANGLE(UseProgramObjectARB) #define glValidateProgramARB MANGLE(ValidateProgramARB) +#define glValidateProgram MANGLE(ValidateProgram) #define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI) #define glVariantbvEXT MANGLE(VariantbvEXT) #define glVariantdvEXT MANGLE(VariantdvEXT) @@ -1154,77 +1231,114 @@ #define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE) #define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV) #define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB) +#define glVertexAttrib1d MANGLE(VertexAttrib1d) #define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV) #define glVertexAttrib1dvARB MANGLE(VertexAttrib1dvARB) +#define glVertexAttrib1dv MANGLE(VertexAttrib1dv) #define glVertexAttrib1dvNV MANGLE(VertexAttrib1dvNV) #define glVertexAttrib1fARB MANGLE(VertexAttrib1fARB) +#define glVertexAttrib1f MANGLE(VertexAttrib1f) #define glVertexAttrib1fNV MANGLE(VertexAttrib1fNV) #define glVertexAttrib1fvARB MANGLE(VertexAttrib1fvARB) +#define glVertexAttrib1fv MANGLE(VertexAttrib1fv) #define glVertexAttrib1fvNV MANGLE(VertexAttrib1fvNV) #define glVertexAttrib1hNV MANGLE(VertexAttrib1hNV) #define glVertexAttrib1hvNV MANGLE(VertexAttrib1hvNV) #define glVertexAttrib1sARB MANGLE(VertexAttrib1sARB) +#define glVertexAttrib1s MANGLE(VertexAttrib1s) #define glVertexAttrib1sNV MANGLE(VertexAttrib1sNV) #define glVertexAttrib1svARB MANGLE(VertexAttrib1svARB) +#define glVertexAttrib1sv MANGLE(VertexAttrib1sv) #define glVertexAttrib1svNV MANGLE(VertexAttrib1svNV) #define glVertexAttrib2dARB MANGLE(VertexAttrib2dARB) +#define glVertexAttrib2d MANGLE(VertexAttrib2d) #define glVertexAttrib2dNV MANGLE(VertexAttrib2dNV) #define glVertexAttrib2dvARB MANGLE(VertexAttrib2dvARB) +#define glVertexAttrib2dv MANGLE(VertexAttrib2dv) #define glVertexAttrib2dvNV MANGLE(VertexAttrib2dvNV) #define glVertexAttrib2fARB MANGLE(VertexAttrib2fARB) +#define glVertexAttrib2f MANGLE(VertexAttrib2f) #define glVertexAttrib2fNV MANGLE(VertexAttrib2fNV) #define glVertexAttrib2fvARB MANGLE(VertexAttrib2fvARB) +#define glVertexAttrib2fv MANGLE(VertexAttrib2fv) #define glVertexAttrib2fvNV MANGLE(VertexAttrib2fvNV) #define glVertexAttrib2hNV MANGLE(VertexAttrib2hNV) #define glVertexAttrib2hvNV MANGLE(VertexAttrib2hvNV) #define glVertexAttrib2sARB MANGLE(VertexAttrib2sARB) +#define glVertexAttrib2s MANGLE(VertexAttrib2s) #define glVertexAttrib2sNV MANGLE(VertexAttrib2sNV) #define glVertexAttrib2svARB MANGLE(VertexAttrib2svARB) +#define glVertexAttrib2sv MANGLE(VertexAttrib2sv) #define glVertexAttrib2svNV MANGLE(VertexAttrib2svNV) #define glVertexAttrib3dARB MANGLE(VertexAttrib3dARB) +#define glVertexAttrib3d MANGLE(VertexAttrib3d) #define glVertexAttrib3dNV MANGLE(VertexAttrib3dNV) #define glVertexAttrib3dvARB MANGLE(VertexAttrib3dvARB) +#define glVertexAttrib3dv MANGLE(VertexAttrib3dv) #define glVertexAttrib3dvNV MANGLE(VertexAttrib3dvNV) #define glVertexAttrib3fARB MANGLE(VertexAttrib3fARB) +#define glVertexAttrib3f MANGLE(VertexAttrib3f) #define glVertexAttrib3fNV MANGLE(VertexAttrib3fNV) #define glVertexAttrib3fvARB MANGLE(VertexAttrib3fvARB) +#define glVertexAttrib3fv MANGLE(VertexAttrib3fv) #define glVertexAttrib3fvNV MANGLE(VertexAttrib3fvNV) #define glVertexAttrib3hNV MANGLE(VertexAttrib3hNV) #define glVertexAttrib3hvNV MANGLE(VertexAttrib3hvNV) #define glVertexAttrib3sARB MANGLE(VertexAttrib3sARB) +#define glVertexAttrib3s MANGLE(VertexAttrib3s) #define glVertexAttrib3sNV MANGLE(VertexAttrib3sNV) #define glVertexAttrib3svARB MANGLE(VertexAttrib3svARB) +#define glVertexAttrib3sv MANGLE(VertexAttrib3sv) #define glVertexAttrib3svNV MANGLE(VertexAttrib3svNV) #define glVertexAttrib4bvARB MANGLE(VertexAttrib4bvARB) +#define glVertexAttrib4bv MANGLE(VertexAttrib4bv) #define glVertexAttrib4dARB MANGLE(VertexAttrib4dARB) +#define glVertexAttrib4d MANGLE(VertexAttrib4d) #define glVertexAttrib4dNV MANGLE(VertexAttrib4dNV) #define glVertexAttrib4dvARB MANGLE(VertexAttrib4dvARB) +#define glVertexAttrib4dv MANGLE(VertexAttrib4dv) #define glVertexAttrib4dvNV MANGLE(VertexAttrib4dvNV) #define glVertexAttrib4fARB MANGLE(VertexAttrib4fARB) +#define glVertexAttrib4f MANGLE(VertexAttrib4f) #define glVertexAttrib4fNV MANGLE(VertexAttrib4fNV) #define glVertexAttrib4fvARB MANGLE(VertexAttrib4fvARB) +#define glVertexAttrib4fv MANGLE(VertexAttrib4fv) #define glVertexAttrib4fvNV MANGLE(VertexAttrib4fvNV) #define glVertexAttrib4hNV MANGLE(VertexAttrib4hNV) #define glVertexAttrib4hvNV MANGLE(VertexAttrib4hvNV) #define glVertexAttrib4ivARB MANGLE(VertexAttrib4ivARB) +#define glVertexAttrib4iv MANGLE(VertexAttrib4iv) #define glVertexAttrib4NbvARB MANGLE(VertexAttrib4NbvARB) +#define glVertexAttrib4Nbv MANGLE(VertexAttrib4Nbv) #define glVertexAttrib4NivARB MANGLE(VertexAttrib4NivARB) +#define glVertexAttrib4Niv MANGLE(VertexAttrib4Niv) #define glVertexAttrib4NsvARB MANGLE(VertexAttrib4NsvARB) +#define glVertexAttrib4Nsv MANGLE(VertexAttrib4Nsv) #define glVertexAttrib4NubARB MANGLE(VertexAttrib4NubARB) +#define glVertexAttrib4Nub MANGLE(VertexAttrib4Nub) #define glVertexAttrib4NubvARB MANGLE(VertexAttrib4NubvARB) +#define glVertexAttrib4Nubv MANGLE(VertexAttrib4Nubv) #define glVertexAttrib4NuivARB MANGLE(VertexAttrib4NuivARB) +#define glVertexAttrib4Nuiv MANGLE(VertexAttrib4Nuiv) #define glVertexAttrib4NusvARB MANGLE(VertexAttrib4NusvARB) +#define glVertexAttrib4Nusv MANGLE(VertexAttrib4Nusv) #define glVertexAttrib4sARB MANGLE(VertexAttrib4sARB) +#define glVertexAttrib4s MANGLE(VertexAttrib4s) #define glVertexAttrib4sNV MANGLE(VertexAttrib4sNV) #define glVertexAttrib4svARB MANGLE(VertexAttrib4svARB) +#define glVertexAttrib4sv MANGLE(VertexAttrib4sv) #define glVertexAttrib4svNV MANGLE(VertexAttrib4svNV) #define glVertexAttrib4ubNV MANGLE(VertexAttrib4ubNV) #define glVertexAttrib4ubvARB MANGLE(VertexAttrib4ubvARB) +#define glVertexAttrib4ubv MANGLE(VertexAttrib4ubv) #define glVertexAttrib4ubvNV MANGLE(VertexAttrib4ubvNV) #define glVertexAttrib4uivARB MANGLE(VertexAttrib4uivARB) +#define glVertexAttrib4uiv MANGLE(VertexAttrib4uiv) #define glVertexAttrib4usvARB MANGLE(VertexAttrib4usvARB) +#define glVertexAttrib4usv MANGLE(VertexAttrib4usv) #define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI) #define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB) +#define glVertexAttribPointer MANGLE(VertexAttribPointer) #define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV) #define glVertexAttribs1dvNV MANGLE(VertexAttribs1dvNV) #define glVertexAttribs1fvNV MANGLE(VertexAttribs1fvNV) _____
Modified: trunk/reactos/lib/mesa32/include/GL/glext.h --- trunk/reactos/lib/mesa32/include/GL/glext.h 2005-11-04 20:24:44 UTC (rev 19003) +++ trunk/reactos/lib/mesa32/include/GL/glext.h 2005-11-04 20:28:07 UTC (rev 19004) @@ -52,9 +52,9 @@
/*************************************************************/
/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated 2004/7/26 */ +/* glext.h last updated 2005/06/20 */ /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ -#define GL_GLEXT_VERSION 24 +#define GL_GLEXT_VERSION 29
#ifndef GL_VERSION_1_2 #define GL_UNSIGNED_BYTE_3_3_2 0x8032 @@ -372,6 +372,93 @@ #define GL_SRC2_ALPHA GL_SOURCE2_ALPHA #endif
+#ifndef GL_VERSION_2_0 +#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION +#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 +#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 +#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 +#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 +#define GL_CURRENT_VERTEX_ATTRIB 0x8626 +#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 +#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 +#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 +#define GL_STENCIL_BACK_FUNC 0x8800 +#define GL_STENCIL_BACK_FAIL 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 +#define GL_MAX_DRAW_BUFFERS 0x8824 +#define GL_DRAW_BUFFER0 0x8825 +#define GL_DRAW_BUFFER1 0x8826 +#define GL_DRAW_BUFFER2 0x8827 +#define GL_DRAW_BUFFER3 0x8828 +#define GL_DRAW_BUFFER4 0x8829 +#define GL_DRAW_BUFFER5 0x882A +#define GL_DRAW_BUFFER6 0x882B +#define GL_DRAW_BUFFER7 0x882C +#define GL_DRAW_BUFFER8 0x882D +#define GL_DRAW_BUFFER9 0x882E +#define GL_DRAW_BUFFER10 0x882F +#define GL_DRAW_BUFFER11 0x8830 +#define GL_DRAW_BUFFER12 0x8831 +#define GL_DRAW_BUFFER13 0x8832 +#define GL_DRAW_BUFFER14 0x8833 +#define GL_DRAW_BUFFER15 0x8834 +#define GL_BLEND_EQUATION_ALPHA 0x883D +#define GL_POINT_SPRITE 0x8861 +#define GL_COORD_REPLACE 0x8862 +#define GL_MAX_VERTEX_ATTRIBS 0x8869 +#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A +#define GL_MAX_TEXTURE_COORDS 0x8871 +#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 +#define GL_FRAGMENT_SHADER 0x8B30 +#define GL_VERTEX_SHADER 0x8B31 +#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A +#define GL_MAX_VARYING_FLOATS 0x8B4B +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D +#define GL_SHADER_TYPE 0x8B4F +#define GL_FLOAT_VEC2 0x8B50 +#define GL_FLOAT_VEC3 0x8B51 +#define GL_FLOAT_VEC4 0x8B52 +#define GL_INT_VEC2 0x8B53 +#define GL_INT_VEC3 0x8B54 +#define GL_INT_VEC4 0x8B55 +#define GL_BOOL 0x8B56 +#define GL_BOOL_VEC2 0x8B57 +#define GL_BOOL_VEC3 0x8B58 +#define GL_BOOL_VEC4 0x8B59 +#define GL_FLOAT_MAT2 0x8B5A +#define GL_FLOAT_MAT3 0x8B5B +#define GL_FLOAT_MAT4 0x8B5C +#define GL_SAMPLER_1D 0x8B5D +#define GL_SAMPLER_2D 0x8B5E +#define GL_SAMPLER_3D 0x8B5F +#define GL_SAMPLER_CUBE 0x8B60 +#define GL_SAMPLER_1D_SHADOW 0x8B61 +#define GL_SAMPLER_2D_SHADOW 0x8B62 +#define GL_DELETE_STATUS 0x8B80 +#define GL_COMPILE_STATUS 0x8B81 +#define GL_LINK_STATUS 0x8B82 +#define GL_VALIDATE_STATUS 0x8B83 +#define GL_INFO_LOG_LENGTH 0x8B84 +#define GL_ATTACHED_SHADERS 0x8B85 +#define GL_ACTIVE_UNIFORMS 0x8B86 +#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +#define GL_SHADER_SOURCE_LENGTH 0x8B88 +#define GL_ACTIVE_ATTRIBUTES 0x8B89 +#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B +#define GL_SHADING_LANGUAGE_VERSION 0x8B8C +#define GL_CURRENT_PROGRAM 0x8B8D +#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 +#define GL_LOWER_LEFT 0x8CA1 +#define GL_UPPER_LEFT 0x8CA2 +#define GL_STENCIL_BACK_REF 0x8CA3 +#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 +#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 +#endif + #ifndef GL_ARB_multitexture #define GL_TEXTURE0_ARB 0x84C0 #define GL_TEXTURE1_ARB 0x84C1 @@ -825,6 +912,48 @@ #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 #endif
+#ifndef GL_ARB_color_buffer_float +#define GL_RGBA_FLOAT_MODE_ARB 0x8820 +#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A +#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B +#define GL_CLAMP_READ_COLOR_ARB 0x891C +#define GL_FIXED_ONLY_ARB 0x891D +#endif + +#ifndef GL_ARB_half_float_pixel +#define GL_HALF_FLOAT_ARB 0x140B +#endif + +#ifndef GL_ARB_texture_float +#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 +#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 +#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 +#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 +#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 +#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 +#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 +#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 +#define GL_RGBA32F_ARB 0x8814 +#define GL_RGB32F_ARB 0x8815 +#define GL_ALPHA32F_ARB 0x8816 +#define GL_INTENSITY32F_ARB 0x8817 +#define GL_LUMINANCE32F_ARB 0x8818 +#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 +#define GL_RGBA16F_ARB 0x881A +#define GL_RGB16F_ARB 0x881B +#define GL_ALPHA16F_ARB 0x881C +#define GL_INTENSITY16F_ARB 0x881D +#define GL_LUMINANCE16F_ARB 0x881E +#define GL_LUMINANCE_ALPHA16F_ARB 0x881F +#endif + +#ifndef GL_ARB_pixel_buffer_object +#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB +#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC +#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED +#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF +#endif + #ifndef GL_EXT_abgr #define GL_ABGR_EXT 0x8000 #endif @@ -2793,6 +2922,11 @@ #ifndef GL_ATI_vertex_attrib_array_object #endif
+#ifndef GL_OES_read_format +#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A +#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B +#endif + #ifndef GL_EXT_depth_bounds_test #define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 #define GL_DEPTH_BOUNDS_EXT 0x8891 @@ -2846,10 +2980,73 @@ /* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ #endif
+#ifndef GL_EXT_framebuffer_object +#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 +#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 +#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 +#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 +#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 +#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 +#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8 +#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 +#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA +#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB +#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC +#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD +#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF +#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 +#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 +#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 +#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 +#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 +#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 +#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 +#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 +#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 +#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 +#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA +#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB +#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC +#define GL_COLOR_ATTACHMENT13_EXT 0x8CED +#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE +#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF +#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 +#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 +#define GL_FRAMEBUFFER_EXT 0x8D40 +#define GL_RENDERBUFFER_EXT 0x8D41 +#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 +#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 +#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 +#define GL_STENCIL_INDEX1_EXT 0x8D46 +#define GL_STENCIL_INDEX4_EXT 0x8D47 +#define GL_STENCIL_INDEX8_EXT 0x8D48 +#define GL_STENCIL_INDEX16_EXT 0x8D49 +#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 +#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 +#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 +#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 +#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 +#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 +#endif
+#ifndef GL_GREMEDY_string_marker +#endif + + /*************************************************************/
#include <stddef.h> +#ifndef GL_VERSION_2_0 +/* GL type for program/shader text */ +typedef char GLchar; /* native character */ +#endif + #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; @@ -2863,13 +3060,17 @@ #endif
#ifndef GL_ARB_shader_objects -/* GL types for handling shader object handles and characters */ +/* GL types for handling shader object handles and program/shader text */ typedef char GLcharARB; /* native character */ typedef unsigned int GLhandleARB; /* shader object handle */ #endif
+/* GL types for "half" precision (s10e5) float data in host memory */ +#ifndef GL_ARB_half_float_pixel +typedef unsigned short GLhalfARB; +#endif + #ifndef GL_NV_half_float -/* GL type for representing NVIDIA "half" floating point type in host memory */ typedef unsigned short GLhalfNV; #endif
@@ -3193,6 +3394,198 @@ typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); #endif
+#ifndef GL_VERSION_2_0 +#define GL_VERSION_2_0 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum); +GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *); +GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint); +GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint); +GLAPI void APIENTRY glAttachShader (GLuint, GLuint); +GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *); +GLAPI void APIENTRY glCompileShader (GLuint); +GLAPI GLuint APIENTRY glCreateProgram (void); +GLAPI GLuint APIENTRY glCreateShader (GLenum); +GLAPI void APIENTRY glDeleteProgram (GLuint); +GLAPI void APIENTRY glDeleteShader (GLuint); [truncated at 1000 lines; 137462 more skipped]
-
blight＠svn.reactos.com