Move compiler.h and imports.h/c from src/mesa/main into src/util

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

diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.h b/src/mesa/drivers/dri/radeon/radeon_queryobj.h
index 19374dc76b7083503a46aa1bcfe5fd36e9e41656..e1cda17b005778b92cd812a865bea3b37d0acb52 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_queryobj.h
+++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.h
@@ -25,24 +25,24 @@
  *
  */
 
-#include "main/imports.h"
-#include "main/simple_list.h"
+#include "util/imports.h"
+#include "util/simple_list.h"
 #include "radeon_common_context.h"
 
-extern void radeonEmitQueryBegin(GLcontext *ctx);
-extern void radeonEmitQueryEnd(GLcontext *ctx);
+extern void radeonEmitQueryBegin(struct gl_context *ctx);
+extern void radeonEmitQueryEnd(struct gl_context *ctx);
 
 extern void radeonInitQueryObjFunctions(struct dd_function_table *functions);
 
 #define RADEON_QUERY_PAGE_SIZE 4096
 
-int radeon_check_query_active(GLcontext *ctx, struct radeon_state_atom *atom);
-void radeon_emit_queryobj(GLcontext *ctx, struct radeon_state_atom *atom);
+int radeon_check_query_active(struct gl_context *ctx, struct radeon_state_atom *atom);
+void radeon_emit_queryobj(struct gl_context *ctx, struct radeon_state_atom *atom);
 
 static inline void radeon_init_query_stateobj(radeonContextPtr radeon, int SZ)
 {
        radeon->query.queryobj.cmd_size = (SZ);
-       radeon->query.queryobj.cmd = (uint32_t*)CALLOC((SZ) * sizeof(uint32_t));
+       radeon->query.queryobj.cmd = calloc(SZ, sizeof(uint32_t));
        radeon->query.queryobj.name = "queryobj";
        radeon->query.queryobj.idx = 0;
        radeon->query.queryobj.check = radeon_check_query_active;