From 2171fadc262e32c2c079dd977d4346264bdc0def Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 24 Nov 2003 23:03:29 +0000
Subject: [PATCH] oops, fix glitches in 1.5 functions

---
 src/mesa/glapi/APIspec     | 10 ++++++----
 src/mesa/glapi/glapitemp.h |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index 390a006e2ad..4c180fdcbe4 100644
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.21 2003/11/24 22:30:32 brianp Exp $
+# $Id: APIspec,v 1.22 2003/11/24 23:03:29 brianp Exp $
 
 # This file describes all the OpenGL functions.
 # We use a number of Python scripts to parse this file and
@@ -6089,7 +6089,7 @@ param		sfactorRGB	GLenum
 param		dfactorRGB	GLenum
 param		sfactorAlpha	GLenum
 param		dfactorAlpha	GLenum
-category	GL_EXT_blend_func_separate
+category	GL_INGR_blend_func_separate
 
 
 # GL_EXT_vertex_weighting
@@ -8446,6 +8446,7 @@ name		BufferSubData
 alias		BufferSubDataARB
 return		void
 param		target		GLenum
+param		offset		GLintptrARB
 param		size		GLsizeiptrARB
 param		data		const GLvoid *
 category	1.5
@@ -8484,6 +8485,7 @@ name		GetBufferSubData
 alias		GetBufferSubDataARB
 return		void
 param		target		GLenum
+param		offset		GLintptrARB
 param		size		GLsizeiptrARB
 param		data		void *
 category	1.5
@@ -8555,7 +8557,7 @@ return		void
 param		id		GLuint
 param		pname		GLenum
 param		params		GLint *
-category	GL_ARB_occlusion_query
+category	1.5
 
 name		GetQueryObjectuiv
 alias		GetQueryObjectuivARB
@@ -8563,7 +8565,7 @@ return		void
 param		id		GLuint
 param		pname		GLenum
 param		params		GLuint *
-category	GL_ARB_occlusion_query
+category	1.5
 
 
 
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 52c422717e2..a0f2e8d0c64 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4682,9 +4682,9 @@ KEYWORD1 void KEYWORD2 NAME(BufferData)(GLenum target, GLsizeiptrARB size, const
    DISPATCH(BufferDataARB, (target, size, data, usage), (F, "glBufferData(0x%x, %p, %p, 0x%x);\n", target, (const void *) size, (const void *) data, usage));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BufferSubData)(GLenum target, GLsizeiptrARB size, const GLvoid * data)
+KEYWORD1 void KEYWORD2 NAME(BufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data)
 {
-   DISPATCH(BufferSubDataARB, (target, size, data), (F, "glBufferSubData(0x%x, %p, %p);\n", target, (const void *) size, (const void *) data));
+   DISPATCH(BufferSubDataARB, (target, offset, size, data), (F, "glBufferSubData(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DeleteBuffers)(GLsizei n, const GLuint * buffer)
@@ -4707,9 +4707,9 @@ KEYWORD1 void KEYWORD2 NAME(GetBufferPointerv)(GLenum target, GLenum pname, GLvo
    DISPATCH(GetBufferPointervARB, (target, pname, params), (F, "glGetBufferPointerv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1 void KEYWORD2 NAME(GetBufferSubData)(GLenum target, GLsizeiptrARB size, void * data)
+KEYWORD1 void KEYWORD2 NAME(GetBufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data)
 {
-   DISPATCH(GetBufferSubDataARB, (target, size, data), (F, "glGetBufferSubData(0x%x, %p, %p);\n", target, (const void *) size, (const void *) data));
+   DISPATCH(GetBufferSubDataARB, (target, offset, size, data), (F, "glGetBufferSubData(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
 }
 
 KEYWORD1 GLboolean KEYWORD2 NAME(IsBuffer)(GLuint buffer)
-- 
2.30.2