diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:20:40 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:20:40 +1100 |
| commit | 49405c43f245d3b3ddd12e891413bf7ead23145c (patch) | |
| tree | c6969454265b133f6be8c04b2ba193aecf90e4a7 /src/mesa/pipe/nv40/nv40_query.c | |
| parent | 263de4b814eb78cc971ad28f173985b61b77465c (diff) | |
| parent | 4d9c19d2f7eef263b49485b6e65be9afbe58363a (diff) | |
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/nouveau/nouveau_stateobj.h
src/mesa/pipe/nv40/nv40_context.c
src/mesa/pipe/nv40/nv40_miptree.c
Diffstat (limited to 'src/mesa/pipe/nv40/nv40_query.c')
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_query.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/pipe/nv40/nv40_query.c b/src/mesa/pipe/nv40/nv40_query.c index eb305e6444..8bca2788b9 100644 --- a/src/mesa/pipe/nv40/nv40_query.c +++ b/src/mesa/pipe/nv40/nv40_query.c @@ -9,7 +9,7 @@ struct nv40_query { uint64_t result; }; -static inline struct nv40_query * +static INLINE struct nv40_query * nv40_query(struct pipe_query *pipe) { return (struct nv40_query *)pipe; @@ -20,7 +20,7 @@ nv40_query_create(struct pipe_context *pipe, unsigned query_type) { struct nv40_query *q; - q = calloc(1, sizeof(struct nv40_query)); + q = CALLOC(1, sizeof(struct nv40_query)); q->type = query_type; return (struct pipe_query *)q; |