libX11 mesa git update 9 Feb 2011

1 files changed, 623 insertions, 585 deletions

diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 1c45c38b9..fa35c6ce5 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -1,585 +1,623 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#include "glheader.h"

-#include "context.h"

-#include "hash.h"

-#include "imports.h"

-#include "queryobj.h"

-#include "mfeatures.h"

-#include "mtypes.h"

-#include "main/dispatch.h"

-

-

-#if FEATURE_queryobj

-

-

-/**

- * Allocate a new query object.  This is a fallback routine called via

- * ctx->Driver.NewQueryObject().

- * \param ctx - rendering context

- * \param id - the new object's ID

- * \return pointer to new query_object object or NULL if out of memory.

- */

-static struct gl_query_object *

-_mesa_new_query_object(struct gl_context *ctx, GLuint id)

-{

-   struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);

-   (void) ctx;

-   if (q) {

-      q->Id = id;

-      q->Result = 0;

-      q->Active = GL_FALSE;

-      q->Ready = GL_TRUE;   /* correct, see spec */

-   }

-   return q;

-}

-

-

-/**

- * Begin a query.  Software driver fallback.

- * Called via ctx->Driver.BeginQuery().

- */

-static void

-_mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)

-{

-   /* no-op */

-}

-

-

-/**

- * End a query.  Software driver fallback.

- * Called via ctx->Driver.EndQuery().

- */

-static void

-_mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)

-{

-   q->Ready = GL_TRUE;

-}

-

-

-/**

- * Wait for query to complete.  Software driver fallback.

- * Called via ctx->Driver.WaitQuery().

- */

-static void

-_mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)

-{

-   /* For software drivers, _mesa_end_query() should have completed the query.

-    * For real hardware, implement a proper WaitQuery() driver function,

-    * which may require issuing a flush.

-    */

-   assert(q->Ready);

-}

-

-

-/**

- * Check if a query results are ready.  Software driver fallback.

- * Called via ctx->Driver.CheckQuery().

- */

-static void

-_mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)

-{

-   /* No-op for sw rendering.

-    * HW drivers may need to flush at this time.

-    */

-}

-

-

-/**

- * Delete a query object.  Called via ctx->Driver.DeleteQuery().

- * Not removed from hash table here.

- */

-static void

-_mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)

-{

-   free(q);

-}

-

-

-void

-_mesa_init_query_object_functions(struct dd_function_table *driver)

-{

-   driver->NewQueryObject = _mesa_new_query_object;

-   driver->DeleteQuery = _mesa_delete_query;

-   driver->BeginQuery = _mesa_begin_query;

-   driver->EndQuery = _mesa_end_query;

-   driver->WaitQuery = _mesa_wait_query;

-   driver->CheckQuery = _mesa_check_query;

-}

-

-

-/**

- * Return pointer to the query object binding point for the given target.

- * \return NULL if invalid target, else the address of binding point

- */

-static struct gl_query_object **

-get_query_binding_point(struct gl_context *ctx, GLenum target)

