summaryrefslogtreecommitdiff
path: root/progs/perf/common.h
diff options
context:
space:
mode:
authorMichal Krol <michal@vmware.com>2009-12-12 16:48:32 +0100
committerMichal Krol <michal@vmware.com>2009-12-12 16:48:32 +0100
commita3eb0f718e19653a2ad8e49396c904183be456f3 (patch)
tree0092574c469ea586a6cab8b8ebb7ac62b8221a2a /progs/perf/common.h
parent491f384c3958067e6c4c994041f5d8d413b806bc (diff)
parent784cca9fa527de771754d76545970f78094b9adf (diff)
Merge branch 'master' into glsl-pp-rework-2
Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h
Diffstat (limited to 'progs/perf/common.h')
-rw-r--r--progs/perf/common.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/progs/perf/common.h b/progs/perf/common.h
index 8b6091530d..6ea17402b5 100644
--- a/progs/perf/common.h
+++ b/progs/perf/common.h
@@ -24,12 +24,21 @@
#define COMMON_H
+#include <stddef.h> /* for offsetof() */
+
+
typedef void (*PerfRateFunc)(unsigned count);
extern double
PerfMeasureRate(PerfRateFunc f);
+const char *
+PerfHumanFloat( double d );
+
+extern void
+perf_printf(const char *format, ...);
+
#endif /* COMMON_H */