zink: make mesa_logw separate from perf_debug

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22899>

diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index a47a94c..c961af0 100644 (file)
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -51,7 +51,6 @@ struct zink_resource;
 struct zink_vertex_elements_state;
 
 #define perf_debug(ctx, ...) do {                      \
-   mesa_logw(__VA_ARGS__);                         \
    util_debug_message(&ctx->dbg, PERF_INFO, __VA_ARGS__); \
 } while(0)
 

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index f265a52..a9faa73 100644 (file)
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -2407,6 +2407,7 @@ zink_resource_copy_box_add(struct zink_context *ctx, struct zink_resource *res,
    util_dynarray_append(&res->obj->copies[level], struct pipe_box, *box);
    if (!res->copies_warned && util_dynarray_num_elements(&res->obj->copies[level], struct pipe_box) > 100) {
       perf_debug(ctx, "zink: PERF WARNING! > 100 copy boxes detected for %p\n", res);
+      mesa_logw("zink: PERF WARNING! > 100 copy boxes detected for %p\n", res);
       res->copies_warned = true;
    }
    res->obj->copies_valid = true;