fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/u_printf: allow printing from singleton

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33067>
This commit is contained in:
Alyssa Rosenzweig 2025-01-15 15:40:37 -05:00 • committed by Marge Bot
parent 007f60c8b8
commit dd66287e63
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/util/u_printf.c
View file

@ -148,6 +148,7 @@ u_printf_impl(FILE *out, const char *buffer, size_t buffer_size,
const u_printf_info **info_ptr,
unsigned info_size)
{
bool use_singleton = info == NULL && info_ptr == NULL;
for (size_t buf_pos = 0; buf_pos < buffer_size;) {
uint32_t fmt_idx = *(uint32_t*)&buffer[buf_pos];
@ -155,16 +156,23 @@ u_printf_impl(FILE *out, const char *buffer, size_t buffer_size,
if (fmt_idx == 0)
break;
/* the idx is 1 based */
/* the idx is 1 based, and hashes are nonzero */
assert(fmt_idx > 0);
fmt_idx -= 1;
/* The API allows more arguments than the format uses */
if (fmt_idx >= info_size)
return;
const u_printf_info *fmt;
if (use_singleton) {
fmt = u_printf_singleton_search(fmt_idx /* hash */);
if (!fmt)
return;
} else {
fmt_idx -= 1;
if (fmt_idx >= info_size)
return;
fmt = info != NULL ? &info[fmt_idx] : info_ptr[fmt_idx];
}
const u_printf_info *fmt = info != NULL ?
&info[fmt_idx] : info_ptr[fmt_idx];
const char *format = fmt->strings;
buf_pos += sizeof(fmt_idx);