Module: Mesa
Branch: master
Commit: 4c110994533c67f2e501cd32ee0c2f91060630e0
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c110994533c67f2e501cd32ee0c2f91060630e0

Author: Emil Velikov <emil.l.veli...@gmail.com>
Date:   Sat Nov 30 19:53:53 2013 +0000

gallium/radeon: use PRIu64 macro for printing uint64_t

Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>

---

 src/gallium/drivers/radeon/r600_pipe_common.c |    3 ++-
 src/gallium/drivers/radeon/r600_texture.c     |    7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c 
b/src/gallium/drivers/radeon/r600_pipe_common.c
index 5674f81..9a4a3e0 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -28,6 +28,7 @@
 #include "r600_cs.h"
 #include "tgsi/tgsi_parse.h"
 #include "util/u_format_s3tc.h"
+#include <inttypes.h>
 
 static const struct debug_named_value common_debug_options[] = {
        /* logging */
@@ -418,7 +419,7 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
        util_range_set_empty(&res->valid_buffer_range);
 
        if (rscreen->debug_flags & DBG_VM && res->b.b.target == PIPE_BUFFER) {
-               fprintf(stderr, "VM start=0x%llX  end=0x%llX | Buffer %u 
bytes\n",
+               fprintf(stderr, "VM start=0x%"PRIu64"  end=0x%"PRIu64" | Buffer 
%u bytes\n",
                        r600_resource_va(&rscreen->b, &res->b.b),
                        r600_resource_va(&rscreen->b, &res->b.b) + 
res->buf->size,
                        res->buf->size);
diff --git a/src/gallium/drivers/radeon/r600_texture.c 
b/src/gallium/drivers/radeon/r600_texture.c
index 5674f0b..99f8445 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -29,6 +29,7 @@
 #include "util/u_format.h"
 #include "util/u_memory.h"
 #include <errno.h>
+#include <inttypes.h>
 
 /* Same as resource_copy_region, except that both upsampling and downsampling 
are allowed. */
 static void r600_copy_region_with_blit(struct pipe_context *pipe,
@@ -578,7 +579,7 @@ r600_texture_create_object(struct pipe_screen *screen,
        }
 
        if (rscreen->debug_flags & DBG_VM) {
-               fprintf(stderr, "VM start=0x%llX  end=0x%llX | Texture 
%ix%ix%i, %i levels, %i samples, %s\n",
+               fprintf(stderr, "VM start=0x%"PRIu64"  end=0x%"PRIu64" | 
Texture %ix%ix%i, %i levels, %i samples, %s\n",
                        r600_resource_va(screen, &rtex->resource.b.b),
                        r600_resource_va(screen, &rtex->resource.b.b) + 
rtex->resource.buf->size,
                        base->width0, base->height0, util_max_layer(base, 0)+1, 
base->last_level+1,
@@ -597,7 +598,7 @@ r600_texture_create_object(struct pipe_screen *screen,
                       rtex->surface.bpe, rtex->surface.nsamples,
                       rtex->surface.flags, 
util_format_short_name(base->format));
                for (int i = 0; i <= rtex->surface.last_level; i++) {
-                       printf("  L %i: offset=%llu, slice_size=%llu, 
npix_x=%u, "
+                       printf("  L %i: offset=%"PRIu64", slice_size=%"PRIu64", 
npix_x=%u, "
                               "npix_y=%u, npix_z=%u, nblk_x=%u, nblk_y=%u, "
                               "nblk_z=%u, pitch_bytes=%u, mode=%u\n",
                               i, rtex->surface.level[i].offset,
@@ -613,7 +614,7 @@ r600_texture_create_object(struct pipe_screen *screen,
                }
                if (rtex->surface.flags & RADEON_SURF_SBUFFER) {
                        for (int i = 0; i <= rtex->surface.last_level; i++) {
-                               printf("  S %i: offset=%llu, slice_size=%llu, 
npix_x=%u, "
+                               printf("  S %i: offset=%"PRIu64", 
slice_size=%"PRIu64", npix_x=%u, "
                                       "npix_y=%u, npix_z=%u, nblk_x=%u, 
nblk_y=%u, "
                                       "nblk_z=%u, pitch_bytes=%u, mode=%u\n",
                                       i, rtex->surface.stencil_level[i].offset,

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to