diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c
index 3c7f045a6d4..be6372acec1 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.c
@@ -444,7 +444,7 @@ void trace_dump_ret_end(void)
    trace_dump_newline();
 }
 
-void trace_dump_bool(int value)
+void trace_dump_bool(bool value)
 {
    if (!dumping)
       return;
@@ -452,20 +452,20 @@ void trace_dump_bool(int value)
    trace_dump_writef("<bool>%c</bool>", value ? '1' : '0');
 }
 
-void trace_dump_int(long long int value)
+void trace_dump_int(int64_t value)
 {
    if (!dumping)
       return;
 
-   trace_dump_writef("<int>%lli</int>", value);
+   trace_dump_writef("<int>" PRIi64 "</int>", value);
 }
 
-void trace_dump_uint(long long unsigned value)
+void trace_dump_uint(uint64_t value)
 {
    if (!dumping)
       return;
 
-   trace_dump_writef("<uint>%llu</uint>", value);
+   trace_dump_writef("<uint>" PRIu64 "</uint>", value);
 }
 
 void trace_dump_float(double value)
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h
index 3486ad8ad33..b61e1076a31 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.h
@@ -82,9 +82,9 @@ void trace_dump_arg_begin(const char *name);
 void trace_dump_arg_end(void);
 void trace_dump_ret_begin(void);
 void trace_dump_ret_end(void);
-void trace_dump_bool(int value);
-void trace_dump_int(long long int value);
-void trace_dump_uint(long long unsigned value);
+void trace_dump_bool(bool value);
+void trace_dump_int(int64_t value);
+void trace_dump_uint(uint64_t value);
 void trace_dump_float(double value);
 void trace_dump_bytes(const void *data, size_t size);
 void trace_dump_box_bytes(const void *data,