diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2009-06-12 12:31:04 +0100 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-06-12 12:31:04 +0100 |
commit | 3fff84a999e7d564c16846340bb2b7dac75fb8b3 (patch) | |
tree | c3e8d578a8bc8094d4138ce6bb5d8db8d9ea8610 /src/mesa/main/queryobj.c | |
parent | 279143c6e808b37c333321b696d80df77f709a04 (diff) | |
parent | c6de08fff483911953692693c501bc200c235dce (diff) |
Merge branch 'mesa_7_5_branch'
Diffstat (limited to 'src/mesa/main/queryobj.c')
-rw-r--r-- | src/mesa/main/queryobj.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 554e0b0d18..c25b31af02 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -83,13 +83,27 @@ void _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q) { /* For software drivers, _mesa_end_query() should have completed the query. - * For real hardware, implement a proper WaitQuery() driver function. + * For real hardware, implement a proper WaitQuery() driver function, + * which may require issuing a flush. */ assert(q->Ready); } /** + * Check if a query results are ready. Software driver fallback. + * Called via ctx->Driver.CheckQuery(). + */ +void +_mesa_check_query(GLcontext *ctx, struct gl_query_object *q) +{ + /* No-op for sw rendering. + * HW drivers may need to flush at this time. + */ +} + + +/** * Delete a query object. Called via ctx->Driver.DeleteQuery(). * Not removed from hash table here. */ |