Mesa (main): aux/trace: fix sampler view dumping

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c90c74234454094aeb358216d69552868593d6f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c90c74234454094aeb358216d69552868593d6f9

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 13 12:29:24 2022 -0400

aux/trace: fix sampler view dumping

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

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16546>

---

 src/gallium/auxiliary/driver_trace/tr_context.c    |  2 +-
 src/gallium/auxiliary/driver_trace/tr_dump_state.c | 10 +++++-----
 src/gallium/auxiliary/driver_trace/tr_dump_state.h |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/gallium/auxiliary/driver_trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c
index 92a926aeeca..f280942e31c 100644
--- a/src/gallium/auxiliary/driver_trace/tr_context.c
+++ b/src/gallium/auxiliary/driver_trace/tr_context.c
@@ -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);
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
index 8c227a5d178..c3b8b3ff0da 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
@@ -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);
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.h b/src/gallium/auxiliary/driver_trace/tr_dump_state.h
index cef8a8274c7..cb0fc5a82d3 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.h
@@ -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);