OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Replace usage of macro DEBUG with MESA_DEBUG when possible

Browse Source 
This is achieved by the following steps:

#ifndef DEBUG => #if !MESA_DEBUG
defined(DEBUG) => MESA_DEBUG
#ifdef DEBUG => #if MESA_DEBUG

This is done by replace in vscode

excludes
docs,*.rs,addrlib,src/imgui,*.sh,src/intel/vulkan/grl/gpu

These are safe because those files should keep DEBUG macro is already excluded;
and not directly replace DEBUG, as we have some symbols around it.

Use debug or NDEBUG instead of DEBUG in comments when proper

This for reduce the usage of DEBUG,
so it's easier migrating to MESA_DEBUG

These are found when migrating DEBUG to MESA_DEBUG,
these are all comment update, so it's safe

Replace comment /* DEBUG */ and /* !DEBUG */ with proper /* MESA_DEBUG */ or /* !MESA_DEBUG */ manually

DEBUG || !NDEBUG -> MESA_DEBUG || !NDEBUG
!DEBUG && NDEBUG -> !(MESA_DEBUG || !NDEBUG)

Replace the DEBUG present in comment with proper new MESA_DEBUG manually

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28092>
This commit is contained in:
Yonggang Luo
2024-03-09 04:00:44 +08:00
committed by Marge Bot
parent 0578f13fc9
commit 1ac1c0843f
165 changed files with 284 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/llvmpipe/lp_texture.c
View File

@@ -59,7 +59,7 @@
#endif
#ifdef DEBUG
#if MESA_DEBUG
static struct llvmpipe_resource resource_list;
static simple_mtx_t resource_list_mutex = SIMPLE_MTX_INITIALIZER;
#endif
@@ -303,7 +303,7 @@ llvmpipe_resource_create_all(struct pipe_screen *_screen,
lpr->id = id_counter++;
#ifdef DEBUG
#if MESA_DEBUG
simple_mtx_lock(&resource_list_mutex);
list_addtail(&lpr->list, &resource_list.list);
simple_mtx_unlock(&resource_list_mutex);
@@ -437,7 +437,7 @@ llvmpipe_resource_from_memobj(struct pipe_screen *pscreen,
lpr->id = id_counter++;
lpr->imported_memory = true;
#ifdef DEBUG
#if MESA_DEBUG
simple_mtx_lock(&resource_list_mutex);
list_addtail(&lpr->list, &resource_list.list);
simple_mtx_unlock(&resource_list_mutex);
@@ -474,7 +474,7 @@ llvmpipe_resource_destroy(struct pipe_screen *pscreen,
align_free(lpr->data);
}
}
#ifdef DEBUG
#if MESA_DEBUG
simple_mtx_lock(&resource_list_mutex);
if (!list_is_empty(&lpr->list))
list_del(&lpr->list);
@@ -611,7 +611,7 @@ llvmpipe_resource_from_handle(struct pipe_screen *_screen,
lpr->id = id_counter++;
#ifdef DEBUG
#if MESA_DEBUG
simple_mtx_lock(&resource_list_mutex);
list_addtail(&lpr->list, &resource_list.list);
simple_mtx_unlock(&resource_list_mutex);
@@ -670,7 +670,7 @@ llvmpipe_resource_from_user_memory(struct pipe_screen *_screen,
} else
lpr->data = user_memory;
lpr->user_ptr = true;
#ifdef DEBUG
#if MESA_DEBUG
simple_mtx_lock(&resource_list_mutex);
list_addtail(&lpr->list, &resource_list.list);
simple_mtx_unlock(&resource_list_mutex);
@@ -1060,7 +1060,7 @@ llvmpipe_unmap_memory(struct pipe_screen *screen,
}
#ifdef DEBUG
#if MESA_DEBUG
void
llvmpipe_print_resources(void)
{
@@ -1161,7 +1161,7 @@ llvmpipe_resource_get_param(struct pipe_screen *screen,
void
llvmpipe_init_screen_resource_funcs(struct pipe_screen *screen)
{
#ifdef DEBUG
#if MESA_DEBUG
/* init linked list for tracking resources */
{
static bool first_call = true;