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

gallium: rename util_dump_* to util_str_* for enum-to-string conversion

Browse Source 
This is mostly mechanical search-and-replace, plus touching up the
macros in u_dump_defines.c manually a bit.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-07-27 11:40:25 +02:00
parent a677799e51
commit 16923e42a4
7 changed files with 99 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gallium/auxiliary/util/u_dump.h
View File

@@ -52,44 +52,40 @@ extern "C" {
/*
* p_defines.h
*
* XXX: These functions don't really dump anything -- just translate into
* strings so a verb better than "dump" should be used instead, in order to
* free up the namespace to the true dumper functions.
*/
const char *
util_dump_blend_factor(unsigned value, boolean shortened);
util_str_blend_factor(unsigned value, boolean shortened);
const char *
util_dump_blend_func(unsigned value, boolean shortened);
util_str_blend_func(unsigned value, boolean shortened);
const char *
util_dump_logicop(unsigned value, boolean shortened);
util_str_logicop(unsigned value, boolean shortened);
const char *
util_dump_func(unsigned value, boolean shortened);
util_str_func(unsigned value, boolean shortened);
const char *
util_dump_stencil_op(unsigned value, boolean shortened);
util_str_stencil_op(unsigned value, boolean shortened);
const char *
util_dump_tex_target(unsigned value, boolean shortened);
util_str_tex_target(unsigned value, boolean shortened);
const char *
util_dump_tex_wrap(unsigned value, boolean shortened);
util_str_tex_wrap(unsigned value, boolean shortened);
const char *
util_dump_tex_mipfilter(unsigned value, boolean shortened);
util_str_tex_mipfilter(unsigned value, boolean shortened);
const char *
util_dump_tex_filter(unsigned value, boolean shortened);
util_str_tex_filter(unsigned value, boolean shortened);
const char *
util_dump_query_type(unsigned value, boolean shortened);
util_str_query_type(unsigned value, boolean shortened);
const char *
util_dump_prim_mode(unsigned value, boolean shortened);
util_str_prim_mode(unsigned value, boolean shortened);
/*

88
src/gallium/auxiliary/util/u_dump_defines.c
View File

@@ -62,36 +62,36 @@ util_dump_enum_continuous(unsigned value,
}
#define DEFINE_UTIL_DUMP_CONTINUOUS(_name) \
#define DEFINE_UTIL_STR_CONTINUOUS(_name) \
const char * \
util_dump_##_name(unsigned value, boolean shortened) \
util_str_##_name(unsigned value, boolean shortened) \
{ \
if(shortened) \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_dump_##_name##_short_names), util_dump_##_name##_short_names); \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_##_name##_short_names), util_##_name##_short_names); \
else \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_dump_##_name##_names), util_dump_##_name##_names); \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_##_name##_names), util_##_name##_names); \
}
/**
* Same as DEFINE_UTIL_DUMP_CONTINUOUS but with static assertions to detect
* Same as DEFINE_UTIL_STR_CONTINUOUS but with static assertions to detect
* failures to update lists.
*/
#define DEFINE_UTIL_DUMP_CONTINUOUS_COUNT(_name, _count) \
#define DEFINE_UTIL_STR_CONTINUOUS_COUNT(_name, _count) \
const char * \
util_dump_##_name(unsigned value, boolean shortened) \
util_str_##_name(unsigned value, boolean shortened) \
{ \
STATIC_ASSERT(ARRAY_SIZE(util_dump_##_name##_names) == _count); \
STATIC_ASSERT(ARRAY_SIZE(util_dump_##_name##_short_names) == _count); \
STATIC_ASSERT(ARRAY_SIZE(util_##_name##_names) == _count); \
STATIC_ASSERT(ARRAY_SIZE(util_##_name##_short_names) == _count); \
if(shortened) \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_dump_##_name##_short_names), util_dump_##_name##_short_names); \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_##_name##_short_names), util_##_name##_short_names); \
else \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_dump_##_name##_names), util_dump_##_name##_names); \
return util_dump_enum_continuous(value, ARRAY_SIZE(util_##_name##_names), util_##_name##_names); \
}
static const char *
util_dump_blend_factor_names[] = {
util_blend_factor_names[] = {
UTIL_DUMP_INVALID_NAME, /* 0x0 */
"PIPE_BLENDFACTOR_ONE",
"PIPE_BLENDFACTOR_SRC_COLOR",
@@ -122,7 +122,7 @@ util_dump_blend_factor_names[] = {
};
static const char *
util_dump_blend_factor_short_names[] = {
util_blend_factor_short_names[] = {
UTIL_DUMP_INVALID_NAME, /* 0x0 */
"one",
"src_color",
@@ -152,11 +152,11 @@ util_dump_blend_factor_short_names[] = {
"inv_src1_alpha"
};
DEFINE_UTIL_DUMP_CONTINUOUS(blend_factor)
DEFINE_UTIL_STR_CONTINUOUS(blend_factor)
static const char *
util_dump_blend_func_names[] = {
util_blend_func_names[] = {
"PIPE_BLEND_ADD",
"PIPE_BLEND_SUBTRACT",
"PIPE_BLEND_REVERSE_SUBTRACT",
@@ -165,7 +165,7 @@ util_dump_blend_func_names[] = {
};
static const char *
util_dump_blend_func_short_names[] = {
util_blend_func_short_names[] = {
"add",
"sub",
"rev_sub",
@@ -173,11 +173,11 @@ util_dump_blend_func_short_names[] = {
"max"
};
DEFINE_UTIL_DUMP_CONTINUOUS(blend_func)
DEFINE_UTIL_STR_CONTINUOUS(blend_func)
static const char *
util_dump_logicop_names[] = {
util_logicop_names[] = {
"PIPE_LOGICOP_CLEAR",
"PIPE_LOGICOP_NOR",
"PIPE_LOGICOP_AND_INVERTED",
@@ -197,7 +197,7 @@ util_dump_logicop_names[] = {
};
static const char *
util_dump_logicop_short_names[] = {
util_logicop_short_names[] = {
"clear",
"nor",
"and_inverted",
@@ -216,11 +216,11 @@ util_dump_logicop_short_names[] = {
"set"
};
DEFINE_UTIL_DUMP_CONTINUOUS(logicop)
DEFINE_UTIL_STR_CONTINUOUS(logicop)
static const char *
util_dump_func_names[] = {
util_func_names[] = {
"PIPE_FUNC_NEVER",
"PIPE_FUNC_LESS",
"PIPE_FUNC_EQUAL",
@@ -232,7 +232,7 @@ util_dump_func_names[] = {
};
static const char *
util_dump_func_short_names[] = {
util_func_short_names[] = {
"never",
"less",
"equal",
@@ -243,11 +243,11 @@ util_dump_func_short_names[] = {
"always"
};
DEFINE_UTIL_DUMP_CONTINUOUS(func)
DEFINE_UTIL_STR_CONTINUOUS(func)
static const char *
util_dump_stencil_op_names[] = {
util_stencil_op_names[] = {
"PIPE_STENCIL_OP_KEEP",
"PIPE_STENCIL_OP_ZERO",
"PIPE_STENCIL_OP_REPLACE",
@@ -259,7 +259,7 @@ util_dump_stencil_op_names[] = {
};
static const char *
util_dump_stencil_op_short_names[] = {
util_stencil_op_short_names[] = {
"keep",
"zero",
"replace",
@@ -270,11 +270,11 @@ util_dump_stencil_op_short_names[] = {
"invert"
};
DEFINE_UTIL_DUMP_CONTINUOUS(stencil_op)
DEFINE_UTIL_STR_CONTINUOUS(stencil_op)
static const char *
util_dump_tex_target_names[] = {
util_tex_target_names[] = {
"PIPE_BUFFER",
"PIPE_TEXTURE_1D",
"PIPE_TEXTURE_2D",
@@ -287,7 +287,7 @@ util_dump_tex_target_names[] = {
};
static const char *
util_dump_tex_target_short_names[] = {
util_tex_target_short_names[] = {
"buffer",
"1d",
"2d",
@@ -299,11 +299,11 @@ util_dump_tex_target_short_names[] = {
"cube_array",
};
DEFINE_UTIL_DUMP_CONTINUOUS_COUNT(tex_target, PIPE_MAX_TEXTURE_TYPES)
DEFINE_UTIL_STR_CONTINUOUS_COUNT(tex_target, PIPE_MAX_TEXTURE_TYPES)
static const char *
util_dump_tex_wrap_names[] = {
util_tex_wrap_names[] = {
"PIPE_TEX_WRAP_REPEAT",
"PIPE_TEX_WRAP_CLAMP",
"PIPE_TEX_WRAP_CLAMP_TO_EDGE",
@@ -315,7 +315,7 @@ util_dump_tex_wrap_names[] = {
};
static const char *
util_dump_tex_wrap_short_names[] = {
util_tex_wrap_short_names[] = {
"repeat",
"clamp",
"clamp_to_edge",
@@ -326,43 +326,43 @@ util_dump_tex_wrap_short_names[] = {
"mirror_clamp_to_border"
};
DEFINE_UTIL_DUMP_CONTINUOUS(tex_wrap)
DEFINE_UTIL_STR_CONTINUOUS(tex_wrap)
static const char *
util_dump_tex_mipfilter_names[] = {
util_tex_mipfilter_names[] = {
"PIPE_TEX_MIPFILTER_NEAREST",
"PIPE_TEX_MIPFILTER_LINEAR",
"PIPE_TEX_MIPFILTER_NONE"
};
static const char *
util_dump_tex_mipfilter_short_names[] = {
util_tex_mipfilter_short_names[] = {
"nearest",
"linear",
"none"
};
DEFINE_UTIL_DUMP_CONTINUOUS(tex_mipfilter)
DEFINE_UTIL_STR_CONTINUOUS(tex_mipfilter)
static const char *
util_dump_tex_filter_names[] = {
util_tex_filter_names[] = {
"PIPE_TEX_FILTER_NEAREST",
"PIPE_TEX_FILTER_LINEAR"
};
static const char *
util_dump_tex_filter_short_names[] = {
util_tex_filter_short_names[] = {
"nearest",
"linear"
};
DEFINE_UTIL_DUMP_CONTINUOUS(tex_filter)
DEFINE_UTIL_STR_CONTINUOUS(tex_filter)
static const char *
util_dump_query_type_names[] = {
util_query_type_names[] = {
"PIPE_QUERY_OCCLUSION_COUNTER",
"PIPE_QUERY_OCCLUSION_PREDICATE",
"PIPE_QUERY_TIMESTAMP",
@@ -378,7 +378,7 @@ util_dump_query_type_names[] = {
};
static const char *
util_dump_query_type_short_names[] = {
util_query_type_short_names[] = {
"occlusion_counter",
"occlusion_predicate",
"timestamp",
@@ -392,11 +392,11 @@ util_dump_query_type_short_names[] = {
"pipeline_statistics",
};
DEFINE_UTIL_DUMP_CONTINUOUS(query_type)
DEFINE_UTIL_STR_CONTINUOUS(query_type)
static const char *
util_dump_prim_mode_names[] = {
util_prim_mode_names[] = {
"PIPE_PRIM_POINTS",
"PIPE_PRIM_LINES",
"PIPE_PRIM_LINE_LOOP",
@@ -415,7 +415,7 @@ util_dump_prim_mode_names[] = {
};
static const char *
util_dump_prim_mode_short_names[] = {
util_prim_mode_short_names[] = {
"points",
"lines",
"line_loop",
@@ -433,4 +433,4 @@ util_dump_prim_mode_short_names[] = {
"patches",
};
DEFINE_UTIL_DUMP_CONTINUOUS(prim_mode)
DEFINE_UTIL_STR_CONTINUOUS(prim_mode)

18
src/gallium/auxiliary/util/u_dump_state.c
View File

@@ -232,55 +232,55 @@ util_dump_format(FILE *stream, enum pipe_format format)
static void
util_dump_enum_blend_factor(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_blend_factor(value, TRUE));
util_dump_enum(stream, util_str_blend_factor(value, TRUE));
}
static void
util_dump_enum_blend_func(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_blend_func(value, TRUE));
util_dump_enum(stream, util_str_blend_func(value, TRUE));
}
static void
util_dump_enum_func(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_func(value, TRUE));
util_dump_enum(stream, util_str_func(value, TRUE));
}
static void
util_dump_enum_prim_mode(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_prim_mode(value, TRUE));
util_dump_enum(stream, util_str_prim_mode(value, TRUE));
}
static void
util_dump_enum_tex_target(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_tex_target(value, TRUE));
util_dump_enum(stream, util_str_tex_target(value, TRUE));
}
static void
util_dump_enum_tex_filter(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_tex_filter(value, TRUE));
util_dump_enum(stream, util_str_tex_filter(value, TRUE));
}
static void
util_dump_enum_tex_mipfilter(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_tex_mipfilter(value, TRUE));
util_dump_enum(stream, util_str_tex_mipfilter(value, TRUE));
}
static void
util_dump_enum_tex_wrap(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_tex_wrap(value, TRUE));
util_dump_enum(stream, util_str_tex_wrap(value, TRUE));
}
static void
util_dump_enum_stencil_op(FILE *stream, unsigned value)
{
util_dump_enum(stream, util_dump_stencil_op(value, TRUE));
util_dump_enum(stream, util_str_stencil_op(value, TRUE));
}

2
src/gallium/drivers/ddebug/dd_draw.c
View File

@@ -186,7 +186,7 @@ util_dump_query(FILE *f, struct dd_query *query)
fprintf(f, "PIPE_QUERY_DRIVER_SPECIFIC + %i",
query->type - PIPE_QUERY_DRIVER_SPECIFIC);
else
fprintf(f, "%s", util_dump_query_type(query->type, false));
fprintf(f, "%s", util_str_query_type(query->type, false));
}
static void

42
src/gallium/drivers/llvmpipe/lp_state_fs.c
View File

@@ -2679,23 +2679,23 @@ dump_fs_variant_key(const struct lp_fragment_shader_variant_key *key)
debug_printf("depth.format = %s\n", util_format_name(key->zsbuf_format));
}
if (key->depth.enabled) {
debug_printf("depth.func = %s\n", util_dump_func(key->depth.func, TRUE));
debug_printf("depth.func = %s\n", util_str_func(key->depth.func, TRUE));
debug_printf("depth.writemask = %u\n", key->depth.writemask);
}
for (i = 0; i < 2; ++i) {
if (key->stencil[i].enabled) {
debug_printf("stencil[%u].func = %s\n", i, util_dump_func(key->stencil[i].func, TRUE));
debug_printf("stencil[%u].fail_op = %s\n", i, util_dump_stencil_op(key->stencil[i].fail_op, TRUE));
debug_printf("stencil[%u].zpass_op = %s\n", i, util_dump_stencil_op(key->stencil[i].zpass_op, TRUE));
debug_printf("stencil[%u].zfail_op = %s\n", i, util_dump_stencil_op(key->stencil[i].zfail_op, TRUE));
debug_printf("stencil[%u].func = %s\n", i, util_str_func(key->stencil[i].func, TRUE));
debug_printf("stencil[%u].fail_op = %s\n", i, util_str_stencil_op(key->stencil[i].fail_op, TRUE));
debug_printf("stencil[%u].zpass_op = %s\n", i, util_str_stencil_op(key->stencil[i].zpass_op, TRUE));
debug_printf("stencil[%u].zfail_op = %s\n", i, util_str_stencil_op(key->stencil[i].zfail_op, TRUE));
debug_printf("stencil[%u].valuemask = 0x%x\n", i, key->stencil[i].valuemask);
debug_printf("stencil[%u].writemask = 0x%x\n", i, key->stencil[i].writemask);
}
}
if (key->alpha.enabled) {
debug_printf("alpha.func = %s\n", util_dump_func(key->alpha.func, TRUE));
debug_printf("alpha.func = %s\n", util_str_func(key->alpha.func, TRUE));
}
if (key->occlusion_count) {
@@ -2703,15 +2703,15 @@ dump_fs_variant_key(const struct lp_fragment_shader_variant_key *key)
}
if (key->blend.logicop_enable) {
debug_printf("blend.logicop_func = %s\n", util_dump_logicop(key->blend.logicop_func, TRUE));
debug_printf("blend.logicop_func = %s\n", util_str_logicop(key->blend.logicop_func, TRUE));
}
else if (key->blend.rt[0].blend_enable) {
debug_printf("blend.rgb_func = %s\n", util_dump_blend_func (key->blend.rt[0].rgb_func, TRUE));
debug_printf("blend.rgb_src_factor = %s\n", util_dump_blend_factor(key->blend.rt[0].rgb_src_factor, TRUE));
debug_printf("blend.rgb_dst_factor = %s\n", util_dump_blend_factor(key->blend.rt[0].rgb_dst_factor, TRUE));
debug_printf("blend.alpha_func = %s\n", util_dump_blend_func (key->blend.rt[0].alpha_func, TRUE));
debug_printf("blend.alpha_src_factor = %s\n", util_dump_blend_factor(key->blend.rt[0].alpha_src_factor, TRUE));
debug_printf("blend.alpha_dst_factor = %s\n", util_dump_blend_factor(key->blend.rt[0].alpha_dst_factor, TRUE));
debug_printf("blend.rgb_func = %s\n", util_str_blend_func (key->blend.rt[0].rgb_func, TRUE));
debug_printf("blend.rgb_src_factor = %s\n", util_str_blend_factor(key->blend.rt[0].rgb_src_factor, TRUE));
debug_printf("blend.rgb_dst_factor = %s\n", util_str_blend_factor(key->blend.rt[0].rgb_dst_factor, TRUE));
debug_printf("blend.alpha_func = %s\n", util_str_blend_func (key->blend.rt[0].alpha_func, TRUE));
debug_printf("blend.alpha_src_factor = %s\n", util_str_blend_factor(key->blend.rt[0].alpha_src_factor, TRUE));
debug_printf("blend.alpha_dst_factor = %s\n", util_str_blend_factor(key->blend.rt[0].alpha_dst_factor, TRUE));
}
debug_printf("blend.colormask = 0x%x\n", key->blend.rt[0].colormask);
if (key->blend.alpha_to_coverage) {
@@ -2721,17 +2721,17 @@ dump_fs_variant_key(const struct lp_fragment_shader_variant_key *key)
const struct lp_static_sampler_state *sampler = &key->state[i].sampler_state;
debug_printf("sampler[%u] = \n", i);
debug_printf(" .wrap = %s %s %s\n",
util_dump_tex_wrap(sampler->wrap_s, TRUE),
util_dump_tex_wrap(sampler->wrap_t, TRUE),
util_dump_tex_wrap(sampler->wrap_r, TRUE));
util_str_tex_wrap(sampler->wrap_s, TRUE),
util_str_tex_wrap(sampler->wrap_t, TRUE),
util_str_tex_wrap(sampler->wrap_r, TRUE));
debug_printf(" .min_img_filter = %s\n",
util_dump_tex_filter(sampler->min_img_filter, TRUE));
util_str_tex_filter(sampler->min_img_filter, TRUE));
debug_printf(" .min_mip_filter = %s\n",
util_dump_tex_mipfilter(sampler->min_mip_filter, TRUE));
util_str_tex_mipfilter(sampler->min_mip_filter, TRUE));
debug_printf(" .mag_img_filter = %s\n",
util_dump_tex_filter(sampler->mag_img_filter, TRUE));
util_str_tex_filter(sampler->mag_img_filter, TRUE));
if (sampler->compare_mode != PIPE_TEX_COMPARE_NONE)
debug_printf(" .compare_func = %s\n", util_dump_func(sampler->compare_func, TRUE));
debug_printf(" .compare_func = %s\n", util_str_func(sampler->compare_func, TRUE));
debug_printf(" .normalized_coords = %u\n", sampler->normalized_coords);
debug_printf(" .min_max_lod_equal = %u\n", sampler->min_max_lod_equal);
debug_printf(" .lod_bias_non_zero = %u\n", sampler->lod_bias_non_zero);
@@ -2744,7 +2744,7 @@ dump_fs_variant_key(const struct lp_fragment_shader_variant_key *key)
debug_printf(" .format = %s\n",
util_format_name(texture->format));
debug_printf(" .target = %s\n",
util_dump_tex_target(texture->target, TRUE));
util_str_tex_target(texture->target, TRUE));
debug_printf(" .level_zero_only = %u\n",
texture->level_zero_only);
debug_printf(" .pot = %u %u %u\n",

24
src/gallium/drivers/llvmpipe/lp_test_blend.c
View File

@@ -95,12 +95,12 @@ write_tsv_row(FILE *fp,
fprintf(fp,
"%s\t%s\t%s\t%s\t%s\t%s\n",
util_dump_blend_func(blend->rt[0].rgb_func, TRUE),
util_dump_blend_factor(blend->rt[0].rgb_src_factor, TRUE),
util_dump_blend_factor(blend->rt[0].rgb_dst_factor, TRUE),
util_dump_blend_func(blend->rt[0].alpha_func, TRUE),
util_dump_blend_factor(blend->rt[0].alpha_src_factor, TRUE),
util_dump_blend_factor(blend->rt[0].alpha_dst_factor, TRUE));
util_str_blend_func(blend->rt[0].rgb_func, TRUE),
util_str_blend_factor(blend->rt[0].rgb_src_factor, TRUE),
util_str_blend_factor(blend->rt[0].rgb_dst_factor, TRUE),
util_str_blend_func(blend->rt[0].alpha_func, TRUE),
util_str_blend_factor(blend->rt[0].alpha_src_factor, TRUE),
util_str_blend_factor(blend->rt[0].alpha_dst_factor, TRUE));
fflush(fp);
}
@@ -119,12 +119,12 @@ dump_blend_type(FILE *fp,
fprintf(fp,
" %s=%s %s=%s %s=%s %s=%s %s=%s %s=%s",
"rgb_func", util_dump_blend_func(blend->rt[0].rgb_func, TRUE),
"rgb_src_factor", util_dump_blend_factor(blend->rt[0].rgb_src_factor, TRUE),
"rgb_dst_factor", util_dump_blend_factor(blend->rt[0].rgb_dst_factor, TRUE),
"alpha_func", util_dump_blend_func(blend->rt[0].alpha_func, TRUE),
"alpha_src_factor", util_dump_blend_factor(blend->rt[0].alpha_src_factor, TRUE),
"alpha_dst_factor", util_dump_blend_factor(blend->rt[0].alpha_dst_factor, TRUE));
"rgb_func", util_str_blend_func(blend->rt[0].rgb_func, TRUE),
"rgb_src_factor", util_str_blend_factor(blend->rt[0].rgb_src_factor, TRUE),
"rgb_dst_factor", util_str_blend_factor(blend->rt[0].rgb_dst_factor, TRUE),
"alpha_func", util_str_blend_func(blend->rt[0].alpha_func, TRUE),
"alpha_src_factor", util_str_blend_factor(blend->rt[0].alpha_src_factor, TRUE),
"alpha_dst_factor", util_str_blend_factor(blend->rt[0].alpha_dst_factor, TRUE));
fprintf(fp, " ...\n");
fflush(fp);

2
src/gallium/drivers/trace/tr_dump_defines.h
View File

@@ -50,7 +50,7 @@ trace_dump_query_type(unsigned value)
if (!trace_dumping_enabled_locked())
return;
trace_dump_enum(util_dump_query_type(value, FALSE));
trace_dump_enum(util_str_query_type(value, FALSE));
}