diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mesa/main/queryobj.h | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mesa/main/queryobj.h')
| -rw-r--r-- | mesalib/src/mesa/main/queryobj.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index f9e916cda..78cbfc294 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -54,33 +54,33 @@ extern void _mesa_free_queryobj_data(struct gl_context *ctx); void GLAPIENTRY -_mesa_GenQueriesARB(GLsizei n, GLuint *ids); +_mesa_GenQueries(GLsizei n, GLuint *ids); void GLAPIENTRY -_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids); +_mesa_DeleteQueries(GLsizei n, const GLuint *ids); GLboolean GLAPIENTRY -_mesa_IsQueryARB(GLuint id); +_mesa_IsQuery(GLuint id); void GLAPIENTRY _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id); void GLAPIENTRY _mesa_EndQueryIndexed(GLenum target, GLuint index); void GLAPIENTRY -_mesa_BeginQueryARB(GLenum target, GLuint id); +_mesa_BeginQuery(GLenum target, GLuint id); void GLAPIENTRY -_mesa_EndQueryARB(GLenum target); +_mesa_EndQuery(GLenum target); void GLAPIENTRY _mesa_QueryCounter(GLuint id, GLenum target); void GLAPIENTRY _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params); +_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params); +_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params); +_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params); void GLAPIENTRY -_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params); +_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params); void GLAPIENTRY -_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params); +_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params); #endif /* QUERYOBJ_H */ |