Module: Mesa Branch: master Commit: b45971e473ca042f065295de4f86e95b747f3c9f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b45971e473ca042f065295de4f86e95b747f3c9f
Author: Kenneth Graunke <[email protected]> Date: Mon Feb 22 16:42:05 2021 -0800 i965: Use __func__ in blorp perf_debug macros These had the function name baked into the perf_debug message, which after a bunch of refactoring, was out of sync with the actual code. Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9207> --- src/mesa/drivers/dri/i965/brw_blorp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index fdfe20d209d..724d15cef83 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -882,13 +882,13 @@ blorp_get_client_bo(struct brw_context *brw, brw_bo_alloc(brw->bufmgr, "tmp_tex_subimage_src", size, BRW_MEMZONE_OTHER); if (bo == NULL) { - perf_debug("intel_texsubimage: temp bo creation failed: size = %u\n", + perf_debug("%s: temp bo creation failed: size = %u\n", __func__, size); return NULL; } if (brw_bo_subdata(bo, 0, size, pixels + first_pixel)) { - perf_debug("intel_texsubimage: temp bo upload failed\n"); + perf_debug("%s: temp bo upload failed\n", __func__); brw_bo_unreference(bo); return NULL; } @@ -908,7 +908,7 @@ blorp_get_client_format(struct brw_context *brw, return MESA_FORMAT_NONE; if (packing->SwapBytes || packing->LsbFirst || packing->Invert) { - perf_debug("intel_texsubimage_blorp: unsupported gl_pixelstore_attrib\n"); + perf_debug("%s: unsupported gl_pixelstore_attrib\n", __func__); return MESA_FORMAT_NONE; } @@ -925,7 +925,7 @@ blorp_get_client_format(struct brw_context *brw, format != GL_BGR_INTEGER && format != GL_RGBA_INTEGER && format != GL_BGRA_INTEGER) { - perf_debug("intel_texsubimage_blorp: %s not supported", + perf_debug("%s: %s not supported", __func__, _mesa_enum_to_string(format)); return MESA_FORMAT_NONE; } @@ -949,7 +949,7 @@ brw_blorp_upload_miptree(struct brw_context *brw, return false; if (!brw->mesa_format_supports_render[dst_format]) { - perf_debug("intel_texsubimage: can't use %s as render target\n", + perf_debug("%s: can't use %s as render target\n", __func__, _mesa_get_format_name(dst_format)); return false; } @@ -994,7 +994,7 @@ brw_blorp_upload_miptree(struct brw_context *brw, ISL_TILING_LINEAR, 0); if (!src_mt) { - perf_debug("intel_texsubimage: miptree creation for src failed\n"); + perf_debug("%s: miptree creation for src failed\n", __func__); goto err; } @@ -1042,7 +1042,7 @@ brw_blorp_download_miptree(struct brw_context *brw, return false; if (!brw->mesa_format_supports_render[dst_format]) { - perf_debug("intel_texsubimage: can't use %s as render target\n", + perf_debug("%s: can't use %s as render target\n", __func__, _mesa_get_format_name(dst_format)); return false; } @@ -1109,7 +1109,7 @@ brw_blorp_download_miptree(struct brw_context *brw, ISL_TILING_LINEAR, 0); if (!dst_mt) { - perf_debug("intel_texsubimage: miptree creation for src failed\n"); + perf_debug("%s: miptree creation for src failed\n", __func__); goto err; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
