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

aux/trace: fix bool argument

Browse source 
The second argument to debug_get_bool_option is a boolean, not a
pointer. Passing a NULL-pointer there triggers a warning, which we treat
as an error on MSVC:

---8<---
../src/gallium/auxiliary/driver_trace/tr_screen.c(1071): error C2220:
the following warning is treated as an error
../src/gallium/auxiliary/driver_trace/tr_screen.c(1071): warning C4047:
'function': 'bool' differs in levels of indirection from 'void *'
../src/gallium/auxiliary/driver_trace/tr_screen.c(1071): error C4024:
'debug_get_bool_option': different types for formal and actual parameter 2
---8<---

Fixes: c1270d4845 ("aux/trace: add screen deduplication for zink+lavapipe tracing")
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11424>
(cherry picked from commit bae4dca8e4)
This commit is contained in:
Erik Faye-Lund 2021-06-22 16:01:49 +02:00 • committed by Eric Engestrom
parent 9f3f84ab3c
commit 45b8874ddc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -490,7 +490,7 @@
"description": "aux/trace: fix bool argument",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "c1270d4845d39939d6a7d3b1b81e0d2f9e33133d"
},

2
src/gallium/auxiliary/driver_trace/tr_screen.c
View file

@ -836,7 +836,7 @@ trace_screen_create(struct pipe_screen *screen)
const char *driver = debug_get_option("MESA_LOADER_DRIVER_OVERRIDE", NULL);
if (driver && !strcmp(driver, "zink")) {
/* the user wants zink: check whether they want to trace zink or lavapipe */
bool trace_lavapipe = debug_get_bool_option("ZINK_TRACE_LAVAPIPE", NULL);
bool trace_lavapipe = debug_get_bool_option("ZINK_TRACE_LAVAPIPE", false);
if (!strncmp(screen->get_name(screen), "zink", 4)) {
/* this is the zink screen: only trace if lavapipe tracing is disabled */
if (trace_lavapipe)