diff options
| author | Keith Whitwell <[email protected]> | 2008-10-10 15:19:05 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-10-10 15:23:36 +0100 |
| commit | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f (patch) | |
| tree | 7446e243da8b50f6cb323b7917bdb94fbd528368 /src/mesa/main/queryobj.h | |
| parent | 7ac1fc77661faf0897507fef0437fe69d0ba53ac (diff) | |
| parent | f7556fdd40ed2719beaba271eee4a7551e212ad1 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/main/queryobj.h')
| -rw-r--r-- | src/mesa/main/queryobj.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h index c05a1f3da82..9a9774641bb 100644 --- a/src/mesa/main/queryobj.h +++ b/src/mesa/main/queryobj.h @@ -37,7 +37,7 @@ extern void _mesa_free_query_data(GLcontext *ctx); extern void -_mesa_delete_query(struct gl_query_object *q); +_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q); extern void _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q); |