summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/glapi/APIspec102
-rw-r--r--src/mesa/glapi/gl_API.xml92
-rw-r--r--src/mesa/glapi/glapioffsets.h90
-rw-r--r--src/mesa/glapi/glapitable.h94
-rw-r--r--src/mesa/glapi/glapitemp.h16
-rw-r--r--src/mesa/glapi/glprocs.h88
-rw-r--r--src/mesa/x86/glapi_x86.S2
7 files changed, 242 insertions, 242 deletions
diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index 23411c5782..bc98b65524 100644
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.24 2004/10/27 15:06:18 michal Exp $
+# $Id: APIspec,v 1.25 2004/10/28 11:14:02 michal Exp $
# This file describes all the OpenGL functions.
# We use a number of Python scripts to parse this file and
@@ -8567,32 +8567,41 @@ param pname GLenum
param params GLuint *
category 1.5
+# EXT_blend_equation_separate
+
+name BlendEquationSeparateEXT
+return void
+param modeRGB GLenum
+param modeA GLenum
+offset 710
+category GL_EXT_blend_equation_separate
+
# GL_ARB_shader_objects
name DeleteObjectARB
return void
param obj GLhandleARB
category GL_ARB_shader_objects
-offset 710
+offset 711
name GetHandleARB
return GLhandleARB
param pname GLenum
category GL_ARB_shader_objects
-offset 711
+offset 712
name DetachObjectARB
return void
param containerObj GLhandleARB
param attachedObj GLhandleARB
category GL_ARB_shader_objects
-offset 712
+offset 713
name CreateShaderObjectARB
return GLhandleARB
param shaderType GLenum
category GL_ARB_shader_objects
-offset 713
+offset 714
name ShaderSourceARB
return void
@@ -8601,50 +8610,50 @@ param count GLsizei
param string const GLcharARB **
param length const GLint *
category GL_ARB_shader_objects
-offset 714
+offset 715
name CompileShaderARB
return void
param shaderObj GLhandleARB
category GL_ARB_shader_objects
-offset 715
+offset 716
name CreateProgramObjectARB
return GLhandleARB
category GL_ARB_shader_objects
-offset 716
+offset 717
name AttachObjectARB
return void
param containerObj GLhandleARB
param obj GLhandleARB
category GL_ARB_shader_objects
-offset 717
+offset 718
name LinkProgramARB
return void
param programObj GLhandleARB
category GL_ARB_shader_objects
-offset 718
+offset 719
name UseProgramObjectARB
return void
param programObj GLhandleARB
category GL_ARB_shader_objects
-offset 719
+offset 720
name ValidateProgramARB
return void
param programObj GLhandleARB
category GL_ARB_shader_objects
-offset 720
+offset 721
name Uniform1fARB
return void
param location GLint
param v0 GLfloat
category GL_ARB_shader_objects
-offset 721
+offset 722
name Uniform2fARB
return void
@@ -8652,7 +8661,7 @@ param location GLint
param v0 GLfloat
param v1 GLfloat
category GL_ARB_shader_objects
-offset 722
+offset 723
name Uniform3fARB
return void
@@ -8661,7 +8670,7 @@ param v0 GLfloat
param v1 GLfloat
param v2 GLfloat
category GL_ARB_shader_objects
-offset 723
+offset 724
name Uniform4fARB
return void
@@ -8671,14 +8680,14 @@ param v1 GLfloat
param v2 GLfloat
param v3 GLfloat
category GL_ARB_shader_objects
-offset 724
+offset 725
name Uniform1iARB
return void
param location GLint
param v0 GLint
category GL_ARB_shader_objects
-offset 725
+offset 726
name Uniform2iARB
return void
@@ -8686,7 +8695,7 @@ param location GLint
param v0 GLint
param v1 GLint
category GL_ARB_shader_objects
-offset 726
+offset 727
name Uniform3iARB
return void
@@ -8695,7 +8704,7 @@ param v0 GLint
param v1 GLint
param v2 GLint
category GL_ARB_shader_objects
-offset 727
+offset 728
name Uniform4iARB
return void
@@ -8705,7 +8714,7 @@ param v1 GLint
param v2 GLint
param v3 GLint
category GL_ARB_shader_objects
-offset 728
+offset 729
name Uniform1fvARB
return void
@@ -8713,7 +8722,7 @@ param location GLint
param count GLsizei
param value const GLfloat *
category GL_ARB_shader_objects
-offset 729
+offset 730
name Uniform2fvARB
return void
@@ -8721,7 +8730,7 @@ param location GLint
param count GLsizei
param value const GLfloat *
category GL_ARB_shader_objects
-offset 730
+offset 731
name Uniform3fvARB
return void
@@ -8729,7 +8738,7 @@ param location GLint
param count GLsizei
param value const GLfloat *
category GL_ARB_shader_objects
-offset 731
+offset 732
name Uniform4fvARB
return void
@@ -8737,7 +8746,7 @@ param location GLint
param count GLsizei
param value const GLfloat *
category GL_ARB_shader_objects
-offset 732
+offset 733
name Uniform1ivARB
return void
@@ -8745,7 +8754,7 @@ param location GLint
param count GLsizei
param value const GLint *
category GL_ARB_shader_objects
-offset 733
+offset 734
name Uniform2ivARB
return void
@@ -8753,7 +8762,7 @@ param location GLint
param count GLsizei
param value const GLint *
category GL_ARB_shader_objects
-offset 734
+offset 735
name Uniform3ivARB
return void
@@ -8761,7 +8770,7 @@ param location GLint
param count GLsizei
param value const GLint *
category GL_ARB_shader_objects
-offset 735
+offset 736
name Uniform4ivARB
return void
@@ -8769,7 +8778,7 @@ param location GLint
param count GLsizei
param value const GLint *
category GL_ARB_shader_objects
-offset 736
+offset 737
name UniformMatrix2fvARB
return void
@@ -8778,7 +8787,7 @@ param count GLsizei
param transpose GLboolean
param value const GLfloat *
category GL_ARB_shader_objects
-offset 737
+offset 738
name UniformMatrix3fvARB
return void
@@ -8787,7 +8796,7 @@ param count GLsizei
param transpose GLboolean
param value const GLfloat *
category GL_ARB_shader_objects
-offset 738
+offset 739
name UniformMatrix4fvARB
return void
@@ -8796,7 +8805,7 @@ param count GLsizei
param transpose GLboolean
param value const GLfloat *
category GL_ARB_shader_objects
-offset 739
+offset 740
name GetObjectParameterfvARB
return void
@@ -8804,7 +8813,7 @@ param obj GLhandleARB
param pname GLenum
param params GLfloat *
category GL_ARB_shader_objects
-offset 740
+offset 741
name GetObjectParameterivARB
return void
@@ -8812,7 +8821,7 @@ param obj GLhandleARB
param pname GLenum
param params GLint *
category GL_ARB_shader_objects
-offset 741
+offset 742
name GetInfoLogARB
return void
@@ -8821,7 +8830,7 @@ param maxLength GLsizei
param length GLsizei *
param infoLog GLcharARB *
category GL_ARB_shader_objects
-offset 742
+offset 743
name GetAttachedObjectsARB
return void
@@ -8830,14 +8839,14 @@ param maxCount GLsizei
param count GLsizei *
param obj GLhandleARB *
category GL_ARB_shader_objects
-offset 743
+offset 744
name GetUniformLocationARB
return GLint
param programObj GLhandleARB
param name const GLcharARB *
category GL_ARB_shader_objects
-offset 744
+offset 745
name GetActiveUniformARB
return void
@@ -8849,7 +8858,7 @@ param size GLint *
param type GLenum *
param name GLcharARB *
category GL_ARB_shader_objects
-offset 745
+offset 746
name GetUniformfvARB
return void
@@ -8857,7 +8866,7 @@ param programObj GLhandleARB
param location GLint
param params GLfloat *
category GL_ARB_shader_objects
-offset 746
+offset 747
name GetUniformivARB
return void
@@ -8865,7 +8874,7 @@ param programObj GLhandleARB
param location GLint
param params GLint *
category GL_ARB_shader_objects
-offset 747
+offset 748
name GetShaderSourceARB
return void
@@ -8874,7 +8883,7 @@ param maxLength GLsizei
param length GLsizei *
param source GLcharARB *
category GL_ARB_shader_objects
-offset 748
+offset 749
# ARB_vertex_shader
@@ -8884,7 +8893,7 @@ param programObj GLhandleARB
param index GLuint
param name const GLcharARB *
category ARB_vertex_shader
-offset 749
+offset 750
name GetActiveAttribARB
return void
@@ -8896,23 +8905,14 @@ param size GLint *
param type GLenum *
param name GLcharARB *
category ARB_vertex_shader
-offset 750
+offset 751
name GetAttribLocationARB
return GLint
param programObj GLhandleARB
param name const GLcharARB *
category ARB_vertex_shader
-offset 751
-
-# EXT_blend_equation_separate
-
-name BlendEquationSeparateEXT
-return void
-param modeRGB GLenum
-param modeA GLenum
offset 752
-category GL_EXT_blend_equation_separate
# ATI_blend_equation_separate
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 2deebe2334..2a3c69a248 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -5272,76 +5272,76 @@
<type name="charARB" size="1"/>
<type name="handleARB" size="4"/>
- <function name="DeleteObjectARB" offset="710">
+ <function name="DeleteObjectARB" offset="711">
<param name="obj" type="GLhandleARB"/>
</function>
- <function name="GetHandleARB" offset="711">
+ <function name="GetHandleARB" offset="712">
<param name="pname" type="GLenum"/>
<return type="GLhandleARB"/>
</function>
- <function name="DetachObjectARB" offset="712">
+ <function name="DetachObjectARB" offset="713">
<param name="containerObj" type="GLhandleARB"/>
<param name="attachedObj" type="GLhandleARB"/>
</function>
- <function name="CreateShaderObjectARB" offset="713">
+ <function name="CreateShaderObjectARB" offset="714">
<param name="shaderType" type="GLenum"/>
<return type="GLhandleARB"/>
</function>
- <function name="ShaderSourceARB" offset="714">
+ <function name="ShaderSourceARB" offset="715">
<param name="shaderObj" type="GLhandleARB"/>
<param name="count" type="GLsizei"/>
<param name="string" type="const GLcharARB **"/>
<param name="length" type="const GLint *"/>
</function>
- <function name="CompileShaderARB" offset="715">
+ <function name="CompileShaderARB" offset="716">
<param name="shaderObj" type="GLhandleARB"/>
</function>
- <function name="CreateProgramObjectARB" offset="716">
+ <function name="CreateProgramObjectARB" offset="717">
<return type="GLhandleARB"/>
</function>
- <function name="AttachObjectARB" offset="717">
+ <function name="AttachObjectARB" offset="718">
<param name="containerObj" type="GLhandleARB"/>
<param name="obj" type="GLhandleARB"/>
</function>
- <function name="LinkProgramARB" offset="718">
+ <function name="LinkProgramARB" offset="719">
<param name="programObj" type="GLhandleARB"/>
</function>
- <function name="UseProgramObjectARB" offset="719">
+ <function name="UseProgramObjectARB" offset="720">
<param name="programObj" type="GLhandleARB"/>
</function>
- <function name="ValidateProgramARB" offset="720">
+ <function name="ValidateProgramARB" offset="721">
<param name="programObj" type="GLhandleARB"/>
</function>
- <function name="Uniform1fARB" offset="721">
+ <function name="Uniform1fARB" offset="722">
<param name="location" type="GLint"/>
<param name="v0" type="GLfloat"/>
</function>
- <function name="Uniform2fARB" offset="722">
+ <function name="Uniform2fARB" offset="723">
<param name="location" type="GLint"/>
<param name="v0" type="GLfloat"/>
<param name="v1" type="GLfloat"/>
</function>
- <function name="Uniform3fARB" offset="723">
+ <function name="Uniform3fARB" offset="724">
<param name="location" type="GLint"/>
<param name="v0" type="GLfloat"/>
<param name="v1" type="GLfloat"/>
<param name="v2" type="GLfloat"/>
</function>
- <function name="Uniform4fARB" offset="724">
+ <function name="Uniform4fARB" offset="725">
<param name="location" type="GLint"/>
<param name="v0" type="GLfloat"/>
<param name="v1" type="GLfloat"/>
@@ -5349,25 +5349,25 @@
<param name="v3" type="GLfloat"/>
</function>
- <function name="Uniform1iARB" offset="725">
+ <function name="Uniform1iARB" offset="726">
<param name="location" type="GLint"/>
<param name="v0" type="GLint"/>
</function>
- <function name="Uniform2iARB" offset="726">
+ <function name="Uniform2iARB" offset="727">
<param name="location" type="GLint"/>
<param name="v0" type="GLint"/>
<param name="v1" type="GLint"/>
</function>
- <function name="Uniform3iARB" offset="727">
+ <function name="Uniform3iARB" offset="728">
<param name="location" type="GLint"/>
<param name="v0" type="GLint"/>
<param name="v1" type="GLint"/>
<param name="v2" type="GLint"/>
</function>
- <function name="Uniform4iARB" offset="728">
+ <function name="Uniform4iARB" offset="729">
<param name="location" type="GLint"/>
<param name="v0" type="GLint"/>
<param name="v1" type="GLint"/>
@@ -5375,108 +5375,108 @@
<param name="v3" type="GLint"/>
</function>
- <function name="Uniform1fvARB" offset="729">
+ <function name="Uniform1fvARB" offset="730">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="Uniform2fvARB" offset="730">
+ <function name="Uniform2fvARB" offset="731">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="Uniform3fvARB" offset="731">
+ <function name="Uniform3fvARB" offset="732">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="Uniform4fvARB" offset="732">
+ <function name="Uniform4fvARB" offset="733">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="Uniform1ivARB" offset="733">
+ <function name="Uniform1ivARB" offset="734">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLint *"/>
</function>
- <function name="Uniform2ivARB" offset="734">
+ <function name="Uniform2ivARB" offset="735">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLint *"/>
</function>
- <function name="Uniform3ivARB" offset="735">
+ <function name="Uniform3ivARB" offset="736">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLint *"/>
</function>
- <function name="Uniform4ivARB" offset="736">
+ <function name="Uniform4ivARB" offset="737">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLint *"/>
</function>
- <function name="UniformMatrix2fvARB" offset="737">
+ <function name="UniformMatrix2fvARB" offset="738">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="transpose" type="GLboolean"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="UniformMatrix3fvARB" offset="738">
+ <function name="UniformMatrix3fvARB" offset="739">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="transpose" type="GLboolean"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="UniformMatrix4fvARB" offset="739">
+ <function name="UniformMatrix4fvARB" offset="740">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="transpose" type="GLboolean"/>
<param name="value" type="const GLfloat *"/>
</function>
- <function name="GetObjectParameterfvARB" offset="740">
+ <function name="GetObjectParameterfvARB" offset="741">
<param name="obj" type="GLhandleARB"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfloat *"/>
</function>
- <function name="GetObjectParameterivARB" offset="741">
+ <function name="GetObjectParameterivARB" offset="742">
<param name="obj" type="GLhandleARB"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *"/>
</function>
- <function name="GetInfoLogARB" offset="742">
+ <function name="GetInfoLogARB" offset="743">
<param name="obj" type="GLhandleARB"/>
- <param name="" type="GLsizei"/>
- <param name="" type="GLsizei *"/>
- <param name="" type="GLcharARB *"/>
+ <param name="maxLength" type="GLsizei"/>
+ <param name="length" type="GLsizei *"/>
+ <param name="infoLog" type="GLcharARB *"/>
</function>
- <function name="GetAttachedObjectsARB" offset="743">
+ <function name="GetAttachedObjectsARB" offset="744">
<param name="containerObj" type="GLhandleARB"/>
<param name="maxLength" type="GLsizei"/>
<param name="length" type="GLsizei *"/>
<param name="infoLog" type="GLhandleARB *"/>
</function>
- <function name="GetUniformLocationARB" offset="744">
+ <function name="GetUniformLocationARB" offset="745">
<param name="programObj" type="GLhandleARB"/>
<param name="name" type="const GLcharARB *"/>
<return type="GLint"/>
</function>
- <function name="GetActiveUniformARB" offset="745">
+ <function name="GetActiveUniformARB" offset="746">
<param name="programObj" type="GLhandleARB"/>
<param name="index" type="GLuint"/>
<param name="maxLength" type="GLsizei"/>
@@ -5486,19 +5486,19 @@
<param name="name" type="GLcharARB *"/>
</function>
- <function name="GetUniformfvARB" offset="746">
+ <function name="GetUniformfvARB" offset="747">
<param name="programObj" type="GLhandleARB"/>
<param name="location" type="GLint"/>
<param name="params" type="GLfloat *"/>
</function>
- <function name="GetUniformivARB" offset="747">
+ <function name="GetUniformivARB" offset="748">
<param name="programObj" type="GLhandleARB"/>
<param name="location" type="GLint"/>
<param name="params" type="GLint *"/>
</function>
- <function name="GetShaderSourceARB" offset="748">
+ <function name="GetShaderSourceARB" offset="749">
<param name="obj" type="GLhandleARB"/>
<param name="maxLength" type="GLsizei"/>
<param name="length" type="GLsizei *"/>
@@ -5515,13 +5515,13 @@
<enum name="OBJECT_ACTIVE_ATTRIBUTES_ARB" value="0x8B89"/>
<enum name="OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB" value="0x8B8A"/>
- <function name="BindAttribLocationARB" offset="749">
+ <function name="BindAttribLocationARB" offset="750">
<param name="programObj" type="GLhandleARB"/>
<param name="index" type="GLuint"/>
<param name="name" type="const GLcharARB *"/>
</function>
- <function name="GetActiveAttribARB" offset="750">
+ <function name="GetActiveAttribARB" offset="751">
<param name="programObj" type="GLhandleARB"/>
<param name="index" type="GLuint"/>
<param name="maxLength" type="GLsizei"/>
@@ -5531,7 +5531,7 @@
<param name="name" type="const GLcharARB *"/>
</function>
- <function name="GetAttribLocationARB" offset="751">
+ <function name="GetAttribLocationARB" offset="752">
<param name="programObj" type="GLhandleARB"/>
<param name="name" type="const GLcharARB *"/>
<return type="GLint"/>
@@ -8699,7 +8699,7 @@
</category>
<category name="GL_EXT_blend_equation_separate" number="299">
- <function name="BlendEquationSeparateEXT" offset="752">
+ <function name="BlendEquationSeparateEXT" offset="710">
<param name="modeRGB" type="GLenum"/>
<param name="modeA" type="GLenum"/>
<glx rop="4228"/>
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index ac13653bf4..03f7409aef 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically by gloffsets.py script */
+/* DO NOT EDIT - This file generated automatically by gl_offsets.py (from Mesa) script */
/*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
@@ -25,7 +25,7 @@
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-
+
#ifndef _GLAPI_OFFSETS_H_
#define _GLAPI_OFFSETS_H_
@@ -739,48 +739,48 @@
#define _gloffset_GetQueryObjectuivARB 707
#define _gloffset_MultiModeDrawArraysIBM 708
#define _gloffset_MultiModeDrawElementsIBM 709
-#define _gloffset_DeleteObjectARB 710
-#define _gloffset_GetHandleARB 711
-#define _gloffset_DetachObjectARB 712
-#define _gloffset_CreateShaderObjectARB 713
-#define _gloffset_ShaderSourceARB 714
-#define _gloffset_CompileShaderARB 715
-#define _gloffset_CreateProgramObjectARB 716
-#define _gloffset_AttachObjectARB 717
-#define _gloffset_LinkProgramARB 718
-#define _gloffset_UseProgramObjectARB 719
-#define _gloffset_ValidateProgramARB 720
-#define _gloffset_Uniform1fARB 721
-#define _gloffset_Uniform2fARB 722
-#define _gloffset_Uniform3fARB 723
-#define _gloffset_Uniform4fARB 724
-#define _gloffset_Uniform1iARB 725
-#define _gloffset_Uniform2iARB 726
-#define _gloffset_Uniform3iARB 727
-#define _gloffset_Uniform4iARB 728
-#define _gloffset_Uniform1fvARB 729
-#define _gloffset_Uniform2fvARB 730
-#define _gloffset_Uniform3fvARB 731
-#define _gloffset_Uniform4fvARB 732
-#define _gloffset_Uniform1ivARB 733
-#define _gloffset_Uniform2ivARB 734
-#define _gloffset_Uniform3ivARB 735
-#define _gloffset_Uniform4ivARB 736
-#define _gloffset_UniformMatrix2fvARB 737
-#define _gloffset_UniformMatrix3fvARB 738
-#define _gloffset_UniformMatrix4fvARB 739
-#define _gloffset_GetObjectParameterfvARB 740
-#define _gloffset_GetObjectParameterivARB 741
-#define _gloffset_GetInfoLogARB 742
-#define _gloffset_GetAttachedObjectsARB 743
-#define _gloffset_GetUniformLocationARB 744
-#define _gloffset_GetActiveUniformARB 745
-#define _gloffset_GetUniformfvARB 746
-#define _gloffset_GetUniformivARB 747
-#define _gloffset_GetShaderSourceARB 748
-#define _gloffset_BindAttribLocationARB 749
-#define _gloffset_GetActiveAttribARB 750
-#define _gloffset_GetAttribLocationARB 751
-#define _gloffset_BlendEquationSeparateEXT 752
+#define _gloffset_BlendEquationSeparateEXT 710
+#define _gloffset_DeleteObjectARB 711
+#define _gloffset_GetHandleARB 712
+#define _gloffset_DetachObjectARB 713
+#define _gloffset_CreateShaderObjectARB 714
+#define _gloffset_ShaderSourceARB 715
+#define _gloffset_CompileShaderARB 716
+#define _gloffset_CreateProgramObjectARB 717
+#define _gloffset_AttachObjectARB 718
+#define _gloffset_LinkProgramARB 719
+#define _gloffset_UseProgramObjectARB 720
+#define _gloffset_ValidateProgramARB 721
+#define _gloffset_Uniform1fARB 722
+#define _gloffset_Uniform2fARB 723
+#define _gloffset_Uniform3fARB 724
+#define _gloffset_Uniform4fARB 725
+#define _gloffset_Uniform1iARB 726
+#define _gloffset_Uniform2iARB 727
+#define _gloffset_Uniform3iARB 728
+#define _gloffset_Uniform4iARB 729
+#define _gloffset_Uniform1fvARB 730
+#define _gloffset_Uniform2fvARB 731
+#define _gloffset_Uniform3fvARB 732
+#define _gloffset_Uniform4fvARB 733
+#define _gloffset_Uniform1ivARB 734
+#define _gloffset_Uniform2ivARB 735
+#define _gloffset_Uniform3ivARB 736
+#define _gloffset_Uniform4ivARB 737
+#define _gloffset_UniformMatrix2fvARB 738
+#define _gloffset_UniformMatrix3fvARB 739
+#define _gloffset_UniformMatrix4fvARB 740
+#define _gloffset_GetObjectParameterfvARB 741
+#define _gloffset_GetObjectParameterivARB 742
+#define _gloffset_GetInfoLogARB 743
+#define _gloffset_GetAttachedObjectsARB 744
+#define _gloffset_GetUniformLocationARB 745
+#define _gloffset_GetActiveUniformARB 746
+#define _gloffset_GetUniformfvARB 747
+#define _gloffset_GetUniformivARB 748
+#define _gloffset_GetShaderSourceARB 749
+#define _gloffset_BindAttribLocationARB 750
+#define _gloffset_GetActiveAttribARB 751
+#define _gloffset_GetAttribLocationARB 752
#endif
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index aa2f70d886..578bdfe039 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -1,7 +1,7 @@
-/* DO NOT EDIT - This file generated automatically with gltable.py script */
+/* DO NOT EDIT - This file generated automatically by a script */
/*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
* (C) Copyright IBM Corporation 2004
* All Rights Reserved.
*
@@ -730,9 +730,9 @@ struct _glapi_table
void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 692 */
void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 693 */
void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 694 */
- void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); /* 695 */
+ void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 695 */
GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 696 */
- void * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 697 */
+ GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 697 */
GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 698 */
void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 699 */
void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 700 */
@@ -745,49 +745,49 @@ struct _glapi_table
void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 707 */
void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 708 */
void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 709 */
- void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 710 */
- GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 711 */
- void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 712 */
- GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 713 */
- void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint * length); /* 714 */
- void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shaderObj); /* 715 */
- GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 716 */
- void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 717 */
- void (GLAPIENTRYP LinkProgramARB)(GLhandleARB programObj); /* 718 */
- void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB programObj); /* 719 */
- void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB programObj); /* 720 */
- void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 721 */
- void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 722 */
- void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 723 */
- void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 724 */
- void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 725 */
- void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 726 */
- void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 727 */
- void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 728 */
- void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 729 */
- void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 730 */
- void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 731 */
- void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 732 */
- void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 733 */
- void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 734 */
- void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 735 */
- void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 736 */
- void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 737 */
- void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 738 */
- void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 739 */
- void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 740 */
- void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 741 */
- void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 742 */
- void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxCount, GLsizei * count, GLhandleARB * obj); /* 743 */
- GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB programObj, const GLcharARB * name); /* 744 */
- void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 745 */
- void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB programObj, GLint location, GLfloat * params); /* 746 */
- void (GLAPIENTRYP GetUniformivARB)(GLhandleARB programObj, GLint location, GLint * params); /* 747 */
- void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * source); /* 748 */
- void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB programObj, GLuint index, const GLcharARB * name); /* 749 */
- void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 750 */
- GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB programObj, const GLcharARB * name); /* 751 */
- void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 752 */
+ void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 710 */
+ void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 711 */
+ GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 712 */
+ void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 713 */
+ GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 714 */
+ void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint * length); /* 715 */
+ void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shaderObj); /* 716 */
+ GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 717 */
+ void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 718 */
+ void (GLAPIENTRYP LinkProgramARB)(GLhandleARB programObj); /* 719 */
+ void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB programObj); /* 720 */
+ void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB programObj); /* 721 */
+ void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 722 */
+ void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 723 */
+ void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 724 */
+ void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 725 */
+ void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 726 */
+ void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 727 */
+ void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 728 */
+ void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 729 */
+ void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 730 */
+ void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 731 */
+ void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 732 */
+ void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 733 */
+ void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 734 */
+ void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 735 */
+ void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 736 */
+ void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 737 */
+ void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 738 */
+ void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 739 */
+ void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 740 */
+ void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 741 */
+ void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 742 */
+ void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 743 */
+ void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 744 */
+ GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB programObj, const GLcharARB * name); /* 745 */
+ void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * lenght, GLint * size, GLenum * type, GLcharARB * name); /* 746 */
+ void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB programObj, GLint location, GLfloat * params); /* 747 */
+ void (GLAPIENTRYP GetUniformivARB)(GLhandleARB programObj, GLint location, GLint * params); /* 748 */
+ void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * source); /* 749 */
+ void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB programObj, GLuint index, const GLcharARB * name); /* 750 */
+ void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, const GLcharARB * name); /* 751 */
+ GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB programObj, const GLcharARB * name); /* 752 */
};
#endif
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index ee583bfd92..ebf5b124a1 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -3620,6 +3620,11 @@ KEYWORD1 void KEYWORD2 NAME(MultiModeDrawElementsIBM)(const GLenum * mode, const
DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
}
+KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA)
+{
+ DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
+}
+
KEYWORD1 void KEYWORD2 NAME(DeleteObjectARB)(GLhandleARB obj)
{
DISPATCH(DeleteObjectARB, (obj), (F, "glDeleteObjectARB(%d);\n", obj));
@@ -3780,9 +3785,9 @@ KEYWORD1 void KEYWORD2 NAME(GetObjectParameterivARB)(GLhandleARB obj, GLenum pna
DISPATCH(GetObjectParameterivARB, (obj, pname, params), (F, "glGetObjectParameterivARB(%d, 0x%x, %p);\n", obj, pname, (const void *) params));
}
-KEYWORD1 void KEYWORD2 NAME(GetInfoLogARB)(GLhandleARB obj, GLsizei , GLsizei * , GLcharARB * )
+KEYWORD1 void KEYWORD2 NAME(GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog)
{
- DISPATCH(GetInfoLogARB, (obj, , , ), (F, "glGetInfoLogARB(%d, %d, %p, %p);\n", obj, , (const void *) , (const void *) ));
+ DISPATCH(GetInfoLogARB, (obj, maxLength, length, infoLog), (F, "glGetInfoLogARB(%d, %d, %p, %p);\n", obj, maxLength, (const void *) length, (const void *) infoLog));
}
KEYWORD1 void KEYWORD2 NAME(GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog)
@@ -3830,11 +3835,6 @@ KEYWORD1 GLint KEYWORD2 NAME(GetAttribLocationARB)(GLhandleARB programObj, const
RETURN_DISPATCH(GetAttribLocationARB, (programObj, name), (F, "glGetAttribLocationARB(%d, %p);\n", programObj, (const void *) name));
}
-KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA)
-{
- DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
-}
-
KEYWORD1 void KEYWORD2 NAME(ActiveTexture)(GLenum texture)
{
DISPATCH(ActiveTextureARB, (texture), (F, "glActiveTexture(0x%x);\n", texture));
@@ -5594,6 +5594,7 @@ static void * DISPATCH_TABLE_NAME[] = {
TABLE_ENTRY(GetQueryObjectuivARB),
TABLE_ENTRY(MultiModeDrawArraysIBM),
TABLE_ENTRY(MultiModeDrawElementsIBM),
+ TABLE_ENTRY(BlendEquationSeparateEXT),
TABLE_ENTRY(DeleteObjectARB),
TABLE_ENTRY(GetHandleARB),
TABLE_ENTRY(DetachObjectARB),
@@ -5636,7 +5637,6 @@ static void * DISPATCH_TABLE_NAME[] = {
TABLE_ENTRY(BindAttribLocationARB),
TABLE_ENTRY(GetActiveAttribARB),
TABLE_ENTRY(GetAttribLocationARB),
- TABLE_ENTRY(BlendEquationSeparateEXT),
/* A whole bunch of no-op functions. These might be called
* when someone tries to call a dynamically-registered
* extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 86425a13e5..4fdf2f0428 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -756,6 +756,7 @@ static const char gl_string_table[] =
"glGetQueryObjectuivARB\0"
"glMultiModeDrawArraysIBM\0"
"glMultiModeDrawElementsIBM\0"
+ "glBlendEquationSeparateEXT\0"
"glDeleteObjectARB\0"
"glGetHandleARB\0"
"glDetachObjectARB\0"
@@ -798,7 +799,6 @@ static const char gl_string_table[] =
"glBindAttribLocationARB\0"
"glGetActiveAttribARB\0"
"glGetAttribLocationARB\0"
- "glBlendEquationSeparateEXT\0"
"glActiveTexture\0"
"glClientActiveTexture\0"
"glMultiTexCoord1d\0"
@@ -1719,49 +1719,49 @@ static const glprocs_table_t static_functions[] = {
NAME_FUNC_OFFSET( 12362, glGetQueryObjectuivARB, _gloffset_GetQueryObjectuivARB ),
NAME_FUNC_OFFSET( 12385, glMultiModeDrawArraysIBM, _gloffset_MultiModeDrawArraysIBM ),
NAME_FUNC_OFFSET( 12410, glMultiModeDrawElementsIBM, _gloffset_MultiModeDrawElementsIBM ),
- NAME_FUNC_OFFSET( 12437, glDeleteObjectARB, _gloffset_DeleteObjectARB ),
- NAME_FUNC_OFFSET( 12455, glGetHandleARB, _gloffset_GetHandleARB ),
- NAME_FUNC_OFFSET( 12470, glDetachObjectARB, _gloffset_DetachObjectARB ),
- NAME_FUNC_OFFSET( 12488, glCreateShaderObjectARB, _gloffset_CreateShaderObjectARB ),
- NAME_FUNC_OFFSET( 12512, glShaderSourceARB, _gloffset_ShaderSourceARB ),
- NAME_FUNC_OFFSET( 12530, glCompileShaderARB, _gloffset_CompileShaderARB ),
- NAME_FUNC_OFFSET( 12549, glCreateProgramObjectARB, _gloffset_CreateProgramObjectARB ),
- NAME_FUNC_OFFSET( 12574, glAttachObjectARB, _gloffset_AttachObjectARB ),
- NAME_FUNC_OFFSET( 12592, glLinkProgramARB, _gloffset_LinkProgramARB ),
- NAME_FUNC_OFFSET( 12609, glUseProgramObjectARB, _gloffset_UseProgramObjectARB ),
- NAME_FUNC_OFFSET( 12631, glValidateProgramARB, _gloffset_ValidateProgramARB ),
- NAME_FUNC_OFFSET( 12652, glUniform1fARB, _gloffset_Uniform1fARB ),
- NAME_FUNC_OFFSET( 12667, glUniform2fARB, _gloffset_Uniform2fARB ),
- NAME_FUNC_OFFSET( 12682, glUniform3fARB, _gloffset_Uniform3fARB ),
- NAME_FUNC_OFFSET( 12697, glUniform4fARB, _gloffset_Uniform4fARB ),
- NAME_FUNC_OFFSET( 12712, glUniform1iARB, _gloffset_Uniform1iARB ),
- NAME_FUNC_OFFSET( 12727, glUniform2iARB, _gloffset_Uniform2iARB ),
- NAME_FUNC_OFFSET( 12742, glUniform3iARB, _gloffset_Uniform3iARB ),
- NAME_FUNC_OFFSET( 12757, glUniform4iARB, _gloffset_Uniform4iARB ),
- NAME_FUNC_OFFSET( 12772, glUniform1fvARB, _gloffset_Uniform1fvARB ),
- NAME_FUNC_OFFSET( 12788, glUniform2fvARB, _gloffset_Uniform2fvARB ),
- NAME_FUNC_OFFSET( 12804, glUniform3fvARB, _gloffset_Uniform3fvARB ),
- NAME_FUNC_OFFSET( 12820, glUniform4fvARB, _gloffset_Uniform4fvARB ),
- NAME_FUNC_OFFSET( 12836, glUniform1ivARB, _gloffset_Uniform1ivARB ),
- NAME_FUNC_OFFSET( 12852, glUniform2ivARB, _gloffset_Uniform2ivARB ),
- NAME_FUNC_OFFSET( 12868, glUniform3ivARB, _gloffset_Uniform3ivARB ),
- NAME_FUNC_OFFSET( 12884, glUniform4ivARB, _gloffset_Uniform4ivARB ),
- NAME_FUNC_OFFSET( 12900, glUniformMatrix2fvARB, _gloffset_UniformMatrix2fvARB ),
- NAME_FUNC_OFFSET( 12922, glUniformMatrix3fvARB, _gloffset_UniformMatrix3fvARB ),
- NAME_FUNC_OFFSET( 12944, glUniformMatrix4fvARB, _gloffset_UniformMatrix4fvARB ),
- NAME_FUNC_OFFSET( 12966, glGetObjectParameterfvARB, _gloffset_GetObjectParameterfvARB ),
- NAME_FUNC_OFFSET( 12992, glGetObjectParameterivARB, _gloffset_GetObjectParameterivARB ),
- NAME_FUNC_OFFSET( 13018, glGetInfoLogARB, _gloffset_GetInfoLogARB ),
- NAME_FUNC_OFFSET( 13034, glGetAttachedObjectsARB, _gloffset_GetAttachedObjectsARB ),
- NAME_FUNC_OFFSET( 13058, glGetUniformLocationARB, _gloffset_GetUniformLocationARB ),
- NAME_FUNC_OFFSET( 13082, glGetActiveUniformARB, _gloffset_GetActiveUniformARB ),
- NAME_FUNC_OFFSET( 13104, glGetUniformfvARB, _gloffset_GetUniformfvARB ),
- NAME_FUNC_OFFSET( 13122, glGetUniformivARB, _gloffset_GetUniformivARB ),
- NAME_FUNC_OFFSET( 13140, glGetShaderSourceARB, _gloffset_GetShaderSourceARB ),
- NAME_FUNC_OFFSET( 13161, glBindAttribLocationARB, _gloffset_BindAttribLocationARB ),
- NAME_FUNC_OFFSET( 13185, glGetActiveAttribARB, _gloffset_GetActiveAttribARB ),
- NAME_FUNC_OFFSET( 13206, glGetAttribLocationARB, _gloffset_GetAttribLocationARB ),
- NAME_FUNC_OFFSET( 13229, glBlendEquationSeparateEXT, _gloffset_BlendEquationSeparateEXT ),
+ NAME_FUNC_OFFSET( 12437, glBlendEquationSeparateEXT, _gloffset_BlendEquationSeparateEXT ),
+ NAME_FUNC_OFFSET( 12464, glDeleteObjectARB, _gloffset_DeleteObjectARB ),
+ NAME_FUNC_OFFSET( 12482, glGetHandleARB, _gloffset_GetHandleARB ),
+ NAME_FUNC_OFFSET( 12497, glDetachObjectARB, _gloffset_DetachObjectARB ),
+ NAME_FUNC_OFFSET( 12515, glCreateShaderObjectARB, _gloffset_CreateShaderObjectARB ),
+ NAME_FUNC_OFFSET( 12539, glShaderSourceARB, _gloffset_ShaderSourceARB ),
+ NAME_FUNC_OFFSET( 12557, glCompileShaderARB, _gloffset_CompileShaderARB ),
+ NAME_FUNC_OFFSET( 12576, glCreateProgramObjectARB, _gloffset_CreateProgramObjectARB ),
+ NAME_FUNC_OFFSET( 12601, glAttachObjectARB, _gloffset_AttachObjectARB ),
+ NAME_FUNC_OFFSET( 12619, glLinkProgramARB, _gloffset_LinkProgramARB ),
+ NAME_FUNC_OFFSET( 12636, glUseProgramObjectARB, _gloffset_UseProgramObjectARB ),
+ NAME_FUNC_OFFSET( 12658, glValidateProgramARB, _gloffset_ValidateProgramARB ),
+ NAME_FUNC_OFFSET( 12679, glUniform1fARB, _gloffset_Uniform1fARB ),
+ NAME_FUNC_OFFSET( 12694, glUniform2fARB, _gloffset_Uniform2fARB ),
+ NAME_FUNC_OFFSET( 12709, glUniform3fARB, _gloffset_Uniform3fARB ),
+ NAME_FUNC_OFFSET( 12724, glUniform4fARB, _gloffset_Uniform4fARB ),
+ NAME_FUNC_OFFSET( 12739, glUniform1iARB, _gloffset_Uniform1iARB ),
+ NAME_FUNC_OFFSET( 12754, glUniform2iARB, _gloffset_Uniform2iARB ),
+ NAME_FUNC_OFFSET( 12769, glUniform3iARB, _gloffset_Uniform3iARB ),
+ NAME_FUNC_OFFSET( 12784, glUniform4iARB, _gloffset_Uniform4iARB ),
+ NAME_FUNC_OFFSET( 12799, glUniform1fvARB, _gloffset_Uniform1fvARB ),
+ NAME_FUNC_OFFSET( 12815, glUniform2fvARB, _gloffset_Uniform2fvARB ),
+ NAME_FUNC_OFFSET( 12831, glUniform3fvARB, _gloffset_Uniform3fvARB ),
+ NAME_FUNC_OFFSET( 12847, glUniform4fvARB, _gloffset_Uniform4fvARB ),
+ NAME_FUNC_OFFSET( 12863, glUniform1ivARB, _gloffset_Uniform1ivARB ),
+ NAME_FUNC_OFFSET( 12879, glUniform2ivARB, _gloffset_Uniform2ivARB ),
+ NAME_FUNC_OFFSET( 12895, glUniform3ivARB, _gloffset_Uniform3ivARB ),
+ NAME_FUNC_OFFSET( 12911, glUniform4ivARB, _gloffset_Uniform4ivARB ),
+ NAME_FUNC_OFFSET( 12927, glUniformMatrix2fvARB, _gloffset_UniformMatrix2fvARB ),
+ NAME_FUNC_OFFSET( 12949, glUniformMatrix3fvARB, _gloffset_UniformMatrix3fvARB ),
+ NAME_FUNC_OFFSET( 12971, glUniformMatrix4fvARB, _gloffset_UniformMatrix4fvARB ),
+ NAME_FUNC_OFFSET( 12993, glGetObjectParameterfvARB, _gloffset_GetObjectParameterfvARB ),
+ NAME_FUNC_OFFSET( 13019, glGetObjectParameterivARB, _gloffset_GetObjectParameterivARB ),
+ NAME_FUNC_OFFSET( 13045, glGetInfoLogARB, _gloffset_GetInfoLogARB ),
+ NAME_FUNC_OFFSET( 13061, glGetAttachedObjectsARB, _gloffset_GetAttachedObjectsARB ),
+ NAME_FUNC_OFFSET( 13085, glGetUniformLocationARB, _gloffset_GetUniformLocationARB ),
+ NAME_FUNC_OFFSET( 13109, glGetActiveUniformARB, _gloffset_GetActiveUniformARB ),
+ NAME_FUNC_OFFSET( 13131, glGetUniformfvARB, _gloffset_GetUniformfvARB ),
+ NAME_FUNC_OFFSET( 13149, glGetUniformivARB, _gloffset_GetUniformivARB ),
+ NAME_FUNC_OFFSET( 13167, glGetShaderSourceARB, _gloffset_GetShaderSourceARB ),
+ NAME_FUNC_OFFSET( 13188, glBindAttribLocationARB, _gloffset_BindAttribLocationARB ),
+ NAME_FUNC_OFFSET( 13212, glGetActiveAttribARB, _gloffset_GetActiveAttribARB ),
+ NAME_FUNC_OFFSET( 13233, glGetAttribLocationARB, _gloffset_GetAttribLocationARB ),
NAME_FUNC_OFFSET( 13256, glActiveTexture, _gloffset_ActiveTextureARB ),
NAME_FUNC_OFFSET( 13272, glClientActiveTexture, _gloffset_ClientActiveTextureARB ),
NAME_FUNC_OFFSET( 13294, glMultiTexCoord1d, _gloffset_MultiTexCoord1dARB ),
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 9a894dc630..44fe374295 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -819,6 +819,7 @@ GLNAME(gl_dispatch_functions_start):
GL_STUB(GetQueryObjectuivARB, _gloffset_GetQueryObjectuivARB, GetQueryObjectuivARB@12)
GL_STUB(MultiModeDrawArraysIBM, _gloffset_MultiModeDrawArraysIBM, MultiModeDrawArraysIBM@20)
GL_STUB(MultiModeDrawElementsIBM, _gloffset_MultiModeDrawElementsIBM, MultiModeDrawElementsIBM@24)
+ GL_STUB(BlendEquationSeparateEXT, _gloffset_BlendEquationSeparateEXT, BlendEquationSeparateEXT@8)
GL_STUB(DeleteObjectARB, _gloffset_DeleteObjectARB, DeleteObjectARB@4)
GL_STUB(GetHandleARB, _gloffset_GetHandleARB, GetHandleARB@4)
GL_STUB(DetachObjectARB, _gloffset_DetachObjectARB, DetachObjectARB@8)
@@ -861,7 +862,6 @@ GLNAME(gl_dispatch_functions_start):
GL_STUB(BindAttribLocationARB, _gloffset_BindAttribLocationARB, BindAttribLocationARB@12)
GL_STUB(GetActiveAttribARB, _gloffset_GetActiveAttribARB, GetActiveAttribARB@28)
GL_STUB(GetAttribLocationARB, _gloffset_GetAttribLocationARB, GetAttribLocationARB@8)
- GL_STUB(BlendEquationSeparateEXT, _gloffset_BlendEquationSeparateEXT, BlendEquationSeparateEXT@8)
GL_STUB(ActiveTexture, _gloffset_ActiveTextureARB, ActiveTexture@4)
GL_STUB(ClientActiveTexture, _gloffset_ClientActiveTextureARB, ClientActiveTexture@4)
GL_STUB(MultiTexCoord1d, _gloffset_MultiTexCoord1dARB, MultiTexCoord1d@12)