-{

-   switch (target) {

-   case GL_SAMPLES_PASSED_ARB:

-      if (ctx->Extensions.ARB_occlusion_query)

-         return &ctx->Query.CurrentOcclusionObject;

-      else

-         return NULL;

-   case GL_ANY_SAMPLES_PASSED:

-      if (ctx->Extensions.ARB_occlusion_query2)

-         return &ctx->Query.CurrentOcclusionObject;

-      else

-         return NULL;

-   case GL_TIME_ELAPSED_EXT:

-      if (ctx->Extensions.EXT_timer_query)

-         return &ctx->Query.CurrentTimerObject;

-      else

-         return NULL;

-#if FEATURE_EXT_transform_feedback

-   case GL_PRIMITIVES_GENERATED:

-      if (ctx->Extensions.EXT_transform_feedback)

-         return &ctx->Query.PrimitivesGenerated;

-      else

-         return NULL;

-   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

-      if (ctx->Extensions.EXT_transform_feedback)

-         return &ctx->Query.PrimitivesWritten;

-      else

-         return NULL;

-#endif

-   default:

-      return NULL;

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_GenQueriesARB(GLsizei n, GLuint *ids)

-{

-   GLuint first;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (n < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenQueriesARB(n < 0)");

-      return;

-   }

-

-   /* No query objects can be active at this time! */

-   if (ctx->Query.CurrentOcclusionObject ||

-       ctx->Query.CurrentTimerObject) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenQueriesARB");

-      return;

-   }

-

-   first = _mesa_HashFindFreeKeyBlock(ctx->Query.QueryObjects, n);

-   if (first) {

-      GLsizei i;

-      for (i = 0; i < n; i++) {

-         struct gl_query_object *q

-            = ctx->Driver.NewQueryObject(ctx, first + i);

-         if (!q) {

-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenQueriesARB");

-            return;

-         }

-         ids[i] = first + i;

-         _mesa_HashInsert(ctx->Query.QueryObjects, first + i, q);

-      }

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)

-{

-   GLint i;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (n < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteQueriesARB(n < 0)");

-      return;

-   }

-

-   /* No query objects can be active at this time! */

-   if (ctx->Query.CurrentOcclusionObject ||

-       ctx->Query.CurrentTimerObject) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteQueriesARB");

-      return;

-   }

-

-   for (i = 0; i < n; i++) {

-      if (ids[i] > 0) {

-         struct gl_query_object *q = _mesa_lookup_query_object(ctx, ids[i]);

-         if (q) {

-            ASSERT(!q->Active); /* should be caught earlier */

-            _mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);

-            ctx->Driver.DeleteQuery(ctx, q);

-         }

-      }

-   }

-}

-

-

-GLboolean GLAPIENTRY

-_mesa_IsQueryARB(GLuint id)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   if (id && _mesa_lookup_query_object(ctx, id))

-      return GL_TRUE;

-   else

-      return GL_FALSE;

-}

-

-

-static void GLAPIENTRY

-_mesa_BeginQueryARB(GLenum target, GLuint id)

-{

-   struct gl_query_object *q, **bindpt;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   FLUSH_VERTICES(ctx, _NEW_DEPTH);

-

-   bindpt = get_query_binding_point(ctx, target);

-   if (!bindpt) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");

-      return;

-   }

-

-   if (id == 0) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB(id==0)");

-      return;

-   }

-

-   q = _mesa_lookup_query_object(ctx, id);

-   if (!q) {

-      /* create new object */

-      q = ctx->Driver.NewQueryObject(ctx, id);

-      if (!q) {

-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQueryARB");

-         return;

-      }

-      _mesa_HashInsert(ctx->Query.QueryObjects, id, q);

-   }

-   else {

-      /* pre-existing object */

-      if (q->Active) {

-         _mesa_error(ctx, GL_INVALID_OPERATION,

-                     "glBeginQueryARB(query already active)");

-         return;

-      }

-   }

-

-   q->Target = target;

-   q->Active = GL_TRUE;

-   q->Result = 0;

-   q->Ready = GL_FALSE;

-

-   /* XXX should probably refcount query objects */

-   *bindpt = q;

-

-   ctx->Driver.BeginQuery(ctx, q);

-}

-

-

-static void GLAPIENTRY

-_mesa_EndQueryARB(GLenum target)

-{

-   struct gl_query_object *q, **bindpt;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   FLUSH_VERTICES(ctx, _NEW_DEPTH);

-

-   bindpt = get_query_binding_point(ctx, target);

-   if (!bindpt) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");

-      return;

-   }

-

-   /* XXX should probably refcount query objects */

-   q = *bindpt;

-   *bindpt = NULL;

-

-   if (!q || !q->Active) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glEndQueryARB(no matching glBeginQueryARB)");

-      return;

-   }

