From 9ff20e23fed6f4e4bb9e3b0f6653ed9aca413180 Mon Sep 17 00:00:00 2001 From: Julia Tatz Date: Sat, 29 Jul 2023 15:26:53 -0400 Subject: [PATCH] aux/trace: deduplicate enum dump macro work Part-of: --- .../auxiliary/driver_trace/tr_context.c | 10 ++++---- src/gallium/auxiliary/driver_trace/tr_dump.h | 8 +++---- .../auxiliary/driver_trace/tr_dump_state.c | 24 +++++++------------ .../auxiliary/driver_trace/tr_screen.c | 24 +++++++++---------- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/gallium/auxiliary/driver_trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c index fb9bde7aafa..58e1df85797 100644 --- a/src/gallium/auxiliary/driver_trace/tr_context.c +++ b/src/gallium/auxiliary/driver_trace/tr_context.c @@ -510,7 +510,7 @@ trace_context_bind_sampler_states(struct pipe_context *_pipe, trace_dump_call_begin("pipe_context", "bind_sampler_states"); trace_dump_arg(ptr, pipe); - trace_dump_arg_enum(shader, tr_util_pipe_shader_type_name(shader)); + trace_dump_arg_enum(pipe_shader_type, shader); trace_dump_arg(uint, start); trace_dump_arg(uint, num_states); trace_dump_arg_array(ptr, states, num_states); @@ -956,7 +956,7 @@ trace_context_set_constant_buffer(struct pipe_context *_pipe, trace_dump_call_begin("pipe_context", "set_constant_buffer"); trace_dump_arg(ptr, pipe); - trace_dump_arg_enum(shader, tr_util_pipe_shader_type_name(shader)); + trace_dump_arg_enum(pipe_shader_type, shader); trace_dump_arg(uint, index); trace_dump_arg(bool, take_ownership); trace_dump_arg(constant_buffer, constant_buffer); @@ -999,7 +999,7 @@ trace_context_set_inlinable_constants(struct pipe_context *_pipe, enum pipe_shad trace_dump_call_begin("pipe_context", "set_inlinable_constants"); trace_dump_arg(ptr, pipe); - trace_dump_arg_enum(shader, tr_util_pipe_shader_type_name(shader)); + trace_dump_arg_enum(pipe_shader_type, shader); trace_dump_arg(uint, num_values); trace_dump_arg_array(uint, values, num_values); @@ -1244,7 +1244,7 @@ trace_context_set_sampler_views(struct pipe_context *_pipe, trace_dump_call_begin("pipe_context", "set_sampler_views"); trace_dump_arg(ptr, pipe); - trace_dump_arg_enum(shader, tr_util_pipe_shader_type_name(shader)); + trace_dump_arg_enum(pipe_shader_type, shader); trace_dump_arg(uint, start); trace_dump_arg(uint, num); trace_dump_arg(uint, unbind_num_trailing_slots); @@ -1625,7 +1625,7 @@ trace_context_create_fence_fd(struct pipe_context *_pipe, trace_dump_call_begin("pipe_context", "create_fence_fd"); trace_dump_arg(ptr, pipe); - trace_dump_arg_enum(fd, tr_util_pipe_fd_type_name(fd)); + trace_dump_arg_enum(pipe_fd_type, fd); trace_dump_arg(uint, type); pipe->create_fence_fd(pipe, fence, fd, type); diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h index b61e1076a31..7fbd3cb58bd 100644 --- a/src/gallium/auxiliary/driver_trace/tr_dump.h +++ b/src/gallium/auxiliary/driver_trace/tr_dump.h @@ -124,10 +124,10 @@ bool trace_dump_is_triggered(void); trace_dump_arg_end(); \ } while(0) -#define trace_dump_arg_enum(_arg, _value) \ +#define trace_dump_arg_enum(_type, _arg) \ do { \ trace_dump_arg_begin(#_arg); \ - trace_dump_enum(_value); \ + trace_dump_enum(tr_util_##_type##_name(_arg)); \ trace_dump_arg_end(); \ } while(0) @@ -191,10 +191,10 @@ bool trace_dump_is_triggered(void); } while(0) -#define trace_dump_member_enum(_obj, _member, _value) \ +#define trace_dump_member_enum(_type, _obj, _member) \ do { \ trace_dump_member_begin(#_member); \ - trace_dump_enum(_value); \ + trace_dump_enum(tr_util_##_type##_name((_obj)->_member)); \ trace_dump_member_end(); \ } while(0) diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c index 676e8e5c731..08b2d21b35c 100644 --- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c +++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c @@ -49,10 +49,7 @@ void trace_dump_resource_template(const struct pipe_resource *templat) trace_dump_struct_begin("pipe_resource"); - trace_dump_member_begin("target"); - trace_dump_enum(tr_util_pipe_texture_target_name(templat->target)); - trace_dump_member_end(); - + trace_dump_member_enum(pipe_texture_target, templat, target); trace_dump_member(format, templat, format); trace_dump_member_begin("width"); @@ -405,13 +402,13 @@ static void trace_dump_rt_blend_state(const struct pipe_rt_blend_state *state) trace_dump_member(uint, state, blend_enable); - trace_dump_member_enum(state, rgb_func, tr_util_pipe_blend_func_name(state->rgb_func)); - trace_dump_member_enum(state, rgb_src_factor, tr_util_pipe_blendfactor_name(state->rgb_src_factor)); - trace_dump_member_enum(state, rgb_dst_factor, tr_util_pipe_blendfactor_name(state->rgb_dst_factor)); + trace_dump_member_enum(pipe_blend_func, state, rgb_func); + trace_dump_member_enum(pipe_blendfactor, state, rgb_src_factor); + trace_dump_member_enum(pipe_blendfactor, state, rgb_dst_factor); - trace_dump_member_enum(state, alpha_func, tr_util_pipe_blend_func_name(state->alpha_func)); - trace_dump_member_enum(state, alpha_src_factor, tr_util_pipe_blendfactor_name(state->alpha_src_factor)); - trace_dump_member_enum(state, alpha_dst_factor, tr_util_pipe_blendfactor_name(state->alpha_dst_factor)); + trace_dump_member_enum(pipe_blend_func, state, alpha_func); + trace_dump_member_enum(pipe_blendfactor, state, alpha_src_factor); + trace_dump_member_enum(pipe_blendfactor, state, alpha_dst_factor); trace_dump_member(uint, state, colormask); @@ -434,7 +431,7 @@ void trace_dump_blend_state(const struct pipe_blend_state *state) trace_dump_member(bool, state, independent_blend_enable); trace_dump_member(bool, state, logicop_enable); - trace_dump_member_enum(state, logicop_func, tr_util_pipe_logicop_name(state->logicop_func)); + trace_dump_member_enum(pipe_logicop, state, logicop_func); trace_dump_member(bool, state, dither); trace_dump_member(bool, state, alpha_to_coverage); trace_dump_member(bool, state, alpha_to_coverage_dither); @@ -570,10 +567,7 @@ void trace_dump_sampler_view_template(const struct pipe_sampler_view *state) trace_dump_member(format, state, format); - trace_dump_member_begin("target"); - trace_dump_enum(tr_util_pipe_texture_target_name(state->target)); - trace_dump_member_end(); - + trace_dump_member_enum(pipe_texture_target, state, target); trace_dump_member(ptr, state, texture); trace_dump_member_begin("u"); diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index 24e530c57e9..fc1d8b4f6ef 100644 --- a/src/gallium/auxiliary/driver_trace/tr_screen.c +++ b/src/gallium/auxiliary/driver_trace/tr_screen.c @@ -117,8 +117,8 @@ trace_screen_get_compiler_options(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_compiler_options"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(ir, tr_util_pipe_shader_ir_name(ir)); - trace_dump_arg_enum(shader, tr_util_pipe_shader_type_name(shader)); + trace_dump_arg_enum(pipe_shader_ir, ir); + trace_dump_arg_enum(pipe_shader_type, shader); result = screen->get_compiler_options(screen, ir, shader); @@ -161,7 +161,7 @@ trace_screen_get_param(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_param"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(param, tr_util_pipe_cap_name(param)); + trace_dump_arg_enum(pipe_cap, param); result = screen->get_param(screen, param); @@ -185,8 +185,8 @@ trace_screen_get_shader_param(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_shader_param"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(shader, tr_util_pipe_shader_type_name(shader)); - trace_dump_arg_enum(param, tr_util_pipe_shader_cap_name(param)); + trace_dump_arg_enum(pipe_shader_type, shader); + trace_dump_arg_enum(pipe_shader_cap, param); result = screen->get_shader_param(screen, shader, param); @@ -209,7 +209,7 @@ trace_screen_get_paramf(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_paramf"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(param, tr_util_pipe_capf_name(param)); + trace_dump_arg_enum(pipe_capf, param); result = screen->get_paramf(screen, param); @@ -234,8 +234,8 @@ trace_screen_get_compute_param(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_compute_param"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(ir_type, tr_util_pipe_shader_ir_name(ir_type)); - trace_dump_arg_enum(param, tr_util_pipe_compute_cap_name(param)); + trace_dump_arg_enum(pipe_shader_ir, ir_type); + trace_dump_arg_enum(pipe_compute_cap, param); trace_dump_arg(ptr, data); result = screen->get_compute_param(screen, ir_type, param, data); @@ -264,7 +264,7 @@ trace_screen_is_format_supported(struct pipe_screen *_screen, trace_dump_arg(ptr, screen); trace_dump_arg(format, format); - trace_dump_arg_enum(target, tr_util_pipe_texture_target_name(target)); + trace_dump_arg_enum(pipe_texture_target, target); trace_dump_arg(uint, sample_count); trace_dump_arg(uint, storage_sample_count); trace_dump_arg(uint, tex_usage); @@ -858,7 +858,7 @@ trace_screen_resource_get_param(struct pipe_screen *_screen, trace_dump_arg(uint, plane); trace_dump_arg(uint, layer); trace_dump_arg(uint, level); - trace_dump_arg_enum(param, tr_util_pipe_resource_param_name(param)); + trace_dump_arg_enum(pipe_resource_param, param); trace_dump_arg(uint, handle_usage); result = screen->resource_get_param(screen, pipe, @@ -1021,7 +1021,7 @@ trace_screen_create_fence_win32(struct pipe_screen *_screen, trace_dump_arg(ptr, *fence); trace_dump_arg(ptr, handle); trace_dump_arg(ptr, name); - trace_dump_arg_enum(type, tr_util_pipe_fd_type_name(type)); + trace_dump_arg_enum(pipe_fd_type, type); trace_dump_call_end(); @@ -1281,7 +1281,7 @@ trace_screen_get_sparse_texture_virtual_page_size(struct pipe_screen *_screen, trace_dump_call_begin("pipe_screen", "get_sparse_texture_virtual_page_size"); trace_dump_arg(ptr, screen); - trace_dump_arg_enum(target, tr_util_pipe_texture_target_name(target)); + trace_dump_arg_enum(pipe_texture_target, target); trace_dump_arg(format, format); trace_dump_arg(uint, offset); trace_dump_arg(uint, size);