mesa: Pass GL context to _mesa_create_save_table

[mesa.git] / src / mesa / main / queryobj.h

diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index ee775ef959e91be33895b6201a4499fc132ad4ea..0f662fb57b42bf4d66857535b9fa5a9f81b1520d 100644 (file)
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -23,49 +23,34 @@
  */
 
 
-#ifndef OCCLUDE_H
-#define OCCLUDE_H
+#ifndef QUERYOBJ_H
+#define QUERYOBJ_H
 
 
-extern void
-_mesa_init_query(GLcontext *ctx);
-
-extern void
-_mesa_free_query_data(GLcontext *ctx);
-
-extern void
-_mesa_init_query_object_functions(struct dd_function_table *driver);
-
-
-extern void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+#include "main/hash.h"
 
-extern void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
 
-extern GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id);
+static inline struct gl_query_object *
+_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
+{
+   return (struct gl_query_object *)
+      _mesa_HashLookup(ctx->Query.QueryObjects, id);
+}
 
-extern void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id);
 
-extern void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target);
-
-extern void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
+extern void
+_mesa_init_query_object_functions(struct dd_function_table *driver);
 
-extern void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
+extern void
+_mesa_init_queryobj_dispatch(struct _glapi_table *disp);
 
-extern void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params);
+extern void
+_mesa_init_queryobj(struct gl_context *ctx);
 
-extern void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params);
+extern void
+_mesa_free_queryobj_data(struct gl_context *ctx);
 
 
-#endif /* OCCLUDE_H */
+#endif /* QUERYOBJ_H */