aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEmmanuel <[email protected]>2020-01-24 23:48:06 +0100
committerMarge Bot <[email protected]>2020-07-01 16:47:05 +0000
commitf678811b567aafba60842bf0b3cff124da4daa0e (patch)
tree7e6700fe257655f0a3dd1b774dbb86ea87e394aa /src/mesa
parent565a80450d28f6daa0ca8b98dad93924e712f94b (diff)
i965: Explicitly cast value to uint64_t
In FreeBSD x86 and aarch64 __u64 is typedef to unsigned long and is the same size as unsigned long long. Since we are explicitly specifying the format, cast the value to the proper type. Reviewed-by: Matt Turner <[email protected]> Signed-off-by: Emmanuel <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3559>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_batchbuffer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 3a08742d092..e48b0c3c1a1 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -67,14 +67,14 @@ dump_validation_list(struct intel_batchbuffer *batch)
uint64_t flags = batch->validation_list[i].flags;
assert(batch->validation_list[i].handle ==
batch->exec_bos[i]->gem_handle);
- fprintf(stderr, "[%2d]: %2d %-14s %p %s%-7s @ 0x%016llx%s (%"PRIu64"B)\n",
+ fprintf(stderr, "[%2d]: %2d %-14s %p %s%-7s @ 0x%"PRIx64"%s (%"PRIu64"B)\n",
i,
batch->validation_list[i].handle,
batch->exec_bos[i]->name,
batch->exec_bos[i],
(flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) ? "(48b" : "(32b",
(flags & EXEC_OBJECT_WRITE) ? " write)" : ")",
- batch->validation_list[i].offset,
+ (uint64_t)batch->validation_list[i].offset,
(flags & EXEC_OBJECT_PINNED) ? " (pinned)" : "",
batch->exec_bos[i]->size);
}
@@ -740,9 +740,9 @@ execbuffer(int fd,
/* Update brw_bo::gtt_offset */
if (batch->validation_list[i].offset != bo->gtt_offset) {
- DBG("BO %d migrated: 0x%" PRIx64 " -> 0x%llx\n",
+ DBG("BO %d migrated: 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
bo->gem_handle, bo->gtt_offset,
- batch->validation_list[i].offset);
+ (uint64_t)batch->validation_list[i].offset);
assert(!(bo->kflags & EXEC_OBJECT_PINNED));
bo->gtt_offset = batch->validation_list[i].offset;
}