fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

aux/trace: fix sampler view dumping

Browse source 
this should just dump the samplerview target, not the resource target too

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16546>
This commit is contained in:
Mike Blumenkrantz 2022-05-13 12:29:24 -04:00 • committed by Marge Bot
parent 20427d01ac
commit c90c742344
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/driver_trace/tr_context.c
View file

@ -1070,7 +1070,7 @@ trace_context_create_sampler_view(struct pipe_context *_pipe,
trace_dump_arg(ptr, resource);
trace_dump_arg_begin("templ");
trace_dump_sampler_view_template(templ, resource->target);
trace_dump_sampler_view_template(templ);
trace_dump_arg_end();
result = pipe->create_sampler_view(pipe, resource, templ);

10
src/gallium/auxiliary/driver_trace/tr_dump_state.c
View file

@ -544,8 +544,7 @@ void trace_dump_sampler_state(const struct pipe_sampler_state *state)
}
void trace_dump_sampler_view_template(const struct pipe_sampler_view *state,
enum pipe_texture_target target)
void trace_dump_sampler_view_template(const struct pipe_sampler_view *state)
{
if (!trace_dumping_enabled_locked())
return;
@ -558,15 +557,16 @@ void trace_dump_sampler_view_template(const struct pipe_sampler_view *state,
trace_dump_struct_begin("pipe_sampler_view");
trace_dump_member(format, state, format);
trace_dump_member(ptr, state, texture);
trace_dump_member_begin("target");
trace_dump_enum(tr_util_pipe_texture_target_name(target));
trace_dump_enum(tr_util_pipe_texture_target_name(state->target));
trace_dump_member_end();
trace_dump_member(ptr, state, texture);
trace_dump_member_begin("u");
trace_dump_struct_begin(""); /* anonymous */
if (target == PIPE_BUFFER) {
if (state->target == PIPE_BUFFER) {
trace_dump_member_begin("buf");
trace_dump_struct_begin(""); /* anonymous */
trace_dump_member(uint, &state->u.buf, offset);

3
src/gallium/auxiliary/driver_trace/tr_dump_state.h
View file

@ -66,8 +66,7 @@ void trace_dump_framebuffer_state_deep(const struct pipe_framebuffer_state *stat
void trace_dump_sampler_state(const struct pipe_sampler_state *state);
void trace_dump_sampler_view_template(const struct pipe_sampler_view *view,
enum pipe_texture_target target);
void trace_dump_sampler_view_template(const struct pipe_sampler_view *view);
void trace_dump_surface(const struct pipe_surface *surface);