mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-20 00:28:08 +02:00
222b85328e
The standard way to query options in mesa is `os_get_option()` which
abstracts platform-specific mechanisms to get config variables.
However in quite a few places `getenv()` is still used and this may
preclude controlling some options on some systems.
For instance it is not generally possible to use `MESA_DEBUG` on
Android.
So replace most `getenv()` occurrences with `os_get_option()` to
support configuration options more consistently across different
platforms.
Do the same with `secure_getenv()` replacing it with
`os_get_option_secure()`.
The bulk of the proposed changes are mechanically performed by the
following script:
-----------------------------------------------------------------------
#!/bin/sh
set -e
replace() {
# Don't replace in some files, for example where `os_get_option` is defined,
# or in external files
EXCLUDE_FILES_PATTERN='(src/util/os_misc.c|src/util/u_debug.h|src/gtest/include/gtest/internal/gtest-port.h)'
# Don't replace some "system" variables
EXCLUDE_VARS_PATTERN='("XDG|"DISPLAY|"HOME|"TMPDIR|"POSIXLY_CORRECT)'
git grep "[=!( ]$1(" -- src/ | cut -d ':' -f 1 | sort | uniq | \
grep -v -E "$EXCLUDE_FILES_PATTERN" | \
while read -r file;
do
# Don't replace usages of XDG_* variables or HOME
sed -E -e "/$EXCLUDE_VARS_PATTERN/!s/([=!\( ])$1\(/\1$2\(/g" -i "$file";
done
}
# Add const to os_get_option results, to avoid warning about discarded qualifier:
# warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
# but also errors in some cases:
# error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
add_const_results() {
git grep -l -P '(?<!const )char.*os_get_option' | \
while read -r file;
do
sed -e '/^\s*const/! s/\(char.*os_get_option\)/const \1/g' -i "$file"
done
}
replace 'secure_getenv' 'os_get_option_secure'
replace 'getenv' 'os_get_option'
add_const_results
-----------------------------------------------------------------------
After this, the `#include "util/os_misc.h"` is also added in files where
`os_get_option()` was not used before.
And since the replacements from the script above generated some new
`-Wdiscarded-qualifiers` warnings, those have been addressed as well,
generally by declaring `os_get_option()` results as `const char *` and
adjusting some function declarations.
Finally some replacements caused new errors like:
-----------------------------------------------------------------------
../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:127:31: error: no matching function for call to 'strtok'
127 | for (n = 0, option = strtok(env_llc_options, " "); option; n++, option = strtok(NULL, " ")) {
| ^~~~~~
/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/bin/../sysroot/usr/include/string.h:124:17: note: candidate function not viable: 1st argument ('const char *') would lose const qualifier
124 | char* _Nullable strtok(char* _Nullable __s, const char* _Nonnull __delimiter);
| ^ ~~~~~~~~~~~~~~~~~~~
-----------------------------------------------------------------------
Those have been addressed too, copying the const string returned by
`os_get_option()` so that it could be modified.
In particular, the error above has been fixed by copying the `const
char *env_llc_options` variable in
`src/gallium/auxiliary/gallivm/lp_bld_misc.cpp` to a `char *` which can
be tokenized using `strtok()`.
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38128>
|
||
|---|---|---|
| .. | ||
| pds | ||
| winsys | ||
| meson.build | ||
| pvr_blit.c | ||
| pvr_blit.h | ||
| pvr_bo.c | ||
| pvr_bo.h | ||
| pvr_border.c | ||
| pvr_border.h | ||
| pvr_buffer.h | ||
| pvr_clear.c | ||
| pvr_clear.h | ||
| pvr_cmd_buffer.c | ||
| pvr_cmd_buffer.h | ||
| pvr_common.h | ||
| pvr_csb.c | ||
| pvr_csb.h | ||
| pvr_csb_enum_helpers.h | ||
| pvr_descriptor_set.c | ||
| pvr_descriptor_set.h | ||
| pvr_device.c | ||
| pvr_device.h | ||
| pvr_dump_bo.c | ||
| pvr_dump_bo.h | ||
| pvr_dump_csb.c | ||
| pvr_formats.c | ||
| pvr_formats.h | ||
| pvr_framebuffer.h | ||
| pvr_hw_pass.c | ||
| pvr_hw_pass.h | ||
| pvr_image.c | ||
| pvr_image.h | ||
| pvr_job_common.c | ||
| pvr_job_common.h | ||
| pvr_job_compute.c | ||
| pvr_job_compute.h | ||
| pvr_job_context.c | ||
| pvr_job_context.h | ||
| pvr_job_render.c | ||
| pvr_job_render.h | ||
| pvr_job_transfer.c | ||
| pvr_job_transfer.h | ||
| pvr_macros.h | ||
| pvr_pass.c | ||
| pvr_pass.h | ||
| pvr_pipeline.c | ||
| pvr_pipeline.h | ||
| pvr_query.c | ||
| pvr_query.h | ||
| pvr_query_compute.c | ||
| pvr_queue.c | ||
| pvr_queue.h | ||
| pvr_robustness.c | ||
| pvr_robustness.h | ||
| pvr_spm.c | ||
| pvr_spm.h | ||
| pvr_tex_state.c | ||
| pvr_tex_state.h | ||
| pvr_transfer_frag_store.c | ||
| pvr_transfer_frag_store.h | ||
| pvr_usc.c | ||
| pvr_usc.h | ||
| pvr_wsi.c | ||
| pvr_wsi.h | ||