Differential D23161 Diff 66727 graphics/mesa/files/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
Changeset View
Changeset View
Standalone View
Standalone View
graphics/mesa/files/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| Fixes the following error: | |||||
| error: format specifies type 'unsigned long long' but the argument has type '__u64' (aka 'unsigned long') [-Werror,-Wformat] | |||||
| --- src/mesa/drivers/dri/i965/intel_batchbuffer.c.orig 2020-01-14 10:54:22.079484000 +0100 | |||||
| +++ src/mesa/drivers/dri/i965/intel_batchbuffer.c 2020-01-14 10:56:54.334570000 +0100 | |||||
| @@ -67,7 +67,7 @@ | |||||
| 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%016"PRIx64"%s (%"PRIu64"B)\n", | |||||
| i, | |||||
| batch->validation_list[i].handle, | |||||
| batch->exec_bos[i]->name, | |||||
| @@ -721,7 +721,7 @@ | |||||
| /* 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); | |||||
| assert(!(bo->kflags & EXEC_OBJECT_PINNED)); | |||||