projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Stop passing num_samples to intel_miptree_alloc_hiz().
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
intel
/
intel_tex_copy.c
diff --git
a/src/mesa/drivers/dri/intel/intel_tex_copy.c
b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 5acdb42c3aca8e5579903fe4708598a9ec86f4cc..6043ed26adbf558cee2cae6ccd496e013e5fd959 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/
src/mesa/drivers/dri/intel/intel_tex_copy.c
@@
-114,8
+114,7
@@
intel_copy_texsubimage(struct intel_context *intel,
}
if (!copy_supported && !copy_supported_with_alpha_override) {
}
if (!copy_supported && !copy_supported_with_alpha_override) {
- if (unlikely(INTEL_DEBUG & DEBUG_PERF))
- fprintf(stderr, "%s mismatched formats %s, %s\n",
+ perf_debug("%s mismatched formats %s, %s\n",
__FUNCTION__,
_mesa_get_format_name(intelImage->base.Base.TexFormat),
_mesa_get_format_name(intel_rb_format(irb)));
__FUNCTION__,
_mesa_get_format_name(intelImage->base.Base.TexFormat),
_mesa_get_format_name(intel_rb_format(irb)));
@@
-190,7
+189,7
@@
intelCopyTexSubImage(struct gl_context *ctx, GLuint dims,
#endif
/* Next, try the BLT engine. */
#endif
/* Next, try the BLT engine. */
- if (intel_copy_texsubimage(intel
_context(ctx)
,
+ if (intel_copy_texsubimage(intel,
intel_texture_image(texImage),
xoffset, yoffset,
intel_renderbuffer(rb), x, y, width, height))
intel_texture_image(texImage),
xoffset, yoffset,
intel_renderbuffer(rb), x, y, width, height))
@@
-198,7
+197,7
@@
intelCopyTexSubImage(struct gl_context *ctx, GLuint dims,
}
/* Finally, fall back to meta. This will likely be slow. */
}
/* Finally, fall back to meta. This will likely be slow. */
-
fallback
_debug("%s - fallback to swrast\n", __FUNCTION__);
+
perf
_debug("%s - fallback to swrast\n", __FUNCTION__);
_mesa_meta_CopyTexSubImage(ctx, dims, texImage,
xoffset, yoffset, zoffset,
rb, x, y, width, height);
_mesa_meta_CopyTexSubImage(ctx, dims, texImage,
xoffset, yoffset, zoffset,
rb, x, y, width, height);