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

tree-wide: Use __func__ instead of __FUNCTION__ in non-gallium code

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19861>
This commit is contained in:
Yonggang Luo
2022-11-18 05:38:36 +08:00
committed by Marge Bot
parent 703d85485f
commit 40a9fc57aa
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/common/ac_rtld.c
View File

@@ -156,7 +156,7 @@ static bool layout_symbols(struct ac_rtld_symbol *symbols, unsigned num_symbols,
s->offset = total_size; s->offset = total_size;
if (total_size + s->size < total_size) { if (total_size + s->size < total_size) {
report_errorf("%s: size overflow", __FUNCTION__); report_errorf("%s: size overflow", __func__);
return false; return false;
} }

2
src/asahi/compiler/agx_compile.c
View File

@@ -54,7 +54,7 @@ int agx_debug = 0;
#define DBG(fmt, ...) \ #define DBG(fmt, ...) \
do { if (agx_debug & AGX_DBG_MSGS) \ do { if (agx_debug & AGX_DBG_MSGS) \
fprintf(stderr, "%s:%d: "fmt, \ fprintf(stderr, "%s:%d: "fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
static agx_index static agx_index
agx_cached_preload(agx_context *ctx, agx_index *cache, unsigned base, enum agx_size size) agx_cached_preload(agx_context *ctx, agx_index *cache, unsigned base, enum agx_size size)

8
src/etnaviv/drm/etnaviv_priv.h
View File

@@ -189,17 +189,17 @@ extern int etna_mesa_debug;
#define INFO_MSG(fmt, ...) \ #define INFO_MSG(fmt, ...) \
do { mesa_logi("%s:%d: " fmt, \ do { mesa_logi("%s:%d: " fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
#define DEBUG_MSG(fmt, ...) \ #define DEBUG_MSG(fmt, ...) \
do if (etna_mesa_debug & ETNA_DRM_MSGS) { \ do if (etna_mesa_debug & ETNA_DRM_MSGS) { \
mesa_logd("%s:%d: " fmt, \ mesa_logd("%s:%d: " fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
#define WARN_MSG(fmt, ...) \ #define WARN_MSG(fmt, ...) \
do { mesa_logw("%s:%d: " fmt, \ do { mesa_logw("%s:%d: " fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
#define ERROR_MSG(fmt, ...) \ #define ERROR_MSG(fmt, ...) \
do { mesa_loge("%s:%d: " fmt, \ do { mesa_loge("%s:%d: " fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
#define DEBUG_BO(msg, bo) \ #define DEBUG_BO(msg, bo) \
DEBUG_MSG("%s %p, va: 0x%.8x, size: 0x%.8x, flags: 0x%.8x, " \ DEBUG_MSG("%s %p, va: 0x%.8x, size: 0x%.8x, flags: 0x%.8x, " \

2
src/freedreno/decode/script.c
View File

@@ -46,7 +46,7 @@ static lua_State *L;
#if 0 #if 0
#define DBG(fmt, ...) \ #define DBG(fmt, ...) \
do { \ do { \
printf(" ** %s:%d ** " fmt "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); \ printf(" ** %s:%d ** " fmt "\n", __func__, __LINE__, ##__VA_ARGS__); \
} while (0) } while (0)
#else #else
#define DBG(fmt, ...) \ #define DBG(fmt, ...) \

8
src/freedreno/drm/freedreno_priv.h
View File

@@ -355,21 +355,21 @@ bool fd_dbg(void);
#define INFO_MSG(fmt, ...) \ #define INFO_MSG(fmt, ...) \
do { \ do { \
if (fd_dbg()) \ if (fd_dbg()) \
mesa_logi("%s:%d: " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ mesa_logi("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
} while (0) } while (0)
#define DEBUG_MSG(fmt, ...) \ #define DEBUG_MSG(fmt, ...) \
do \ do \
if (enable_debug) { \ if (enable_debug) { \
mesa_logd("%s:%d: " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ mesa_logd("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
} \ } \
while (0) while (0)
#define WARN_MSG(fmt, ...) \ #define WARN_MSG(fmt, ...) \
do { \ do { \
mesa_logw("%s:%d: " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ mesa_logw("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
} while (0) } while (0)
#define ERROR_MSG(fmt, ...) \ #define ERROR_MSG(fmt, ...) \
do { \ do { \
mesa_loge("%s:%d: " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ mesa_loge("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
} while (0) } while (0)
#define U642VOID(x) ((void *)(unsigned long)(x)) #define U642VOID(x) ((void *)(unsigned long)(x))

2
src/freedreno/ir3/ir3_context.h
View File

@@ -36,7 +36,7 @@
#define DBG(fmt, ...) \ #define DBG(fmt, ...) \
do { \ do { \
mesa_logd("%s:%d: " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \ mesa_logd("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
} while (0) } while (0)
/** /**

2
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -87,7 +87,7 @@ convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) {
if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \ if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \
fputs("pc: emit PC=( ", stderr); \ fputs("pc: emit PC=( ", stderr); \
anv_dump_pipe_bits(convert_pc_to_bits(&(pc))); \ anv_dump_pipe_bits(convert_pc_to_bits(&(pc))); \
fprintf(stderr, ") reason: %s\n", __FUNCTION__); \ fprintf(stderr, ") reason: %s\n", __func__); \
} }
static bool static bool

2
src/intel/vulkan_hasvk/genX_cmd_buffer.c
View File

@@ -87,7 +87,7 @@ convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) {
if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \ if (INTEL_DEBUG(DEBUG_PIPE_CONTROL)) { \
fputs("pc: emit PC=( ", stderr); \ fputs("pc: emit PC=( ", stderr); \
anv_dump_pipe_bits(convert_pc_to_bits(&(pc))); \ anv_dump_pipe_bits(convert_pc_to_bits(&(pc))); \
fprintf(stderr, ") reason: %s\n", __FUNCTION__); \ fprintf(stderr, ") reason: %s\n", __func__); \
} }
static bool static bool

2
src/mesa/state_tracker/st_format.c
View File

@@ -1247,7 +1247,7 @@ st_choose_format(struct st_context *st, GLenum internalFormat,
success: success:
if (0) { if (0) {
debug_printf("%s(fmt=%s, type=%s, intFmt=%s) = %s\n", debug_printf("%s(fmt=%s, type=%s, intFmt=%s) = %s\n",
__FUNCTION__, __func__,
_mesa_enum_to_string(format), _mesa_enum_to_string(format),
_mesa_enum_to_string(type), _mesa_enum_to_string(type),
_mesa_enum_to_string(internalFormat), _mesa_enum_to_string(internalFormat),

2
src/panfrost/bifrost/bifrost_compile.c
View File

@@ -70,7 +70,7 @@ int bifrost_debug = 0;
#define DBG(fmt, ...) \ #define DBG(fmt, ...) \
do { if (bifrost_debug & BIFROST_DBG_MSGS) \ do { if (bifrost_debug & BIFROST_DBG_MSGS) \
fprintf(stderr, "%s:%d: "fmt, \ fprintf(stderr, "%s:%d: "fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
static bi_block *emit_cf_list(bi_context *ctx, struct exec_list *list); static bi_block *emit_cf_list(bi_context *ctx, struct exec_list *list);

2
src/panfrost/midgard/midgard_compile.c
View File

@@ -68,7 +68,7 @@ int midgard_debug = 0;
#define DBG(fmt, ...) \ #define DBG(fmt, ...) \
do { if (midgard_debug & MIDGARD_DBG_MSGS) \ do { if (midgard_debug & MIDGARD_DBG_MSGS) \
fprintf(stderr, "%s:%d: "fmt, \ fprintf(stderr, "%s:%d: "fmt, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) __func__, __LINE__, ##__VA_ARGS__); } while (0)
static midgard_block * static midgard_block *
create_empty_block(compiler_context *ctx) create_empty_block(compiler_context *ctx)
{ {