-

-   q->Active = GL_FALSE;

-   ctx->Driver.EndQuery(ctx, q);

-}

-

-

-void GLAPIENTRY

-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)

-{

-   struct gl_query_object *q, **bindpt;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   bindpt = get_query_binding_point(ctx, target);

-   if (!bindpt) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");

-      return;

-   }

-

-   q = *bindpt;

-

-   switch (pname) {

-      case GL_QUERY_COUNTER_BITS_ARB:

-         *params = 8 * sizeof(q->Result);

-         break;

-      case GL_CURRENT_QUERY_ARB:

-         *params = q ? q->Id : 0;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(pname)");

-         return;

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)

-{

-   struct gl_query_object *q = NULL;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (id)

-      q = _mesa_lookup_query_object(ctx, id);

-

-   if (!q || q->Active) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glGetQueryObjectivARB(id=%d is invalid or active)", id);

-      return;

-   }

-

-   switch (pname) {

-      case GL_QUERY_RESULT_ARB:

-         if (!q->Ready)

-            ctx->Driver.WaitQuery(ctx, q);

-         /* if result is too large for returned type, clamp to max value */

-         if (q->Target == GL_ANY_SAMPLES_PASSED) {

-            if (q->Result)

-               *params = GL_TRUE;

-            else

-               *params = GL_FALSE;

-         } else {

-            if (q->Result > 0x7fffffff) {

-               *params = 0x7fffffff;

-            }

-            else {

-               *params = (GLint)q->Result;

-            }

-         }

-         break;

-      case GL_QUERY_RESULT_AVAILABLE_ARB:

-	 if (!q->Ready)

-	    ctx->Driver.CheckQuery( ctx, q );

-         *params = q->Ready;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectivARB(pname)");

-         return;

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)

-{

-   struct gl_query_object *q = NULL;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (id)

-      q = _mesa_lookup_query_object(ctx, id);

-

-   if (!q || q->Active) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glGetQueryObjectuivARB(id=%d is invalid or active)", id);

-      return;

-   }

-

-   switch (pname) {

-      case GL_QUERY_RESULT_ARB:

-         if (!q->Ready)

-            ctx->Driver.WaitQuery(ctx, q);

-         /* if result is too large for returned type, clamp to max value */

-         if (q->Target == GL_ANY_SAMPLES_PASSED) {

-            if (q->Result)

-               *params = GL_TRUE;

-            else

-               *params = GL_FALSE;

-         } else {

-            if (q->Result > 0xffffffff) {

-               *params = 0xffffffff;

-            }

-            else {

-               *params = (GLuint)q->Result;

-            }

-         }

-         break;

-      case GL_QUERY_RESULT_AVAILABLE_ARB:

-	 if (!q->Ready)

-	    ctx->Driver.CheckQuery( ctx, q );

-         *params = q->Ready;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectuivARB(pname)");

-         return;

-   }

-}

-

-

-/**

- * New with GL_EXT_timer_query

- */

-static void GLAPIENTRY

-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)

-{

-   struct gl_query_object *q = NULL;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (id)

-      q = _mesa_lookup_query_object(ctx, id);

-

-   if (!q || q->Active) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glGetQueryObjectui64vARB(id=%d is invalid or active)", id);

-      return;

-   }

-

-   switch (pname) {

-      case GL_QUERY_RESULT_ARB:

-         if (!q->Ready)

-            ctx->Driver.WaitQuery(ctx, q);

-         *params = q->Result;

-         break;

-      case GL_QUERY_RESULT_AVAILABLE_ARB:

-	 if (!q->Ready)

-	    ctx->Driver.CheckQuery( ctx, q );

-         *params = q->Ready;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjecti64vARB(pname)");

-         return;

-   }

-}

-

-

-/**

- * New with GL_EXT_timer_query

- */

-static void GLAPIENTRY

-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)

