Module: Mesa Branch: staging/23.0 Commit: e239111ec6135ae9ae8b9f81913dad9a74125184 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e239111ec6135ae9ae8b9f81913dad9a74125184
Author: Mike Blumenkrantz <[email protected]> Date: Tue Feb 28 17:16:40 2023 -0500 aux/trace: delete GALLIUM_TRACE_NIR log message this is not only annoying, it breaks trace xml output cc: mesa-stable Acked-by: Simon Zeni <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21609> (cherry picked from commit f99eab23ad6d58e08336d862adcb642f9714eb51) --- .pick_status.json | 2 +- src/gallium/auxiliary/driver_trace/tr_dump.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c30119e8c69..7470d2cc9ed 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5251,7 +5251,7 @@ "description": "aux/trace: delete GALLIUM_TRACE_NIR log message", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c index 47dc27f04b4..963c22fb693 100644 --- a/src/gallium/auxiliary/driver_trace/tr_dump.c +++ b/src/gallium/auxiliary/driver_trace/tr_dump.c @@ -663,12 +663,6 @@ void trace_dump_nir(void *nir) return; } - if ((nir_count--) == 0) { - fputs("<string>Set GALLIUM_TRACE_NIR to a sufficiently big number " - "to enable NIR shader dumping.</string>", stream); - return; - } - // NIR doesn't have a print to string function. Use CDATA and hope for the // best. if (stream) {
