Implemented GL_ARB_occlusion_query (not 100% finalized).

5 files changed, 134 insertions, 1 deletions

diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index 5075eaf0359..eba696346c5 100644
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.17 2003/05/10 04:35:36 brianp Exp $
+# $Id: APIspec,v 1.18 2003/06/13 02:37:28 brianp Exp $
 
 # This file describes all the OpenGL functions.
 # We use a number of Python scripts to parse this file and
@@ -8346,6 +8346,67 @@ offset		699
 
 
 
+# GL_ARB_occlusion_query
+
+name		GenQueriesARB
+return		void
+param		n		GLsizei
+param		ids		GLuint *
+category	GL_ARB_occlusion_query
+offset		700
+
+name		DeleteQueriesARB
+return		void
+param		n		GLsizei
+param		ids		const GLuint *
+category	GL_ARB_occlusion_query
+offset		701
+
+name		IsQueryARB
+return		GLboolean
+param		id		GLuint
+category	GL_ARB_occlusion_query
+offset		702
+
+name		BeginQueryARB
+return		void
+param		target		GLenum
+param		id		GLuint
+category	GL_ARB_occlusion_query
+offset		703
+
+name		EndQueryARB
+return		void
+param		target		GLenum
+category	GL_ARB_occlusion_query
+offset		704
+
+name		GetQueryivARB
+return		void
+param		target		GLenum
+param		pname		GLenum
+param		params		GLint *
+category	GL_ARB_occlusion_query
+offset		705
+
+name		GetQueryObjectivARB
+return		void
+param		id		GLuint
+param		pname		GLenum
+param		params		GLint *
+category	GL_ARB_occlusion_query
+offset		706
+
+name		GetQueryObjectuivARB
+return		void
+param		id		GLuint
+param		pname		GLenum
+param		params		GLuint *
+category	GL_ARB_occlusion_query
+offset		707
+
+
+
 # end of file sentinal
 
 name		dummy
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index ccc05daee18..0dc699f5c22 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -702,5 +702,13 @@
 #define _gloffset_MapBufferARB 697
 #define _gloffset_UnmapBufferARB 698
 #define _gloffset_DepthBoundsEXT 699
+#define _gloffset_GenQueriesARB 700
+#define _gloffset_DeleteQueriesARB 701
+#define _gloffset_IsQueryARB 702
+#define _gloffset_BeginQueryARB 703
+#define _gloffset_EndQueryARB 704
+#define _gloffset_GetQueryivARB 705
+#define _gloffset_GetQueryObjectivARB 706
+#define _gloffset_GetQueryObjectuivARB 707
 
 #endif
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 2bb31e2e0db..42f8408480a 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -706,6 +706,14 @@ struct _glapi_table
    void * (*MapBufferARB)(GLenum target, GLenum access); /* 697 */
    GLboolean (*UnmapBufferARB)(GLenum target); /* 698 */
    void (*DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 699 */
+   void (*GenQueriesARB)(GLsizei n, GLuint * ids); /* 700 */
+   void (*DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 701 */
+   GLboolean (*IsQueryARB)(GLuint id); /* 702 */
+   void (*BeginQueryARB)(GLenum target, GLuint id); /* 703 */
+   void (*EndQueryARB)(GLenum target); /* 704 */
+   void (*GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 705 */
+   void (*GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 706 */
+   void (*GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 707 */
 };
 
 #endif
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 707333043dc..4d373933d4a 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4624,6 +4624,46 @@ KEYWORD1 void KEYWORD2 NAME(DepthBoundsEXT)(GLclampd zmin, GLclampd zmax)
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GenQueriesARB)(GLsizei n, GLuint * ids)
+{
+   DISPATCH(GenQueriesARB, (n, ids), (F, "glGenQueriesARB(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteQueriesARB)(GLsizei n, const GLuint * ids)
+{
+   DISPATCH(DeleteQueriesARB, (n, ids), (F, "glDeleteQueriesARB(%d, %p);\n", n, (const void *) ids));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsQueryARB)(GLuint id)
+{
+   RETURN_DISPATCH(IsQueryARB, (id), (F, "glIsQueryARB(%d);\n", id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BeginQueryARB)(GLenum target, GLuint id)
+{
+   DISPATCH(BeginQueryARB, (target, id), (F, "glBeginQueryARB(0x%x, %d);\n", target, id));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EndQueryARB)(GLenum target)
+{
+   DISPATCH(EndQueryARB, (target), (F, "glEndQueryARB(0x%x);\n", target));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryivARB)(GLenum target, GLenum pname, GLint * params)
+{
+   DISPATCH(GetQueryivARB, (target, pname, params), (F, "glGetQueryivARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params)
+{
+   DISPATCH(GetQueryObjectivARB, (id, pname, params), (F, "glGetQueryObjectivARB(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params)
+{
+   DISPATCH(GetQueryObjectuivARB, (id, pname, params), (F, "glGetQueryObjectuivARB(%d, 0x%x, %p);\n", id, pname, (const void *) params));
+}
+
 
 
 /*
@@ -5337,6 +5377,14 @@ void *DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(MapBufferARB),
    TABLE_ENTRY(UnmapBufferARB),
    TABLE_ENTRY(DepthBoundsEXT),
+   TABLE_ENTRY(GenQueriesARB),
+   TABLE_ENTRY(DeleteQueriesARB),
+   TABLE_ENTRY(IsQueryARB),
+   TABLE_ENTRY(BeginQueryARB),
+   TABLE_ENTRY(EndQueryARB),
+   TABLE_ENTRY(GetQueryivARB),
+   TABLE_ENTRY(GetQueryObjectivARB),
+   TABLE_ENTRY(GetQueryObjectuivARB),
    /* 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 ea18fdfc69f..70bac5623b5 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -890,5 +890,13 @@ static struct name_address_offset static_functions[] = {
    { "glMapBufferARB", (GLvoid *) glMapBufferARB, _gloffset_MapBufferARB },
    { "glUnmapBufferARB", (GLvoid *) glUnmapBufferARB, _gloffset_UnmapBufferARB },
    { "glDepthBoundsEXT", (GLvoid *) glDepthBoundsEXT, _gloffset_DepthBoundsEXT },
+   { "glGenQueriesARB", (GLvoid *) glGenQueriesARB, _gloffset_GenQueriesARB },
+   { "glDeleteQueriesARB", (GLvoid *) glDeleteQueriesARB, _gloffset_DeleteQueriesARB },
+   { "glIsQueryARB", (GLvoid *) glIsQueryARB, _gloffset_IsQueryARB },
+   { "glBeginQueryARB", (GLvoid *) glBeginQueryARB, _gloffset_BeginQueryARB },
+   { "glEndQueryARB", (GLvoid *) glEndQueryARB, _gloffset_EndQueryARB },
+   { "glGetQueryivARB", (GLvoid *) glGetQueryivARB, _gloffset_GetQueryivARB },
+   { "glGetQueryObjectivARB", (GLvoid *) glGetQueryObjectivARB, _gloffset_GetQueryObjectivARB },
+   { "glGetQueryObjectuivARB", (GLvoid *) glGetQueryObjectuivARB, _gloffset_GetQueryObjectuivARB },
    { NULL, NULL }  /* end of list marker */
 };