diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-05-20 17:00:48 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-05-20 17:00:48 +0200 |
| commit | b9bd1abf2664a75642ee5e1999697bbe480b9172 (patch) | |
| tree | 06e34f206854badbb1ec5f31abdf661900ab389e /src/mesa/drivers/dri/intel/intel_tex_image.c | |
| parent | c696dd0f62c195d71cf7ecbdd04d9b156dd0da0b (diff) | |
| parent | 0c75cb5afe81b0de9d006f9f9b75fdc9a15038d0 (diff) | |
Merge branch 'master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_image.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index b71fe2a7ae..ddbb13e74a 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -208,7 +208,7 @@ try_pbo_upload(struct intel_context *intel, if (!pbo || intel->ctx._ImageTransferState || unpack->SkipPixels || unpack->SkipRows) { - _mesa_printf("%s: failure 1\n", __FUNCTION__); + DBG("%s: failure 1\n", __FUNCTION__); return GL_FALSE; } @@ -264,7 +264,7 @@ try_pbo_zcopy(struct intel_context *intel, if (!pbo || intel->ctx._ImageTransferState || unpack->SkipPixels || unpack->SkipRows) { - _mesa_printf("%s: failure 1\n", __FUNCTION__); + DBG("%s: failure 1\n", __FUNCTION__); return GL_FALSE; } @@ -283,7 +283,7 @@ try_pbo_zcopy(struct intel_context *intel, dst_stride = intelImage->mt->pitch; if (src_stride != dst_stride || dst_offset != 0 || src_offset != 0) { - _mesa_printf("%s: failure 2\n", __FUNCTION__); + DBG("%s: failure 2\n", __FUNCTION__); return GL_FALSE; } |