panfrost: Add Valhall fields to panfrost_batch

There are new data structures that we need to (dirty) track. Add the
corresponding fields so we can proceed as with Bifrost dirty tracking.

Trivial increase in memory usage, but that should not matter as batches are
few.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15797>

diff --git a/src/gallium/drivers/panfrost/pan_job.h b/src/gallium/drivers/panfrost/pan_job.h
index 03f6337f9e42002af9f5641c7e2341aa70ccbd86..a905ec028f64a6ce8eda1a932d7aad8feaa37adc 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_job.h
+++ b/src/gallium/drivers/panfrost/pan_job.h
@@ -129,6 +129,17 @@ struct panfrost_batch {
         mali_ptr attrib_bufs[PIPE_SHADER_TYPES];
         mali_ptr uniform_buffers[PIPE_SHADER_TYPES];
         mali_ptr push_uniforms[PIPE_SHADER_TYPES];
+        mali_ptr depth_stencil;
+        mali_ptr blend;
+
+        /* Valhall: struct mali_scissor_packed */
+        unsigned scissor[2];
+        float minimum_z, maximum_z;
+
+        /* Used on Valhall only. Midgard includes attributes in-band with
+         * attributes, wildly enough.
+         */
+        mali_ptr images[PIPE_SHADER_TYPES];
 
         /* Referenced resources */
         struct set *resources;