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 ba8b5dd0029e8ba3231ff98a1da3ad11d3338c6a..0f662fb57b42bf4d66857535b9fa5a9f81b1520d 100644 (file)
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -27,76 +27,30 @@
 #define QUERYOBJ_H
 
 
+#include "main/mfeatures.h"
 #include "main/mtypes.h"
 #include "main/hash.h"
 
 
-#if FEATURE_queryobj
-
-#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl)      \
-   do {                                                  \
-      (driver)->NewQueryObject = impl ## NewQueryObject; \
-      (driver)->DeleteQuery    = impl ## DeleteQuery;    \
-      (driver)->BeginQuery     = impl ## BeginQuery;     \
-      (driver)->EndQuery       = impl ## EndQuery;       \
-      (driver)->WaitQuery      = impl ## WaitQuery;      \
-      (driver)->CheckQuery     = impl ## CheckQuery;     \
-   } while (0)
-
-
-static INLINE struct gl_query_object *
-_mesa_lookup_query_object(GLcontext *ctx, 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_GenQueriesARB(GLsizei n, GLuint *ids);
-
-extern void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id);
-
-extern void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
-
 extern void
 _mesa_init_query_object_functions(struct dd_function_table *driver);
 
 extern void
 _mesa_init_queryobj_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_queryobj */
-
-#define _MESA_INIT_QUERYOBJ_FUNCTIONS(driver, impl) do { } while (0)
-
-static INLINE void
-_mesa_init_query_object_functions(struct dd_function_table *driver)
-{
-}
-
-static INLINE void
-_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_queryobj */
-
 extern void
-_mesa_init_queryobj(GLcontext *ctx);
+_mesa_init_queryobj(struct gl_context *ctx);
 
 extern void
-_mesa_free_queryobj_data(GLcontext *ctx);
+_mesa_free_queryobj_data(struct gl_context *ctx);
 
 
 #endif /* QUERYOBJ_H */