utils: Merge util/debug.* into util/u_debug.* and remove util/debug.*

Rename env_var_as_unsigned() -> debug_get_num_option(), because duplicate
Rename env_var_as_bool() -> debug_get_bool_option(), because duplicate

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7177

Signed-off-by: Illia Abernikhin <illia.abernikhin@globallogic.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19336>
This commit is contained in:
Illia Abernikhin
2022-09-13 12:49:56 +03:00
committed by Marge Bot
parent 0e47171abe
commit aa4ac5ff8b
91 changed files with 150 additions and 250 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
#include "dev/intel_debug.h"
#include "git_sha1.h"
#include "util/macros.h"
#include "util/debug.h"
#include "util/u_debug.h"
#include "c11/threads.h"
uint64_t intel_debug = 0;
+2 -2
View File
@@ -34,7 +34,7 @@
#include "intel_hwconfig.h"
#include "intel/common/intel_gem.h"
#include "util/bitscan.h"
#include "util/debug.h"
#include "util/u_debug.h"
#include "util/log.h"
#include "util/macros.h"
#include "util/os_misc.h"
@@ -2037,7 +2037,7 @@ intel_get_device_info_from_fd(int fd, struct intel_device_info *devinfo)
devinfo->pci_device_id = drmdev->deviceinfo.pci->device_id;
devinfo->pci_revision_id = drmdev->deviceinfo.pci->revision_id;
drmFreeDevice(&drmdev);
devinfo->no_hw = env_var_as_boolean("INTEL_NO_HW", false);
devinfo->no_hw = debug_get_bool_option("INTEL_NO_HW", false);
if (devinfo->ver == 10) {
mesa_loge("Gfx10 support is redacted.");