fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: check return value of begin/end_query

Browse source 
They can only indicate out of memory conditions, since the other error
conditions are caught earlier.

v2: fix error message in EndQuery

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Nicolai Hähnle 2016-04-20 09:37:06 -05:00
parent 32214e0c68
commit 71f33a6f69
1 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/mesa/state_tracker/st_cb_queryobj.c
View file

@ -61,13 +61,9 @@ st_NewQueryObject(struct gl_context *ctx, GLuint id)
}
static void
st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q)
free_queries(struct pipe_context *pipe, struct st_query_object *stq)
{
struct pipe_context *pipe = st_context(ctx)->pipe;
struct st_query_object *stq = st_query_object(q);
if (stq->pq) {
pipe->destroy_query(pipe, stq->pq);
stq->pq = NULL;
@ -77,6 +73,16 @@ st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q)
pipe->destroy_query(pipe, stq->pq_begin);
stq->pq_begin = NULL;
}
}
static void
st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q)
{
struct pipe_context *pipe = st_context(ctx)->pipe;
struct st_query_object *stq = st_query_object(q);
free_queries(pipe, stq);
free(stq);
}
@ -89,6 +95,7 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
struct pipe_context *pipe = st->pipe;
struct st_query_object *stq = st_query_object(q);
unsigned type;
bool ret = false;
st_flush_bitmap_cache(st_context(ctx));
@ -133,14 +140,7 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
if (stq->type != type) {
/* free old query of different type */
if (stq->pq) {
pipe->destroy_query(pipe, stq->pq);
stq->pq = NULL;
}
if (stq->pq_begin) {
pipe->destroy_query(pipe, stq->pq_begin);
stq->pq_begin = NULL;
}
free_queries(pipe, stq);
stq->type = PIPE_QUERY_TYPES; /* an invalid value */
}
@ -151,20 +151,25 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
stq->pq_begin = pipe->create_query(pipe, type, 0);
stq->type = type;
}
pipe->end_query(pipe, stq->pq_begin);
if (stq->pq_begin)
ret = pipe->end_query(pipe, stq->pq_begin);
} else {
if (!stq->pq) {
stq->pq = pipe->create_query(pipe, type, q->Stream);
stq->type = type;
}
if (stq->pq) {
pipe->begin_query(pipe, stq->pq);
}
else {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery");
return;
}
if (stq->pq)
ret = pipe->begin_query(pipe, stq->pq);
}
if (!ret) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery");
free_queries(pipe, stq);
q->Active = GL_FALSE;
return;
}
assert(stq->type == type);
}
@ -174,6 +179,7 @@ st_EndQuery(struct gl_context *ctx, struct gl_query_object *q)
{
struct pipe_context *pipe = st_context(ctx)->pipe;
struct st_query_object *stq = st_query_object(q);
bool ret = false;
st_flush_bitmap_cache(st_context(ctx));
@ -185,7 +191,12 @@ st_EndQuery(struct gl_context *ctx, struct gl_query_object *q)
}
if (stq->pq)
pipe->end_query(pipe, stq->pq);
ret = pipe->end_query(pipe, stq->pq);
if (!ret) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glEndQuery");
return;
}
}