From c1bfbabca3fc7db97deeb98e2cca1c40e4ff2ead Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 25 Jun 2025 11:44:36 +0200 Subject: [PATCH] radeonsi: use mesa_loge instead of fprintf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's helpful on platforms with custom loggers like Android. Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_pipe.c | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 9bce4b2724f..374c553077d 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -499,7 +499,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign /* Don't create a context if it's not compute-only and hw is compute-only. */ if (!sscreen->info.has_graphics && !(flags & PIPE_CONTEXT_COMPUTE_ONLY)) { - fprintf(stderr, "radeonsi: can't create a graphics context on a compute chip\n"); + mesa_loge("radeonsi: can't create a graphics context on a compute chip\n"); return NULL; } @@ -508,7 +508,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign int shader, i; if (!sctx) { - fprintf(stderr, "radeonsi: can't allocate a context\n"); + mesa_loge("radeonsi: can't allocate a context\n"); return NULL; } @@ -544,7 +544,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign &sscreen->b, PIPE_RESOURCE_FLAG_UNMAPPABLE | SI_RESOURCE_FLAG_DRIVER_INTERNAL, PIPE_USAGE_DEFAULT, 16 * sscreen->info.max_render_backends, 256); if (!sctx->eop_bug_scratch) { - fprintf(stderr, "radeonsi: can't create eop_bug_scratch\n"); + mesa_loge("radeonsi: can't create eop_bug_scratch\n"); goto fail; } } @@ -552,13 +552,13 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign /* Initialize the context handle and the command stream. */ sctx->ctx = sctx->ws->ctx_create(sctx->ws, sctx->context_flags); if (!sctx->ctx) { - fprintf(stderr, "radeonsi: can't create radeon_winsys_ctx\n"); + mesa_loge("radeonsi: can't create radeon_winsys_ctx\n"); goto fail; } if (!ws->cs_create(&sctx->gfx_cs, sctx->ctx, sctx->has_graphics ? AMD_IP_GFX : AMD_IP_COMPUTE, (void *)si_flush_gfx_cs, sctx)) { - fprintf(stderr, "radeonsi: can't create gfx_cs\n"); + mesa_loge("radeonsi: can't create gfx_cs\n"); sctx->gfx_cs.priv = NULL; goto fail; } @@ -571,7 +571,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign sctx->cached_gtt_allocator = u_upload_create(&sctx->b, 16 * 1024, 0, PIPE_USAGE_STAGING, 0); if (!sctx->cached_gtt_allocator) { - fprintf(stderr, "radeonsi: can't create cached_gtt_allocator\n"); + mesa_loge("radeonsi: can't create cached_gtt_allocator\n"); goto fail; } @@ -586,7 +586,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign : PIPE_USAGE_STREAM, SI_RESOURCE_FLAG_32BIT); /* same flags as const_uploader */ if (!sctx->b.stream_uploader) { - fprintf(stderr, "radeonsi: can't create stream_uploader\n"); + mesa_loge("radeonsi: can't create stream_uploader\n"); goto fail; } @@ -597,7 +597,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign u_upload_create(&sctx->b, 256 * 1024, 0, PIPE_USAGE_DEFAULT, SI_RESOURCE_FLAG_32BIT); if (!sctx->b.const_uploader) { - fprintf(stderr, "radeonsi: can't create const_uploader\n"); + mesa_loge("radeonsi: can't create const_uploader\n"); goto fail; } } @@ -606,21 +606,21 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign if (sscreen->info.has_3d_cube_border_color_mipmap) { sctx->border_color_table = malloc(SI_MAX_BORDER_COLORS * sizeof(*sctx->border_color_table)); if (!sctx->border_color_table) { - fprintf(stderr, "radeonsi: can't create border_color_table\n"); + mesa_loge("radeonsi: can't create border_color_table\n"); goto fail; } sctx->border_color_buffer = si_resource(pipe_buffer_create( screen, 0, PIPE_USAGE_DEFAULT, SI_MAX_BORDER_COLORS * sizeof(*sctx->border_color_table))); if (!sctx->border_color_buffer) { - fprintf(stderr, "radeonsi: can't create border_color_buffer\n"); + mesa_loge("radeonsi: can't create border_color_buffer\n"); goto fail; } sctx->border_color_map = ws->buffer_map(ws, sctx->border_color_buffer->buf, NULL, PIPE_MAP_WRITE); if (!sctx->border_color_map) { - fprintf(stderr, "radeonsi: can't map border_color_buffer\n"); + mesa_loge("radeonsi: can't map border_color_buffer\n"); goto fail; } } @@ -668,7 +668,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign sctx->blitter = util_blitter_create(&sctx->b); if (sctx->blitter == NULL) { - fprintf(stderr, "radeonsi: can't create blitter\n"); + mesa_loge("radeonsi: can't create blitter\n"); goto fail; } sctx->blitter->skip_viewport_restore = true; @@ -744,7 +744,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign PIPE_USAGE_DEFAULT, 16, sctx->screen->info.tcc_cache_line_size); if (!sctx->null_const_buf.buffer) { - fprintf(stderr, "radeonsi: can't create null_const_buf\n"); + mesa_loge("radeonsi: can't create null_const_buf\n"); goto fail; } sctx->null_const_buf.buffer_size = sctx->null_const_buf.buffer->width0; @@ -774,7 +774,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign sctx->dirty_implicit_resources = _mesa_pointer_hash_table_create(NULL); if (!sctx->dirty_implicit_resources) { - fprintf(stderr, "radeonsi: can't create dirty_implicit_resources\n"); + mesa_loge("radeonsi: can't create dirty_implicit_resources\n"); goto fail; } @@ -808,7 +808,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign PIPE_USAGE_DEFAULT, 4, sscreen->info.tcc_cache_line_size); if (!sctx->wait_mem_scratch) { - fprintf(stderr, "radeonsi: can't create wait_mem_scratch\n"); + mesa_loge("radeonsi: can't create wait_mem_scratch\n"); goto fail; } @@ -882,7 +882,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign return &sctx->b; fail: - fprintf(stderr, "radeonsi: Failed to create a context.\n"); + mesa_loge("radeonsi: Failed to create a context.\n"); si_destroy_context(&sctx->b); return NULL; }