<html>
<head>
<style>
<!--
body { background-color:#ffffff }
.file { border:1px solid #eeeeee; margin-top:1em; margin-bottom:1em }
.pathname { font-family:monospace; float:right }
.fileheader { margin-bottom:.5em }
.diff { margin:0 }
.tasklist { padding:4px; border:1px dashed #000000; margin-top:1em }
.tasklist ul { margin-top:0; margin-bottom:0 }
tr.alt { background-color:#eeeeee }
#added { background-color:#ddffdd }
#addedchars { background-color:#99ff99; font-weight:bolder }
tr.alt #added { background-color:#ccf7cc }
#removed { background-color:#ffdddd }
#removedchars { background-color:#ff9999; font-weight:bolder }
tr.alt #removed { background-color:#f7cccc }
#info { color:#888888 }
#context { background-color:#eeeeee }
td {padding-left:.3em; padding-right:.3em }
tr.head { border-bottom-width:1px; border-bottom-style:solid }
tr.head td { padding:0; padding-top:.2em }
.task { background-color:#ffff00 }
.comment { padding:4px; border:1px dashed #000000; background-color:#ffffdd }
.error { color:red }
hr { border-width:0px; height:2px; background:black }
-->
</style>
</head>
<body>
<pre class="comment">Merge changes from Mesa-6.4 vendor drop and apply fixes needed to get it compiling/working.</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/Makefile.ReactOS
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/README.ReactOS
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/include/GL/directfbgl.h
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/include/GL/internal/dri_interface.h
Added: trunk/reactos/lib/mesa32/include/GL/internal/sarea.h
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/include/GL/osmesa.h
Modified: trunk/reactos/lib/mesa32/include/GL/xmesa.h
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/include/GLView.h
</pre><pre class="diff" id="removed">Deleted: trunk/reactos/lib/mesa32/mesa32.def
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="removed">Deleted: trunk/reactos/lib/mesa32/src/array_cache/array_cache.dsp
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/src/drivers/directfb/
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/src/drivers/dri/Makefile
Added: trunk/reactos/lib/mesa32/src/drivers/dri/Makefile.template
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="added">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
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/glcontextmodes.c
Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/glcontextmodes.h
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/memops.h
</pre><pre class="diff" id="removed">Deleted: trunk/reactos/lib/mesa32/src/drivers/dri/common/mm.c
Deleted: trunk/reactos/lib/mesa32/src/drivers/dri/common/mm.h
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/mmio.h
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/spantmp.h
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/spantmp2.h
Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/spantmp_common.h
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mesa32/src/drivers/dri/common/xmlpool/
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/src/drivers/dri/common/xmlpool.h
</pre><pre class="diff" id="added">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/
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="removed">Deleted: trunk/reactos/lib/mesa32/src/drivers/glide/fxopengl.def
</pre><pre class="diff" id="context">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
</pre><pre class="diff" id="removed">Deleted: trunk/reactos/lib/mesa32/src/drivers/glide/fxwgl.c
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/src/drivers/osmesa/osmesa.c
</pre><pre class="diff" id="removed">Deleted: trunk/reactos/lib/mesa32/src/drivers/osmesa/osmesa.dsp
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mesa32/src/drivers/svga/svgamesa.c
</pre><strong class="error">[truncated at 100 lines; 294 more skipped]</strong>
<hr /><div class="file">
<div class="fileheader"><big><b>Added: trunk/reactos/lib/mesa32/Makefile.ReactOS</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="added">+# 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
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mesa32/README.ReactOS</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="removed">-This is Mesa-6.<span id="removedchars">2</span> (http://www.mesa3d.org/) with an ICD interface.
</pre><pre class="diff" id="added">+This is Mesa-6.<span id="addedchars">4</span> (http://www.mesa3d.org/) with an ICD interface.
</pre><pre class="diff" id="context">
The ICD functions are in src/drivers/windows/icd/icd.c
</pre><pre class="diff" id="removed">-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.
</pre><pre class="diff" id="added">+I have created a Makefile.ReactOS which will generate a mesa32 output directory
+containing the needed sources and a mesa32.xml rbuild file.
</pre><pre class="diff" id="context">
--blight
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Copied: trunk/reactos/lib/mesa32/include/GL/directfbgl.h</b> (from rev 19002, vendor/Mesa3D/current/include/GL/directfbgl.h)</big></div>
</div>
</div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mesa32/include/GL/dmesa.h</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> */
/*
</pre><pre class="diff" id="removed">- * DOS/DJGPP device driver v1.<span id="removedchars">6</span> for Mesa
</pre><pre class="diff" id="added">+ * DOS/DJGPP device driver v1.<span id="addedchars">7</span> for Mesa
</pre><pre class="diff" id="context"> *
</pre><pre class="diff" id="removed">- * Copyright (C) 2002 - <span id="removedchars">Borca Daniel</span>
</pre><pre class="diff" id="added">+ * Copyright (C) 2002 - <span id="addedchars">Daniel Borca</span>
</pre><pre class="diff" id="context"> * Email : dborca@users.sourceforge.net
* Web : http://www.geocities.com/dborca
*/
@@ -35,7 +35,7 @@
</pre><pre class="diff" id="context"> #define DMESA_H_included
#define DMESA_MAJOR_VERSION 6
</pre><pre class="diff" id="removed">-#define DMESA_MINOR_VERSION <span id="removedchars">1</span>
</pre><pre class="diff" id="added">+#define DMESA_MINOR_VERSION <span id="addedchars">3</span>
</pre><pre class="diff" id="context">
/* Sample Usage:
*
@@ -138,7 +138,8 @@
</pre><pre class="diff" id="context"> /*
* DMesa functions
*/
</pre><pre class="diff" id="removed">-<span id="removedchars">void *DMesaGetProcAddress (const char *name</span>);
</pre><pre class="diff" id="added">+<span id="addedchars">typedef void (*DMesaProc) (void</span>);
+DMesaProc DMesaGetProcAddress (const char *name);
</pre><pre class="diff" id="context">
/*
* DMesa state retrieval.
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mesa32/include/GL/fxmesa.h</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> #endif
</pre><pre class="diff" id="removed">-#define FXMESA_MAJOR_VERSION 5
-#define FXMESA_M<span id="removedchars">INOR_VERSION 0</span>
</pre><pre class="diff" id="added">+#define FXMESA_M<span id="addedchars">AJOR_VERSION 6</span>
+#define FXMESA_MINOR_VERSION 3
</pre><pre class="diff" id="context">
/*
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mesa32/include/GL/gl.h</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> /*
* Mesa 3-D graphics library
</pre><pre class="diff" id="removed">- * Version: 6.<span id="removedchars">2</span>
</pre><pre class="diff" id="added">+ * Version: 6.<span id="addedchars">3</span>
</pre><pre class="diff" id="context"> *
</pre><pre class="diff" id="removed">- * Copyright (C) 1999-200<span id="removedchars">4</span> Brian Paul All Rights Reserved.
</pre><pre class="diff" id="added">+ * Copyright (C) 1999-200<span id="addedchars">5</span> Brian Paul All Rights Reserved.
</pre><pre class="diff" id="context"> *
* 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 @@
</pre><pre class="diff" id="context"> */
#if !defined(__SCITECH_SNAP__)
</pre><pre class="diff" id="removed">-#include <stddef.h> /* to get ptrdiff_t, used below */
-
</pre><pre class="diff" id="context"> #if defined(__BEOS__)
#include <stdlib.h> /* to get some BeOS-isms */
#endif
@@ -64,11 +62,10 @@
</pre><pre class="diff" id="context"> #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
# define GLAPI extern
# define GLAPIENTRY __stdcall
</pre><pre class="diff" id="removed">-#else
-/* non-Windows compilation */
-#<span id="removedchars"> define GLAPI extern</span>
</pre><pre class="diff" id="added">+#<span id="addedchars">elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303</span>
+# define GLAPI __attribute__((visibility("default")))
</pre><pre class="diff" id="context"> # define GLAPIENTRY
</pre><pre class="diff" id="removed">-#endif /* WIN32 <span id="removedchars">/ CYGWIN bracket</span> */
</pre><pre class="diff" id="added">+#endif /* WIN32 <span id="addedchars">&& !CYGWIN</span> */
</pre><pre class="diff" id="context">
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
# define PRAGMA_EXPORT_SUPPORTED 1
@@ -95,10 +92,22 @@
</pre><pre class="diff" id="context"> #pragma import on
#endif
</pre><pre class="diff" id="added">+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
</pre><pre class="diff" id="context"> #ifndef APIENTRY
#define APIENTRY GLAPIENTRY
#endif
</pre><pre class="diff" id="added">+
+/* "P" suffix to be used for a pointer to a function */
+#ifndef APIENTRYP
</pre><pre class="diff" id="context"> #define APIENTRYP APIENTRY *
</pre><pre class="diff" id="added">+#endif
</pre><pre class="diff" id="context">
#ifndef GLAPIENTRYP
#define GLAPIENTRYP GLAPIENTRY *
@@ -844,7 +853,7 @@
</pre><pre class="diff" id="context">
GLAPI GLenum GLAPIENTRY glGetError( void );
</pre><pre class="diff" id="removed">-GLAPI const GLubyte* GLAPIENTRY glGetString( GLenum name );
</pre><pre class="diff" id="added">+GLAPI const GLubyte<span id="addedchars"> </span>* GLAPIENTRY glGetString( GLenum name );
</pre><pre class="diff" id="context">
GLAPI void GLAPIENTRY glFinish( void );
@@ -2204,13 +2213,9 @@
</pre><pre class="diff" id="context">
typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
</pre><pre class="diff" id="removed">-extern void
-glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
-<span id="removedchars"> </span> GLvoid *data);
</pre><pre class="diff" id="added">+<span id="addedchars">GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,</span> GLvoid *data);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">-extern void
-glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name,
-<span id="removedchars"> </span> GLfloat *v);
</pre><pre class="diff" id="added">+<span id="addedchars">GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name,</span> GLfloat *v);
</pre><pre class="diff" id="context">
#endif /* GL_MESA_program_debug */
@@ -2233,6 +2238,7 @@
</pre><pre class="diff" id="context"> **/
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> /**********************************************************************
* Begin system-specific stuff
*/
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mesa32/include/GL/gl_mangle.h</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> /* Internal symbols which may collide with other OpenGL implementations. */
#define __glCoreCreateContext __mglCoreCreateContext
#define __glCoreNopDispatch __mglCoreNopDispatch
</pre><pre class="diff" id="removed">-#define gl__unused413 MANGLE(__unused413)
</pre><pre class="diff" id="context">
/*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
@@ -51,6 +50,7 @@
</pre><pre class="diff" id="context"> #define glArrayObjectATI MANGLE(ArrayObjectATI)
#define glAsyncMarkerSGIX MANGLE(AsyncMarkerSGIX)
#define glAttachObjectARB MANGLE(AttachObjectARB)
</pre><pre class="diff" id="added">+#define glAttachShader MANGLE(AttachShader)
</pre><pre class="diff" id="context"> #define glBeginFragmentShaderATI MANGLE(BeginFragmentShaderATI)
#define glBegin MANGLE(Begin)
#define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV)
@@ -58,14 +58,17 @@
</pre><pre class="diff" id="context"> #define glBeginQuery MANGLE(BeginQuery)
#define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT)
#define glBindAttribLocationARB MANGLE(BindAttribLocationARB)
</pre><pre class="diff" id="added">+#define glBindAttribLocation MANGLE(BindAttribLocation)
</pre><pre class="diff" id="context"> #define glBindBufferARB MANGLE(BindBufferARB)
#define glBindBuffer MANGLE(BindBuffer)
#define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI)
</pre><pre class="diff" id="added">+#define glBindFramebufferEXT MANGLE(BindFramebufferEXT)
</pre><pre class="diff" id="context"> #define glBindLightParameterEXT MANGLE(BindLightParameterEXT)
#define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT)
#define glBindParameterEXT MANGLE(BindParameterEXT)
#define glBindProgramARB MANGLE(BindProgramARB)
#define glBindProgramNV MANGLE(BindProgramNV)
</pre><pre class="diff" id="added">+#define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT)
</pre><pre class="diff" id="context"> #define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT)
#define glBindTextureEXT MANGLE(BindTextureEXT)
#define glBindTexture MANGLE(BindTexture)
@@ -90,6 +93,7 @@
</pre><pre class="diff" id="context"> #define glBlendEquation MANGLE(BlendEquation)
#define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI)
#define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT)
</pre><pre class="diff" id="added">+#define glBlendEquationSeparate MANGLE(BlendEquationSeparate)
</pre><pre class="diff" id="context"> #define glBlendFunc MANGLE(BlendFunc)
#define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT)
#define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR)
@@ -100,6 +104,8 @@
</pre><pre class="diff" id="context"> #define glBufferSubData MANGLE(BufferSubData)
#define glCallList MANGLE(CallList)
#define glCallLists MANGLE(CallLists)
</pre><pre class="diff" id="added">+#define glCheckFramebufferStatusEXT MANGLE(CheckFramebufferStatusEXT)
+#define glClampColorARB MANGLE(ClampColorARB)
</pre><pre class="diff" id="context"> #define glClearAccum MANGLE(ClearAccum)
#define glClearColor MANGLE(ClearColor)
#define glClearDepth MANGLE(ClearDepth)
@@ -180,6 +186,7 @@
</pre><pre class="diff" id="context"> #define glCombinerParameterivNV MANGLE(CombinerParameterivNV)
#define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV)
#define glCompileShaderARB MANGLE(CompileShaderARB)
</pre><pre class="diff" id="added">+#define glCompileShader MANGLE(CompileShader)
</pre><pre class="diff" id="context"> #define glCompressedTexImage1DARB MANGLE(CompressedTexImage1DARB)
#define glCompressedTexImage1D MANGLE(CompressedTexImage1D)
#define glCompressedTexImage2DARB MANGLE(CompressedTexImage2DARB)
@@ -223,7 +230,9 @@
</pre><pre class="diff" id="context"> #define glCopyTexSubImage2D MANGLE(CopyTexSubImage2D)
#define glCopyTexSubImage3DEXT MANGLE(CopyTexSubImage3DEXT)
#define glCopyTexSubImage3D MANGLE(CopyTexSubImage3D)
</pre><pre class="diff" id="added">+#define glCreateProgram MANGLE(CreateProgram)
</pre><pre class="diff" id="context"> #define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB)
</pre><pre class="diff" id="added">+#define glCreateShader MANGLE(CreateShader)
</pre><pre class="diff" id="context"> #define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB)
#define glCullFace MANGLE(CullFace)
#define glCullParameterdvEXT MANGLE(CullParameterdvEXT)
@@ -238,13 +247,17 @@
</pre><pre class="diff" id="context"> #define glDeleteFencesAPPLE MANGLE(DeleteFencesAPPLE)
#define glDeleteFencesNV MANGLE(DeleteFencesNV)
#define glDeleteFragmentShaderATI MANGLE(DeleteFragmentShaderATI)
</pre><pre class="diff" id="added">+#define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT)
</pre><pre class="diff" id="context"> #define glDeleteLists MANGLE(DeleteLists)
#define glDeleteObjectARB MANGLE(DeleteObjectARB)
#define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV)
</pre><pre class="diff" id="added">+#define glDeleteProgram MANGLE(DeleteProgram)
</pre><pre class="diff" id="context"> #define glDeleteProgramsARB MANGLE(DeleteProgramsARB)
#define glDeleteProgramsNV MANGLE(DeleteProgramsNV)
#define glDeleteQueriesARB MANGLE(DeleteQueriesARB)
#define glDeleteQueries MANGLE(DeleteQueries)
</pre><pre class="diff" id="added">+#define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT)
+#define glDeleteShader MANGLE(DeleteShader)
</pre><pre class="diff" id="context"> #define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT)
#define glDeleteTextures MANGLE(DeleteTextures)
#define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE)
@@ -254,16 +267,20 @@
</pre><pre class="diff" id="context"> #define glDepthMask MANGLE(DepthMask)
#define glDepthRange MANGLE(DepthRange)
#define glDetachObjectARB MANGLE(DetachObjectARB)
</pre><pre class="diff" id="added">+#define glDetachShader MANGLE(DetachShader)
</pre><pre class="diff" id="context"> #define glDetailTexFuncSGIS MANGLE(DetailTexFuncSGIS)
#define glDisableClientState MANGLE(DisableClientState)
#define glDisable MANGLE(Disable)
#define glDisableTraceMESA MANGLE(DisableTraceMESA)
#define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT)
#define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB)
</pre><pre class="diff" id="added">+#define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray)
</pre><pre class="diff" id="context"> #define glDrawArraysEXT MANGLE(DrawArraysEXT)
#define glDrawArrays MANGLE(DrawArrays)
#define glDrawBuffer MANGLE(DrawBuffer)
</pre><pre class="diff" id="added">+#define glDrawBuffersARB MANGLE(DrawBuffersARB)
</pre><pre class="diff" id="context"> #define glDrawBuffersATI MANGLE(DrawBuffersATI)
</pre><pre class="diff" id="added">+#define glDrawBuffers MANGLE(DrawBuffers)
</pre><pre class="diff" id="context"> #define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE)
#define glDrawElementArrayATI MANGLE(DrawElementArrayATI)
#define glDrawElements MANGLE(DrawElements)
@@ -285,6 +302,7 @@
</pre><pre class="diff" id="context"> #define glEnableTraceMESA MANGLE(EnableTraceMESA)
#define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT)
#define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB)
</pre><pre class="diff" id="added">+#define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray)
</pre><pre class="diff" id="context"> #define glEndFragmentShaderATI MANGLE(EndFragmentShaderATI)
#define glEndList MANGLE(EndList)
#define glEnd MANGLE(End)
@@ -352,6 +370,10 @@
</pre><pre class="diff" id="context"> #define glFragmentMaterialfvSGIX MANGLE(FragmentMaterialfvSGIX)
#define glFragmentMaterialiSGIX MANGLE(FragmentMaterialiSGIX)
#define glFragmentMaterialivSGIX MANGLE(FragmentMaterialivSGIX)
</pre><pre class="diff" id="added">+#define glFramebufferRenderbufferEXT MANGLE(FramebufferRenderbufferEXT)
+#define glFramebufferTexture1DEXT MANGLE(FramebufferTexture1DEXT)
+#define glFramebufferTexture2DEXT MANGLE(FramebufferTexture2DEXT)
+#define glFramebufferTexture3DEXT MANGLE(FramebufferTexture3DEXT)
</pre><pre class="diff" id="context"> #define glFrameZoomSGIX MANGLE(FrameZoomSGIX)
#define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI)
#define glFrontFace MANGLE(FrontFace)
@@ -359,26 +381,33 @@
</pre><pre class="diff" id="context"> #define glGenAsyncMarkersSGIX MANGLE(GenAsyncMarkersSGIX)
#define glGenBuffersARB MANGLE(GenBuffersARB)
#define glGenBuffers MANGLE(GenBuffers)
</pre><pre class="diff" id="added">+#define glGenerateMipmapEXT MANGLE(GenerateMipmapEXT)
</pre><pre class="diff" id="context"> #define glGenFencesAPPLE MANGLE(GenFencesAPPLE)
#define glGenFencesNV MANGLE(GenFencesNV)
#define glGenFragmentShadersATI MANGLE(GenFragmentShadersATI)
</pre><pre class="diff" id="added">+#define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT)
</pre><pre class="diff" id="context"> #define glGenLists MANGLE(GenLists)
#define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV)
#define glGenProgramsARB MANGLE(GenProgramsARB)
#define glGenProgramsNV MANGLE(GenProgramsNV)
#define glGenQueriesARB MANGLE(GenQueriesARB)
#define glGenQueries MANGLE(GenQueries)
</pre><pre class="diff" id="added">+#define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT)
</pre><pre class="diff" id="context"> #define glGenSymbolsEXT MANGLE(GenSymbolsEXT)
#define glGenTexturesEXT MANGLE(GenTexturesEXT)
#define glGenTextures MANGLE(GenTextures)
#define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE)
#define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT)
#define glGetActiveAttribARB MANGLE(GetActiveAttribARB)
</pre><pre class="diff" id="added">+#define glGetActiveAttrib MANGLE(GetActiveAttrib)
</pre><pre class="diff" id="context"> #define glGetActiveUniformARB MANGLE(GetActiveUniformARB)
</pre><pre class="diff" id="added">+#define glGetActiveUniform MANGLE(GetActiveUniform)
</pre><pre class="diff" id="context"> #define glGetArrayObjectfvATI MANGLE(GetArrayObjectfvATI)
#define glGetArrayObjectivATI MANGLE(GetArrayObjectivATI)
#define glGetAttachedObjectsARB MANGLE(GetAttachedObjectsARB)
</pre><pre class="diff" id="added">+#define glGetAttachedShaders MANGLE(GetAttachedShaders)
</pre><pre class="diff" id="context"> #define glGetAttribLocationARB MANGLE(GetAttribLocationARB)
</pre><pre class="diff" id="added">+#define glGetAttribLocation MANGLE(GetAttribLocation)
</pre><pre class="diff" id="context"> #define glGetBooleanv MANGLE(GetBooleanv)
#define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB)
#define glGetBufferParameteriv MANGLE(GetBufferParameteriv)
@@ -421,6 +450,7 @@
</pre><pre class="diff" id="context"> #define glGetFragmentLightivSGIX MANGLE(GetFragmentLightivSGIX)
#define glGetFragmentMaterialfvSGIX MANGLE(GetFragmentMaterialfvSGIX)
#define glGetFragmentMaterialivSGIX MANGLE(GetFragmentMaterialivSGIX)
</pre><pre class="diff" id="added">+#define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT)
</pre><pre class="diff" id="context"> #define glGetHandleARB MANGLE(GetHandleARB)
#define glGetHistogramEXT MANGLE(GetHistogramEXT)
#define glGetHistogram MANGLE(GetHistogram)
@@ -475,7 +505,9 @@
</pre><pre class="diff" id="context"> #define glGetPolygonStipple MANGLE(GetPolygonStipple)
#define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB)
#define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB)
</pre><pre class="diff" id="added">+#define glGetProgramInfoLog MANGLE(GetProgramInfoLog)
</pre><pre class="diff" id="context"> #define glGetProgramivARB MANGLE(GetProgramivARB)
</pre><pre class="diff" id="added">+#define glGetProgramiv MANGLE(GetProgramiv)
</pre><pre class="diff" id="context"> #define glGetProgramivNV MANGLE(GetProgramivNV)
#define glGetProgramLocalParameterdvARB MANGLE(GetProgramLocalParameterdvARB)
#define glGetProgramLocalParameterfvARB MANGLE(GetProgramLocalParameterfvARB)
@@ -483,6 +515,7 @@
</pre><pre class="diff" id="context"> #define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV)
#define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV)
#define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV)
</pre><pre class="diff" id="added">+#define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA)
</pre><pre class="diff" id="context"> #define glGetProgramStringARB MANGLE(GetProgramStringARB)
#define glGetProgramStringNV MANGLE(GetProgramStringNV)
#define glGetQueryivARB MANGLE(GetQueryivARB)
@@ -491,9 +524,13 @@
</pre><pre class="diff" id="context"> #define glGetQueryObjectiv MANGLE(GetQueryObjectiv)
#define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB)
#define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv)
</pre><pre class="diff" id="added">+#define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT)
</pre><pre class="diff" id="context"> #define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT)
#define glGetSeparableFilter MANGLE(GetSeparableFilter)
</pre><pre class="diff" id="added">+#define glGetShaderInfoLog MANGLE(GetShaderInfoLog)
+#define glGetShaderiv MANGLE(GetShaderiv)
</pre><pre class="diff" id="context"> #define glGetShaderSourceARB MANGLE(GetShaderSourceARB)
</pre><pre class="diff" id="added">+#define glGetShaderSource MANGLE(GetShaderSource)
</pre><pre class="diff" id="context"> #define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS)
#define glGetString MANGLE(GetString)
#define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI)
@@ -511,8 +548,11 @@
</pre><pre class="diff" id="context"> #define glGetTexParameteriv MANGLE(GetTexParameteriv)
#define glGetTrackMatrixivNV MANGLE(GetTrackMatrixivNV)
#define glGetUniformfvARB MANGLE(GetUniformfvARB)
</pre><pre class="diff" id="added">+#define glGetUniformfv MANGLE(GetUniformfv)
</pre><pre class="diff" id="context"> #define glGetUniformivARB MANGLE(GetUniformivARB)
</pre><pre class="diff" id="added">+#define glGetUniformiv MANGLE(GetUniformiv)
</pre><pre class="diff" id="context"> #define glGetUniformLocationARB MANGLE(GetUniformLocationARB)
</pre><pre class="diff" id="added">+#define glGetUniformLocation MANGLE(GetUniformLocation)
</pre><pre class="diff" id="context"> #define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI)
#define glGetVariantArrayObjectivATI MANGLE(GetVariantArrayObjectivATI)
#define glGetVariantBooleanvEXT MANGLE(GetVariantBooleanvEXT)
@@ -522,12 +562,16 @@
</pre><pre class="diff" id="context"> #define glGetVertexAttribArrayObjectfvATI MANGLE(GetVertexAttribArrayObjectfvATI)
#define glGetVertexAttribArrayObjectivATI MANGLE(GetVertexAttribArrayObjectivATI)
#define glGetVertexAttribdvARB MANGLE(GetVertexAttribdvARB)
</pre><pre class="diff" id="added">+#define glGetVertexAttribdv MANGLE(GetVertexAttribdv)
</pre><pre class="diff" id="context"> #define glGetVertexAttribdvNV MANGLE(GetVertexAttribdvNV)
#define glGetVertexAttribfvARB MANGLE(GetVertexAttribfvARB)
</pre><pre class="diff" id="added">+#define glGetVertexAttribfv MANGLE(GetVertexAttribfv)
</pre><pre class="diff" id="context"> #define glGetVertexAttribfvNV MANGLE(GetVertexAttribfvNV)
#define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB)
</pre><pre class="diff" id="added">+#define glGetVertexAttribiv MANGLE(GetVertexAttribiv)
</pre><pre class="diff" id="context"> #define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV)
#define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB)
</pre><pre class="diff" id="added">+#define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv)
</pre><pre class="diff" id="context"> #define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV)
#define glGlobalAlphaFactorbSUN MANGLE(GlobalAlphaFactorbSUN)
#define glGlobalAlphaFactordSUN MANGLE(GlobalAlphaFactordSUN)
@@ -572,13 +616,17 @@
</pre><pre class="diff" id="context"> #define glIsEnabled MANGLE(IsEnabled)
#define glIsFenceAPPLE MANGLE(IsFenceAPPLE)
#define glIsFenceNV MANGLE(IsFenceNV)
</pre><pre class="diff" id="added">+#define glIsFramebufferEXT MANGLE(IsFramebufferEXT)
</pre><pre class="diff" id="context"> #define glIsList MANGLE(IsList)
#define glIsObjectBufferATI MANGLE(IsObjectBufferATI)
#define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV)
#define glIsProgramARB MANGLE(IsProgramARB)
</pre><pre class="diff" id="added">+#define glIsProgram MANGLE(IsProgram)
</pre><pre class="diff" id="context"> #define glIsProgramNV MANGLE(IsProgramNV)
#define glIsQueryARB MANGLE(IsQueryARB)
#define glIsQuery MANGLE(IsQuery)
</pre><pre class="diff" id="added">+#define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT)
+#define glIsShader MANGLE(IsShader)
</pre><pre class="diff" id="context"> #define glIsTextureEXT MANGLE(IsTextureEXT)
#define glIsTexture MANGLE(IsTexture)
#define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT)
@@ -595,6 +643,7 @@
</pre><pre class="diff" id="context"> #define glLineStipple MANGLE(LineStipple)
#define glLineWidth MANGLE(LineWidth)
#define glLinkProgramARB MANGLE(LinkProgramARB)
</pre><pre class="diff" id="added">+#define glLinkProgram MANGLE(LinkProgram)
</pre><pre class="diff" id="context"> #define glListBase MANGLE(ListBase)
#define glListParameterfSGIX MANGLE(ListParameterfSGIX)
#define glListParameterfvSGIX MANGLE(ListParameterfvSGIX)
@@ -804,6 +853,7 @@
</pre><pre class="diff" id="context"> #define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV)
#define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT)
#define glPrioritizeTextures MANGLE(PrioritizeTextures)
</pre><pre class="diff" id="added">+#define glProgramCallbackMESA MANGLE(ProgramCallbackMESA)
</pre><pre class="diff" id="context"> #define glProgramEnvParameter4dARB MANGLE(ProgramEnvParameter4dARB)
#define glProgramEnvParameter4dvARB MANGLE(ProgramEnvParameter4dvARB)
#define glProgramEnvParameter4fARB MANGLE(ProgramEnvParameter4fARB)
@@ -863,6 +913,7 @@
</pre><pre class="diff" id="context"> #define glRects MANGLE(Rects)
#define glRectsv MANGLE(Rectsv)
#define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX)
</pre><pre class="diff" id="added">+#define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT)
</pre><pre class="diff" id="context"> #define glRenderMode MANGLE(RenderMode)
#define glReplacementCodePointerSUN MANGLE(ReplacementCodePointerSUN)
#define glReplacementCodeubSUN MANGLE(ReplacementCodeubSUN)
@@ -955,6 +1006,7 @@
</pre><pre class="diff" id="context"> #define glShaderOp2EXT MANGLE(ShaderOp2EXT)
#define glShaderOp3EXT MANGLE(ShaderOp3EXT)
#define glShaderSourceARB MANGLE(ShaderSourceARB)
</pre><pre class="diff" id="added">+#define glShaderSource MANGLE(ShaderSource)
</pre><pre class="diff" id="context"> #define glSharpenTexFuncSGIS MANGLE(SharpenTexFuncSGIS)
#define glSpriteParameterfSGIX MANGLE(SpriteParameterfSGIX)
#define glSpriteParameterfvSGIX MANGLE(SpriteParameterfvSGIX)
@@ -963,10 +1015,14 @@
</pre><pre class="diff" id="context"> #define glStartInstrumentsSGIX MANGLE(StartInstrumentsSGIX)
#define glStencilFunc MANGLE(StencilFunc)
#define glStencilFuncSeparateATI MANGLE(StencilFuncSeparateATI)
</pre><pre class="diff" id="added">+#define glStencilFuncSeparate MANGLE(StencilFuncSeparate)
</pre><pre class="diff" id="context"> #define glStencilMask MANGLE(StencilMask)
</pre><pre class="diff" id="added">+#define glStencilMaskSeparate MANGLE(StencilMaskSeparate)
</pre><pre class="diff" id="context"> #define glStencilOp MANGLE(StencilOp)
#define glStencilOpSeparateATI MANGLE(StencilOpSeparateATI)
</pre><pre class="diff" id="added">+#define glStencilOpSeparate MANGLE(StencilOpSeparate)
</pre><pre class="diff" id="context"> #define glStopInstrumentsSGIX MANGLE(StopInstrumentsSGIX)
</pre><pre class="diff" id="added">+#define glStringMarkerGREMEDY MANGLE(StringMarkerGREMEDY)
</pre><pre class="diff" id="context"> #define glSwizzleEXT MANGLE(SwizzleEXT)
#define glTagSampleBufferSGIX MANGLE(TagSampleBufferSGIX)
#define glTangent3bEXT MANGLE(Tangent3bEXT)
@@ -1085,31 +1141,52 @@
</pre><pre class="diff" id="context"> #define glTranslated MANGLE(Translated)
#define glTranslatef MANGLE(Translatef)
#define glUniform1fARB MANGLE(Uniform1fARB)
</pre><pre class="diff" id="added">+#define glUniform1f MANGLE(Uniform1f)
</pre><pre class="diff" id="context"> #define glUniform1fvARB MANGLE(Uniform1fvARB)
</pre><pre class="diff" id="added">+#define glUniform1fv MANGLE(Uniform1fv)
</pre><pre class="diff" id="context"> #define glUniform1iARB MANGLE(Uniform1iARB)
</pre><pre class="diff" id="added">+#define glUniform1i MANGLE(Uniform1i)
</pre><pre class="diff" id="context"> #define glUniform1ivARB MANGLE(Uniform1ivARB)
</pre><pre class="diff" id="added">+#define glUniform1iv MANGLE(Uniform1iv)
</pre><pre class="diff" id="context"> #define glUniform2fARB MANGLE(Uniform2fARB)
</pre><pre class="diff" id="added">+#define glUniform2f MANGLE(Uniform2f)
</pre><pre class="diff" id="context"> #define glUniform2fvARB MANGLE(Uniform2fvARB)
</pre><pre class="diff" id="added">+#define glUniform2fv MANGLE(Uniform2fv)
</pre><pre class="diff" id="context"> #define glUniform2iARB MANGLE(Uniform2iARB)
</pre><pre class="diff" id="added">+#define glUniform2i MANGLE(Uniform2i)
</pre><pre class="diff" id="context"> #define glUniform2ivARB MANGLE(Uniform2ivARB)
</pre><pre class="diff" id="added">+#define glUniform2iv MANGLE(Uniform2iv)
</pre><pre class="diff" id="context"> #define glUniform3fARB MANGLE(Uniform3fARB)
</pre><pre class="diff" id="added">+#define glUniform3f MANGLE(Uniform3f)
</pre><pre class="diff" id="context"> #define glUniform3fvARB MANGLE(Uniform3fvARB)
</pre><pre class="diff" id="added">+#define glUniform3fv MANGLE(Uniform3fv)
</pre><pre class="diff" id="context"> #define glUniform3iARB MANGLE(Uniform3iARB)
</pre><pre class="diff" id="added">+#define glUniform3i MANGLE(Uniform3i)
</pre><pre class="diff" id="context"> #define glUniform3ivARB MANGLE(Uniform3ivARB)
</pre><pre class="diff" id="added">+#define glUniform3iv MANGLE(Uniform3iv)
</pre><pre class="diff" id="context"> #define glUniform4fARB MANGLE(Uniform4fARB)
</pre><pre class="diff" id="added">+#define glUniform4f MANGLE(Uniform4f)
</pre><pre class="diff" id="context"> #define glUniform4fvARB MANGLE(Uniform4fvARB)
</pre><pre class="diff" id="added">+#define glUniform4fv MANGLE(Uniform4fv)
</pre><pre class="diff" id="context"> #define glUniform4iARB MANGLE(Uniform4iARB)
</pre><pre class="diff" id="added">+#define glUniform4i MANGLE(Uniform4i)
</pre><pre class="diff" id="context"> #define glUniform4ivARB MANGLE(Uniform4ivARB)
</pre><pre class="diff" id="added">+#define glUniform4iv MANGLE(Uniform4iv)
</pre><pre class="diff" id="context"> #define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB)
</pre><pre class="diff" id="added">+#define glUniformMatrix2fv MANGLE(UniformMatrix2fv)
</pre><pre class="diff" id="context"> #define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB)
</pre><pre class="diff" id="added">+#define glUniformMatrix3fv MANGLE(UniformMatrix3fv)
</pre><pre class="diff" id="context"> #define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB)
</pre><pre class="diff" id="added">+#define glUniformMatrix4fv MANGLE(UniformMatrix4fv)
</pre><pre class="diff" id="context"> #define glUnlockArraysEXT MANGLE(UnlockArraysEXT)
#define glUnmapBufferARB MANGLE(UnmapBufferARB)
#define glUnmapBuffer MANGLE(UnmapBuffer)
#define glUnmapObjectBufferATI MANGLE(UnmapObjectBufferATI)
#define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI)
</pre><pre class="diff" id="added">+#define glUseProgram MANGLE(UseProgram)
</pre><pre class="diff" id="context"> #define glUseProgramObjectARB MANGLE(UseProgramObjectARB)
#define glValidateProgramARB MANGLE(ValidateProgramARB)
</pre><pre class="diff" id="added">+#define glValidateProgram MANGLE(ValidateProgram)
</pre><pre class="diff" id="context"> #define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI)
#define glVariantbvEXT MANGLE(VariantbvEXT)
#define glVariantdvEXT MANGLE(VariantdvEXT)
@@ -1154,77 +1231,114 @@
</pre><pre class="diff" id="context"> #define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE)
#define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV)
#define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib1d MANGLE(VertexAttrib1d)
</pre><pre class="diff" id="context"> #define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV)
#define glVertexAttrib1dvARB MANGLE(VertexAttrib1dvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib1dv MANGLE(VertexAttrib1dv)
</pre><pre class="diff" id="context"> #define glVertexAttrib1dvNV MANGLE(VertexAttrib1dvNV)
#define glVertexAttrib1fARB MANGLE(VertexAttrib1fARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib1f MANGLE(VertexAttrib1f)
</pre><pre class="diff" id="context"> #define glVertexAttrib1fNV MANGLE(VertexAttrib1fNV)
#define glVertexAttrib1fvARB MANGLE(VertexAttrib1fvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib1fv MANGLE(VertexAttrib1fv)
</pre><pre class="diff" id="context"> #define glVertexAttrib1fvNV MANGLE(VertexAttrib1fvNV)
#define glVertexAttrib1hNV MANGLE(VertexAttrib1hNV)
#define glVertexAttrib1hvNV MANGLE(VertexAttrib1hvNV)
#define glVertexAttrib1sARB MANGLE(VertexAttrib1sARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib1s MANGLE(VertexAttrib1s)
</pre><pre class="diff" id="context"> #define glVertexAttrib1sNV MANGLE(VertexAttrib1sNV)
#define glVertexAttrib1svARB MANGLE(VertexAttrib1svARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib1sv MANGLE(VertexAttrib1sv)
</pre><pre class="diff" id="context"> #define glVertexAttrib1svNV MANGLE(VertexAttrib1svNV)
#define glVertexAttrib2dARB MANGLE(VertexAttrib2dARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib2d MANGLE(VertexAttrib2d)
</pre><pre class="diff" id="context"> #define glVertexAttrib2dNV MANGLE(VertexAttrib2dNV)
#define glVertexAttrib2dvARB MANGLE(VertexAttrib2dvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib2dv MANGLE(VertexAttrib2dv)
</pre><pre class="diff" id="context"> #define glVertexAttrib2dvNV MANGLE(VertexAttrib2dvNV)
#define glVertexAttrib2fARB MANGLE(VertexAttrib2fARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib2f MANGLE(VertexAttrib2f)
</pre><pre class="diff" id="context"> #define glVertexAttrib2fNV MANGLE(VertexAttrib2fNV)
#define glVertexAttrib2fvARB MANGLE(VertexAttrib2fvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib2fv MANGLE(VertexAttrib2fv)
</pre><pre class="diff" id="context"> #define glVertexAttrib2fvNV MANGLE(VertexAttrib2fvNV)
#define glVertexAttrib2hNV MANGLE(VertexAttrib2hNV)
#define glVertexAttrib2hvNV MANGLE(VertexAttrib2hvNV)
#define glVertexAttrib2sARB MANGLE(VertexAttrib2sARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib2s MANGLE(VertexAttrib2s)
</pre><pre class="diff" id="context"> #define glVertexAttrib2sNV MANGLE(VertexAttrib2sNV)
#define glVertexAttrib2svARB MANGLE(VertexAttrib2svARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib2sv MANGLE(VertexAttrib2sv)
</pre><pre class="diff" id="context"> #define glVertexAttrib2svNV MANGLE(VertexAttrib2svNV)
#define glVertexAttrib3dARB MANGLE(VertexAttrib3dARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib3d MANGLE(VertexAttrib3d)
</pre><pre class="diff" id="context"> #define glVertexAttrib3dNV MANGLE(VertexAttrib3dNV)
#define glVertexAttrib3dvARB MANGLE(VertexAttrib3dvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib3dv MANGLE(VertexAttrib3dv)
</pre><pre class="diff" id="context"> #define glVertexAttrib3dvNV MANGLE(VertexAttrib3dvNV)
#define glVertexAttrib3fARB MANGLE(VertexAttrib3fARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib3f MANGLE(VertexAttrib3f)
</pre><pre class="diff" id="context"> #define glVertexAttrib3fNV MANGLE(VertexAttrib3fNV)
#define glVertexAttrib3fvARB MANGLE(VertexAttrib3fvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib3fv MANGLE(VertexAttrib3fv)
</pre><pre class="diff" id="context"> #define glVertexAttrib3fvNV MANGLE(VertexAttrib3fvNV)
#define glVertexAttrib3hNV MANGLE(VertexAttrib3hNV)
#define glVertexAttrib3hvNV MANGLE(VertexAttrib3hvNV)
#define glVertexAttrib3sARB MANGLE(VertexAttrib3sARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib3s MANGLE(VertexAttrib3s)
</pre><pre class="diff" id="context"> #define glVertexAttrib3sNV MANGLE(VertexAttrib3sNV)
#define glVertexAttrib3svARB MANGLE(VertexAttrib3svARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib3sv MANGLE(VertexAttrib3sv)
</pre><pre class="diff" id="context"> #define glVertexAttrib3svNV MANGLE(VertexAttrib3svNV)
#define glVertexAttrib4bvARB MANGLE(VertexAttrib4bvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4bv MANGLE(VertexAttrib4bv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4dARB MANGLE(VertexAttrib4dARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4d MANGLE(VertexAttrib4d)
</pre><pre class="diff" id="context"> #define glVertexAttrib4dNV MANGLE(VertexAttrib4dNV)
#define glVertexAttrib4dvARB MANGLE(VertexAttrib4dvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4dv MANGLE(VertexAttrib4dv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4dvNV MANGLE(VertexAttrib4dvNV)
#define glVertexAttrib4fARB MANGLE(VertexAttrib4fARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4f MANGLE(VertexAttrib4f)
</pre><pre class="diff" id="context"> #define glVertexAttrib4fNV MANGLE(VertexAttrib4fNV)
#define glVertexAttrib4fvARB MANGLE(VertexAttrib4fvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4fv MANGLE(VertexAttrib4fv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4fvNV MANGLE(VertexAttrib4fvNV)
#define glVertexAttrib4hNV MANGLE(VertexAttrib4hNV)
#define glVertexAttrib4hvNV MANGLE(VertexAttrib4hvNV)
#define glVertexAttrib4ivARB MANGLE(VertexAttrib4ivARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4iv MANGLE(VertexAttrib4iv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NbvARB MANGLE(VertexAttrib4NbvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Nbv MANGLE(VertexAttrib4Nbv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NivARB MANGLE(VertexAttrib4NivARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Niv MANGLE(VertexAttrib4Niv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NsvARB MANGLE(VertexAttrib4NsvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Nsv MANGLE(VertexAttrib4Nsv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NubARB MANGLE(VertexAttrib4NubARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Nub MANGLE(VertexAttrib4Nub)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NubvARB MANGLE(VertexAttrib4NubvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Nubv MANGLE(VertexAttrib4Nubv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NuivARB MANGLE(VertexAttrib4NuivARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Nuiv MANGLE(VertexAttrib4Nuiv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4NusvARB MANGLE(VertexAttrib4NusvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4Nusv MANGLE(VertexAttrib4Nusv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4sARB MANGLE(VertexAttrib4sARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4s MANGLE(VertexAttrib4s)
</pre><pre class="diff" id="context"> #define glVertexAttrib4sNV MANGLE(VertexAttrib4sNV)
#define glVertexAttrib4svARB MANGLE(VertexAttrib4svARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4sv MANGLE(VertexAttrib4sv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4svNV MANGLE(VertexAttrib4svNV)
#define glVertexAttrib4ubNV MANGLE(VertexAttrib4ubNV)
#define glVertexAttrib4ubvARB MANGLE(VertexAttrib4ubvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4ubv MANGLE(VertexAttrib4ubv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4ubvNV MANGLE(VertexAttrib4ubvNV)
#define glVertexAttrib4uivARB MANGLE(VertexAttrib4uivARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4uiv MANGLE(VertexAttrib4uiv)
</pre><pre class="diff" id="context"> #define glVertexAttrib4usvARB MANGLE(VertexAttrib4usvARB)
</pre><pre class="diff" id="added">+#define glVertexAttrib4usv MANGLE(VertexAttrib4usv)
</pre><pre class="diff" id="context"> #define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI)
#define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB)
</pre><pre class="diff" id="added">+#define glVertexAttribPointer MANGLE(VertexAttribPointer)
</pre><pre class="diff" id="context"> #define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV)
#define glVertexAttribs1dvNV MANGLE(VertexAttribs1dvNV)
#define glVertexAttribs1fvNV MANGLE(VertexAttribs1fvNV)
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mesa32/include/GL/glext.h</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> /*************************************************************/
/* Header file version number, required by OpenGL ABI for Linux */
</pre><pre class="diff" id="removed">-/* glext.h last updated 200<span id="removedchars">4/7/26</span> */
</pre><pre class="diff" id="added">+/* glext.h last updated 200<span id="addedchars">5/06/20</span> */
</pre><pre class="diff" id="context"> /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
</pre><pre class="diff" id="removed">-#define GL_GLEXT_VERSION 2<span id="removedchars">4</span>
</pre><pre class="diff" id="added">+#define GL_GLEXT_VERSION 2<span id="addedchars">9</span>
</pre><pre class="diff" id="context">
#ifndef GL_VERSION_1_2
#define GL_UNSIGNED_BYTE_3_3_2 0x8032
@@ -372,6 +372,93 @@
</pre><pre class="diff" id="context"> #define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
#endif
</pre><pre class="diff" id="added">+#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
+
</pre><pre class="diff" id="context"> #ifndef GL_ARB_multitexture
#define GL_TEXTURE0_ARB 0x84C0
#define GL_TEXTURE1_ARB 0x84C1
@@ -825,6 +912,48 @@
</pre><pre class="diff" id="context"> #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
#endif
</pre><pre class="diff" id="added">+#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
+
</pre><pre class="diff" id="context"> #ifndef GL_EXT_abgr
#define GL_ABGR_EXT 0x8000
#endif
@@ -2793,6 +2922,11 @@
</pre><pre class="diff" id="context"> #ifndef GL_ATI_vertex_attrib_array_object
#endif
</pre><pre class="diff" id="added">+#ifndef GL_OES_read_format
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif
+
</pre><pre class="diff" id="context"> #ifndef GL_EXT_depth_bounds_test
#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890
#define GL_DEPTH_BOUNDS_EXT 0x8891
@@ -2846,10 +2980,73 @@
</pre><pre class="diff" id="context"> /* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
#endif
</pre><pre class="diff" id="added">+#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
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+#ifndef GL_GREMEDY_string_marker
+#endif
+
+
</pre><pre class="diff" id="context"> /*************************************************************/
#include <stddef.h>
</pre><pre class="diff" id="added">+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar; /* native character */
+#endif
+
</pre><pre class="diff" id="context"> #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */
typedef ptrdiff_t GLintptr;
@@ -2863,13 +3060,17 @@
</pre><pre class="diff" id="context"> #endif
#ifndef GL_ARB_shader_objects
</pre><pre class="diff" id="removed">-/* GL types for handling shader object handles and <span id="removedchars">characters</span> */
</pre><pre class="diff" id="added">+/* GL types for handling shader object handles and <span id="addedchars">program/shader text</span> */
</pre><pre class="diff" id="context"> typedef char GLcharARB; /* native character */
typedef unsigned int GLhandleARB; /* shader object handle */
#endif
</pre><pre class="diff" id="added">+/* GL types for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
</pre><pre class="diff" id="context"> #ifndef GL_NV_half_float
</pre><pre class="diff" id="removed">-/* GL type for representing NVIDIA "half" floating point type in host memory */
</pre><pre class="diff" id="context"> typedef unsigned short GLhalfNV;
#endif
@@ -3193,6 +3394,198 @@
</pre><pre class="diff" id="context"> typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
#endif
</pre><pre class="diff" id="added">+#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);
</pre>
<strong class="error">[truncated at 1000 lines; 137462 more skipped]</strong>
</div>
</body>
</html>