-{

-   struct gl_query_object *q = NULL;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (id)

-      q = _mesa_lookup_query_object(ctx, id);

-

-   if (!q || q->Active) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glGetQueryObjectuui64vARB(id=%d is invalid or active)", id);

-      return;

-   }

-

-   switch (pname) {

-      case GL_QUERY_RESULT_ARB:

-         if (!q->Ready)

-            ctx->Driver.WaitQuery(ctx, q);

-         *params = q->Result;

-         break;

-      case GL_QUERY_RESULT_AVAILABLE_ARB:

-	 if (!q->Ready)

-	    ctx->Driver.CheckQuery( ctx, q );

-         *params = q->Ready;

-         break;

-      default:

-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectui64vARB(pname)");

-         return;

-   }

-}

-

-

-void

-_mesa_init_queryobj_dispatch(struct _glapi_table *disp)

-{

-   SET_GenQueriesARB(disp, _mesa_GenQueriesARB);

-   SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);

-   SET_IsQueryARB(disp, _mesa_IsQueryARB);

-   SET_BeginQueryARB(disp, _mesa_BeginQueryARB);

-   SET_EndQueryARB(disp, _mesa_EndQueryARB);

-   SET_GetQueryivARB(disp, _mesa_GetQueryivARB);

-   SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);

-   SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);

-

-   SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);

-   SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);

-}

-

-

-#endif /* FEATURE_queryobj */

-

-

-/**

- * Allocate/init the context state related to query objects.

- */

-void

-_mesa_init_queryobj(struct gl_context *ctx)

-{

-   ctx->Query.QueryObjects = _mesa_NewHashTable();

-   ctx->Query.CurrentOcclusionObject = NULL;

-}

-

-

-/**

- * Callback for deleting a query object.  Called by _mesa_HashDeleteAll().

- */

-static void

-delete_queryobj_cb(GLuint id, void *data, void *userData)

-{

-   struct gl_query_object *q= (struct gl_query_object *) data;

-   struct gl_context *ctx = (struct gl_context *)userData;

-   ctx->Driver.DeleteQuery(ctx, q);

-}

-

-

-/**

- * Free the context state related to query objects.

- */

-void

-_mesa_free_queryobj_data(struct gl_context *ctx)

-{

-   _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);

