gallium/draw: initial code to properly support llvm in the draw module

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_queryobj.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.c b/src/mesa/drivers/dri/radeon/radeon_queryobj.c
index 98117cdfc14ee7dedeaea4eb3f8acaf4d4d767b6..04ce12493e6f1108ad5e791eadf615e4d4748334 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_queryobj.c
+++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.c
@@ -65,7 +65,7 @@ static void radeonQueryGetResult(GLcontext *ctx, struct gl_query_object *q)
 
                        }
                        radeon_print(RADEON_STATE, RADEON_TRACE,
-                                    "%d start: %lx, end: %lx %ld\n", i, start, end, end - start);
+                                    "%d start: %llx, end: %llx %lld\n", i, start, end, end - start);
                }
        } else {
                for (i = 0; i < query->curr_offset/sizeof(uint32_t); ++i) {
@@ -81,7 +81,7 @@ static struct gl_query_object * radeonNewQueryObject(GLcontext *ctx, GLuint id)
 {
        struct radeon_query_object *query;
 
-       query = _mesa_calloc(sizeof(struct radeon_query_object));
+       query = calloc(1, sizeof(struct radeon_query_object));
 
        query->Base.Id = id;
        query->Base.Result = 0;
@@ -103,7 +103,7 @@ static void radeonDeleteQuery(GLcontext *ctx, struct gl_query_object *q)
                radeon_bo_unref(query->bo);
        }
 
-       _mesa_free(query);
+       free(query);
 }
 
 static void radeonWaitQuery(GLcontext *ctx, struct gl_query_object *q)