Mesa (master): intel: Silence compiler format warnings.

Vinson Lee vlee at kemper.freedesktop.org
Sat Feb 20 09:58:56 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Feb 20 01:58:27 2010 -0800

intel: Silence compiler format warnings.

---

 src/mesa/drivers/dri/intel/intel_batchbuffer.c |    2 +-
 src/mesa/drivers/dri/intel/intel_fbo.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.c b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
index c984172..9261f2f 100644
--- a/src/mesa/drivers/dri/intel/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
@@ -209,7 +209,7 @@ intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
    int ret;
 
    if (batch->ptr - batch->map > batch->buf->size)
-    printf ("bad relocation ptr %p map %p offset %d size %d\n",
+    printf ("bad relocation ptr %p map %p offset %d size %lu\n",
 	    batch->ptr, batch->map, batch->ptr - batch->map, batch->buf->size);
    ret = dri_bo_emit_reloc(batch->buf, read_domains, write_domain,
 			   delta, batch->ptr - batch->map, buffer);
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 40b8679..e154bd4 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -525,7 +525,7 @@ intel_render_texture(GLcontext * ctx,
        return;
    }
 
-   DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n",
+   DBG("Begin render texture tid %lx tex=%u w=%d h=%d refcount=%d\n",
        _glthread_GetID(),
        att->Texture->Name, newImage->Width, newImage->Height,
        irb->Base.RefCount);




More information about the mesa-commit mailing list