-   _mesa_DeleteHashTable(ctx->Query.QueryObjects);

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "glheader.h"
+#include "context.h"
+#include "enums.h"
+#include "hash.h"
+#include "imports.h"
+#include "queryobj.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+#include "main/dispatch.h"
+
+
+#if FEATURE_queryobj
+
+
+/**
+ * Allocate a new query object.  This is a fallback routine called via
+ * ctx->Driver.NewQueryObject().
+ * \param ctx - rendering context
+ * \param id - the new object's ID
+ * \return pointer to new query_object object or NULL if out of memory.
+ */
+static struct gl_query_object *
+_mesa_new_query_object(struct gl_context *ctx, GLuint id)
+{
+   struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
+   (void) ctx;
+   if (q) {
+      q->Id = id;
+      q->Result = 0;
+      q->Active = GL_FALSE;
+      q->Ready = GL_TRUE;   /* correct, see spec */
+   }
+   return q;
+}
+
+
+/**
+ * Begin a query.  Software driver fallback.
+ * Called via ctx->Driver.BeginQuery().
+ */
+static void
+_mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
+{
+   /* no-op */
+}
+
+
+/**
+ * End a query.  Software driver fallback.
+ * Called via ctx->Driver.EndQuery().
+ */
+static void
+_mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
+{
+   q->Ready = GL_TRUE;
+}
+
+
+/**
+ * Wait for query to complete.  Software driver fallback.
+ * Called via ctx->Driver.WaitQuery().
+ */
+static void
+_mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)
+{
+   /* For software drivers, _mesa_end_query() should have completed the query.
+    * For real hardware, implement a proper WaitQuery() driver function,
+    * which may require issuing a flush.
+    */
+   assert(q->Ready);
+}
+
+
+/**
+ * Check if a query results are ready.  Software driver fallback.
+ * Called via ctx->Driver.CheckQuery().
+ */
+static void
+_mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)
+{
+   /* No-op for sw rendering.
+    * HW drivers may need to flush at this time.
+    */
+}
+
+
+/**
+ * Delete a query object.  Called via ctx->Driver.DeleteQuery().
+ * Not removed from hash table here.
+ */
+static void
+_mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)
+{
+   free(q);
+}
+
+
+void
+_mesa_init_query_object_functions(struct dd_function_table *driver)
+{
+   driver->NewQueryObject = _mesa_new_query_object;
+   driver->DeleteQuery = _mesa_delete_query;
+   driver->BeginQuery = _mesa_begin_query;
+   driver->EndQuery = _mesa_end_query;
+   driver->WaitQuery = _mesa_wait_query;
+   driver->CheckQuery = _mesa_check_query;
+}
+
+
+/**
+ * Return pointer to the query object binding point for the given target.
+ * \return NULL if invalid target, else the address of binding point
+ */
+static struct gl_query_object **
+get_query_binding_point(struct gl_context *ctx, GLenum target)
+{
+   switch (target) {
+   case GL_SAMPLES_PASSED_ARB:
+      if (ctx->Extensions.ARB_occlusion_query)
+         return &ctx->Query.CurrentOcclusionObject;
+      else
+         return NULL;
+   case GL_ANY_SAMPLES_PASSED:
+      if (ctx->Extensions.ARB_occlusion_query2)
+         return &ctx->Query.CurrentOcclusionObject;
+      else
+         return NULL;
+   case GL_TIME_ELAPSED_EXT:
+      if (ctx->Extensions.EXT_timer_query)
+         return &ctx->Query.CurrentTimerObject;
+      else
+         return NULL;
+#if FEATURE_EXT_transform_feedback
+   case GL_PRIMITIVES_GENERATED:
+      if (ctx->Extensions.EXT_transform_feedback)
+         return &ctx->Query.PrimitivesGenerated;
+      else
+         return NULL;
+   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+      if (ctx->Extensions.EXT_transform_feedback)
+         return &ctx->Query.PrimitivesWritten;
+      else
+         return NULL;
+#endif
+   default:
+      return NULL;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
+{
+   GLuint first;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGenQueries(%d)\n", n);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenQueriesARB(n < 0)");
+      return;
+   }
+
+   /* No query objects can be active at this time! */
+   if (ctx->Query.CurrentOcclusionObject ||
+       ctx->Query.CurrentTimerObject) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenQueriesARB");
+      return;
+   }
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Query.QueryObjects, n);
+   if (first) {
+      GLsizei i;
+      for (i = 0; i < n; i++) {
+         struct gl_query_object *q
+            = ctx->Driver.NewQueryObject(ctx, first + i);
+         if (!q) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenQueriesARB");
+            return;
+         }
+         ids[i] = first + i;
+         _mesa_HashInsert(ctx->Query.QueryObjects, first + i, q);
+      }
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
+{
+   GLint i;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glDeleeteQueries(%d)\n", n);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteQueriesARB(n < 0)");
+      return;
+   }
+
+   /* No query objects can be active at this time! */
+   if (ctx->Query.CurrentOcclusionObject ||
+       ctx->Query.CurrentTimerObject) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteQueriesARB");
+      return;
+   }
+
+   for (i = 0; i < n; i++) {
+      if (ids[i] > 0) {
+         struct gl_query_object *q = _mesa_lookup_query_object(ctx, ids[i]);
+         if (q) {
+            ASSERT(!q->Active); /* should be caught earlier */
+            _mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);
+            ctx->Driver.DeleteQuery(ctx, q);
+         }
+      }
+   }
+}
+
+
+GLboolean GLAPIENTRY
+_mesa_IsQueryARB(GLuint id)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glIsQuery(%u)\n", id);
+
+   if (id && _mesa_lookup_query_object(ctx, id))
+      return GL_TRUE;
+   else
+      return GL_FALSE;
+}
+
+
+static void GLAPIENTRY
+_mesa_BeginQueryARB(GLenum target, GLuint id)
+{
+   struct gl_query_object *q, **bindpt;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glBeginQuery(%s, %u)\n",
+                  _mesa_lookup_enum_by_nr(target), id);
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+
+   bindpt = get_query_binding_point(ctx, target);
+   if (!bindpt) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
+      return;
+   }
+
+   if (id == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB(id==0)");
+      return;
+   }
+
+   q = _mesa_lookup_query_object(ctx, id);
+   if (!q) {
+      /* create new object */
+      q = ctx->Driver.NewQueryObject(ctx, id);
+      if (!q) {
+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQueryARB");
+         return;
+      }
+      _mesa_HashInsert(ctx->Query.QueryObjects, id, q);
+   }
+   else {
+      /* pre-existing object */
+      if (q->Active) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glBeginQueryARB(query already active)");
+         return;
+      }
+   }
+
+   q->Target = target;
+   q->Active = GL_TRUE;
+   q->Result = 0;
+   q->Ready = GL_FALSE;
+
+   /* XXX should probably refcount query objects */
+   *bindpt = q;
+
+   ctx->Driver.BeginQuery(ctx, q);
+}
+
+
+static void GLAPIENTRY
+_mesa_EndQueryARB(GLenum target)
+{
+   struct gl_query_object *q, **bindpt;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glEndQuery(%s)\n", _mesa_lookup_enum_by_nr(target));
+
+   FLUSH_VERTICES(ctx, _NEW_DEPTH);
+
+   bindpt = get_query_binding_point(ctx, target);
+   if (!bindpt) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
+      return;
+   }
+
+   /* XXX should probably refcount query objects */
+   q = *bindpt;
+   *bindpt = NULL;
+
+   if (!q || !q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glEndQueryARB(no matching glBeginQueryARB)");
+      return;
+   }
+
+   q->Active = GL_FALSE;
+   ctx->Driver.EndQuery(ctx, q);
+}
+
+
+void GLAPIENTRY
+_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
+{
+   struct gl_query_object *q, **bindpt;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetQueryiv(%s, %s)\n",
+                  _mesa_lookup_enum_by_nr(target),
+                  _mesa_lookup_enum_by_nr(pname));
+
+   bindpt = get_query_binding_point(ctx, target);
+   if (!bindpt) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");
+      return;
+   }
+
+   q = *bindpt;
+
+   switch (pname) {
+      case GL_QUERY_COUNTER_BITS_ARB:
+         *params = 8 * sizeof(q->Result);
+         break;
+      case GL_CURRENT_QUERY_ARB:
+         *params = q ? q->Id : 0;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
+{
+   struct gl_query_object *q = NULL;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetQueryObjectiv(%u, %s)\n", id,
+                  _mesa_lookup_enum_by_nr(pname));
+
+   if (id)
+      q = _mesa_lookup_query_object(ctx, id);
+
+   if (!q || q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetQueryObjectivARB(id=%d is invalid or active)", id);
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_RESULT_ARB:
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
+         /* if result is too large for returned type, clamp to max value */
+         if (q->Target == GL_ANY_SAMPLES_PASSED) {
+            if (q->Result)
+               *params = GL_TRUE;
+            else
+               *params = GL_FALSE;
+         } else {
+            if (q->Result > 0x7fffffff) {
+               *params = 0x7fffffff;
+            }
+            else {
+               *params = (GLint)q->Result;
+            }
+         }
+         break;
+      case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
+         *params = q->Ready;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectivARB(pname)");
+         return;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
+{
+   struct gl_query_object *q = NULL;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetQueryObjectuiv(%u, %s)\n", id,
+                  _mesa_lookup_enum_by_nr(pname));
+
+   if (id)
+      q = _mesa_lookup_query_object(ctx, id);
+
+   if (!q || q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetQueryObjectuivARB(id=%d is invalid or active)", id);
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_RESULT_ARB:
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
+         /* if result is too large for returned type, clamp to max value */
+         if (q->Target == GL_ANY_SAMPLES_PASSED) {
+            if (q->Result)
+               *params = GL_TRUE;
+            else
+               *params = GL_FALSE;
+         } else {
+            if (q->Result > 0xffffffff) {
+               *params = 0xffffffff;
+            }
+            else {
+               *params = (GLuint)q->Result;
+            }
+         }
+         break;
+      case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
+         *params = q->Ready;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectuivARB(pname)");
+         return;
+   }
+}
+
+
+/**
+ * New with GL_EXT_timer_query
+ */
+static void GLAPIENTRY
+_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
+{
+   struct gl_query_object *q = NULL;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetQueryObjecti64v(%u, %s)\n", id,
+                  _mesa_lookup_enum_by_nr(pname));
+
+   if (id)
+      q = _mesa_lookup_query_object(ctx, id);
+
+   if (!q || q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetQueryObjectui64vARB(id=%d is invalid or active)", id);
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_RESULT_ARB:
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
+         *params = q->Result;
+         break;
+      case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
+         *params = q->Ready;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjecti64vARB(pname)");
+         return;
+   }
+}
+
+
+/**
+ * New with GL_EXT_timer_query
+ */
+static void GLAPIENTRY
+_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
+{
+   struct gl_query_object *q = NULL;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetQueryObjectui64v(%u, %s)\n", id,
+                  _mesa_lookup_enum_by_nr(pname));
+
+   if (id)
+      q = _mesa_lookup_query_object(ctx, id);
+
+   if (!q || q->Active) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetQueryObjectuui64vARB(id=%d is invalid or active)", id);
+      return;
+   }
+
+   switch (pname) {
+      case GL_QUERY_RESULT_ARB:
+         if (!q->Ready)
+            ctx->Driver.WaitQuery(ctx, q);
+         *params = q->Result;
+         break;
+      case GL_QUERY_RESULT_AVAILABLE_ARB:
+	 if (!q->Ready)
+	    ctx->Driver.CheckQuery( ctx, q );
+         *params = q->Ready;
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectui64vARB(pname)");
+         return;
+   }
+}
+
+
+void
+_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
+{
+   SET_GenQueriesARB(disp, _mesa_GenQueriesARB);
+   SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);
+   SET_IsQueryARB(disp, _mesa_IsQueryARB);
+   SET_BeginQueryARB(disp, _mesa_BeginQueryARB);
+   SET_EndQueryARB(disp, _mesa_EndQueryARB);
+   SET_GetQueryivARB(disp, _mesa_GetQueryivARB);
+   SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
+   SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
+
+   SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
+   SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
+}
+
+
+#endif /* FEATURE_queryobj */
+
+
+/**
+ * Allocate/init the context state related to query objects.
+ */
+void
+_mesa_init_queryobj(struct gl_context *ctx)
+{
+   ctx->Query.QueryObjects = _mesa_NewHashTable();
+   ctx->Query.CurrentOcclusionObject = NULL;
+}
+
+
+/**
+ * Callback for deleting a query object.  Called by _mesa_HashDeleteAll().
+ */
+static void
+delete_queryobj_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_query_object *q= (struct gl_query_object *) data;
+   struct gl_context *ctx = (struct gl_context *)userData;
+   ctx->Driver.DeleteQuery(ctx, q);
+}
+
+
+/**
+ * Free the context state related to query objects.
+ */
+void
+_mesa_free_queryobj_data(struct gl_context *ctx)
+{
+   _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);
+   _mesa_DeleteHashTable(ctx->Query.QueryObjects);
+}