Import Mesa 21.1.5

1 files changed, 7 insertions, 18 deletions

diff --git a/lib/mesa/src/gallium/drivers/zink/zink_render_pass.h b/lib/mesa/src/gallium/drivers/zink/zink_render_pass.h
index 2da246ee8..02dc21194 100644
--- a/lib/mesa/src/gallium/drivers/zink/zink_render_pass.h
+++ b/lib/mesa/src/gallium/drivers/zink/zink_render_pass.h
@@ -34,18 +34,23 @@ struct zink_screen;
 struct zink_rt_attrib {
   VkFormat format;
   VkSampleCountFlagBits samples;
+  bool clear_color;
+  bool clear_stencil;
 };
 
 struct zink_render_pass_state {
    uint8_t num_cbufs : 4; /* PIPE_MAX_COLOR_BUFS = 8 */
    uint8_t have_zsbuf : 1;
    struct zink_rt_attrib rts[PIPE_MAX_COLOR_BUFS + 1];
+   unsigned num_rts;
+#ifndef NDEBUG
+   uint32_t clears; //for extra verification
+#endif
 };
 
 struct zink_render_pass {
-   struct pipe_reference reference;
-
    VkRenderPass render_pass;
+   struct zink_render_pass_state state;
 };
 
 struct zink_render_pass *
@@ -56,20 +61,4 @@ void
 zink_destroy_render_pass(struct zink_screen *screen,
                          struct zink_render_pass *rp);
 
-void
-debug_describe_zink_render_pass(char* buf, const struct zink_render_pass *ptr);
-
-static inline void
-zink_render_pass_reference(struct zink_screen *screen,
-                           struct zink_render_pass **dst,
-                           struct zink_render_pass *src)
-{
-   struct zink_render_pass *old_dst = *dst;
-
-   if (pipe_reference_described(&old_dst->reference, &src->reference,
-                                (debug_reference_descriptor)debug_describe_zink_render_pass))
-      zink_destroy_render_pass(screen, old_dst);
-   *dst = src;
-}
-
 #endif