projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glapi: Correctly generate static disatches for X86.
[mesa.git]
/
src
/
mesa
/
main
/
queryobj.c
diff --git
a/src/mesa/main/queryobj.c
b/src/mesa/main/queryobj.c
index f6eb4ee7e1b11ea547ee5def8bd46091a2ad93d8..e14511a3883c12a9e9bab5856b9d055eab4313eb 100644
(file)
--- a/
src/mesa/main/queryobj.c
+++ b/
src/mesa/main/queryobj.c
@@
-29,7
+29,7
@@
#include "imports.h"
#include "queryobj.h"
#include "mtypes.h"
#include "imports.h"
#include "queryobj.h"
#include "mtypes.h"
-#include "
glapi
/dispatch.h"
+#include "
main
/dispatch.h"
#if FEATURE_queryobj
#if FEATURE_queryobj
@@
-114,19
+114,10
@@
_mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
static void
_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
{
static void
_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
{
-
_mesa_
free(q);
+ free(q);
}
}
-static struct gl_query_object *
-lookup_query_object(GLcontext *ctx, GLuint id)
-{
- return (struct gl_query_object *)
- _mesa_HashLookup(ctx->Query.QueryObjects, id);
-}
-
-
-
void
_mesa_init_query_object_functions(struct dd_function_table *driver)
{
void
_mesa_init_query_object_functions(struct dd_function_table *driver)
{
@@
-196,7
+187,7
@@
_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
for (i = 0; i < n; i++) {
if (ids[i] > 0) {
for (i = 0; i < n; i++) {
if (ids[i] > 0) {
- struct gl_query_object *q = lookup_query_object(ctx, ids[i]);
+ 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]);
if (q) {
ASSERT(!q->Active); /* should be caught earlier */
_mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);
@@
-213,7
+204,7
@@
_mesa_IsQueryARB(GLuint id)
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
- if (id && lookup_query_object(ctx, id))
+ if (id &&
_mesa_
lookup_query_object(ctx, id))
return GL_TRUE;
else
return GL_FALSE;
return GL_TRUE;
else
return GL_FALSE;
@@
-260,7
+251,7
@@
_mesa_BeginQueryARB(GLenum target, GLuint id)
return;
}
return;
}
- q = lookup_query_object(ctx, id);
+ q =
_mesa_
lookup_query_object(ctx, id);
if (!q) {
/* create new object */
q = ctx->Driver.NewQueryObject(ctx, id);
if (!q) {
/* create new object */
q = ctx->Driver.NewQueryObject(ctx, id);
@@
-386,7
+377,7
@@
_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
- q = lookup_query_object(ctx, id);
+ q =
_mesa_
lookup_query_object(ctx, id);
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
@@
-426,7
+417,7
@@
_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
- q = lookup_query_object(ctx, id);
+ q =
_mesa_
lookup_query_object(ctx, id);
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
@@
-469,7
+460,7
@@
_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
- q = lookup_query_object(ctx, id);
+ q =
_mesa_
lookup_query_object(ctx, id);
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
@@
-506,7
+497,7
@@
_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (id)
- q = lookup_query_object(ctx, id);
+ q =
_mesa_
lookup_query_object(ctx, id);
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
if (!q || q->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,