diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 13:11:19 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 13:11:19 +1100 |
| commit | 58915980127ab4e57b6b40a8c42f44be4a12aeae (patch) | |
| tree | 176f379bb19fc8caacf96112a1ebeda8aea90a16 /src/mesa/main/queryobj.h | |
| parent | e282d22d512d2a5871d0fabb7d855a16b4593c50 (diff) | |
| parent | b2ad30d57197c2167789e4f3f5b34af6df56dde2 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/main/queryobj.h')
| -rw-r--r-- | src/mesa/main/queryobj.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h index d466aae652..c05a1f3da8 100644 --- a/src/mesa/main/queryobj.h +++ b/src/mesa/main/queryobj.h @@ -37,6 +37,9 @@ extern void _mesa_free_query_data(GLcontext *ctx); extern void +_mesa_delete_query(struct gl_query_object *q); + +extern void _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q); extern void |