aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/queryobj.c
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/mesa/main/queryobj.c')
-rw-r--r--mesalib/src/mesa/main/queryobj.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 5bb3e698b..55d3681c1 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -169,7 +169,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target)
void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
+_mesa_GenQueries(GLsizei n, GLuint *ids)
{
GLuint first;
GET_CURRENT_CONTEXT(ctx);
@@ -208,7 +208,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
+_mesa_DeleteQueries(GLsizei n, const GLuint *ids)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@@ -244,7 +244,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id)
+_mesa_IsQuery(GLuint id)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -403,13 +403,13 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index)
}
void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id)
+_mesa_BeginQuery(GLenum target, GLuint id)
{
_mesa_BeginQueryIndexed(target, 0, id);
}
void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target)
+_mesa_EndQuery(GLenum target)
{
_mesa_EndQueryIndexed(target, 0);
}
@@ -547,13 +547,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
}
void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
+_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params)
{
_mesa_GetQueryIndexediv(target, 0, pname, params);
}
void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
+_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -604,7 +604,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
+_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -658,7 +658,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
* New with GL_EXT_timer_query
*/
void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
+_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -699,7 +699,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
* New with GL_EXT_timer_query
*/
void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
+_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -740,20 +740,20 @@ void
_mesa_init_queryobj_dispatch(const struct gl_context *ctx,
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_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
+ SET_GenQueries(disp, _mesa_GenQueries);
+ SET_DeleteQueries(disp, _mesa_DeleteQueries);
+ SET_IsQuery(disp, _mesa_IsQuery);
+ SET_BeginQuery(disp, _mesa_BeginQuery);
+ SET_EndQuery(disp, _mesa_EndQuery);
+ SET_GetQueryiv(disp, _mesa_GetQueryiv);
+ SET_GetQueryObjectuiv(disp, _mesa_GetQueryObjectuiv);
if (_mesa_is_desktop_gl(ctx)) {
- SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
+ SET_GetQueryObjectiv(disp, _mesa_GetQueryObjectiv);
SET_QueryCounter(disp, _mesa_QueryCounter);
- SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
- SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
+ SET_GetQueryObjecti64v(disp, _mesa_GetQueryObjecti64v);
+ SET_GetQueryObjectui64v(disp, _mesa_GetQueryObjectui64v);
SET_BeginQueryIndexed(disp, _mesa_BeginQueryIndexed);
SET_EndQueryIndexed(disp, _mesa_EndQueryIndexed);