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

Author: Mike Blumenkrantz <[email protected]>
Date:   Thu Mar 16 13:39:43 2023 -0400

zink: catch zs u_blitter ops for draw markers

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21962>

---

 src/gallium/drivers/zink/zink_draw.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_draw.cpp 
b/src/gallium/drivers/zink/zink_draw.cpp
index efea54904c8..7051c383e90 100644
--- a/src/gallium/drivers/zink/zink_draw.cpp
+++ b/src/gallium/drivers/zink/zink_draw.cpp
@@ -835,9 +835,10 @@ zink_draw(struct pipe_context *pctx,
          CLAMP(ctx->vp_state.viewport_states[0].translate[2] + 
ctx->vp_state.viewport_states[0].scale[2],
                0, 1)
       };
+      bool is_zs = 
util_format_is_depth_or_stencil(ctx->sampler_views[MESA_SHADER_FRAGMENT][0]->format);
       marker = zink_cmd_debug_marker_begin(ctx, VK_NULL_HANDLE, 
"u_blitter(%s->%s, %dx%d)",
                                            
util_format_short_name(ctx->sampler_views[MESA_SHADER_FRAGMENT][0]->format),
-                                           
util_format_short_name(ctx->fb_state.cbufs[0]->format),
+                                           util_format_short_name((is_zs ? 
ctx->fb_state.zsbuf : ctx->fb_state.cbufs[0])->format),
                                            lround(viewport.width), 
lround(viewport.height));
    }
 

Reply via email to