X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fpan_context.h;h=c294195b4b5b9ba7efc1f2a0d4116a5446170608;hb=204a3bb816fe6382ac14ac06a2395f4afdded43e;hp=cd9a034975d3499b7f9ce46a75dc1f7eaff246be;hpb=b68778e6de2da1921cf1c19cff8f54cff46eb37d;p=mesa.git

diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h
index cd9a034975d..c294195b4b5 100644
--- a/src/gallium/drivers/panfrost/pan_context.h
+++ b/src/gallium/drivers/panfrost/pan_context.h
@@ -91,6 +91,9 @@ struct panfrost_context {
         /* Gallium context */
         struct pipe_context base;
 
+        /* Compiler context */
+        struct midgard_screen compiler;
+
         /* Bound job and map of panfrost_job_key to jobs */
         struct panfrost_job *job;
         struct hash_table *jobs;
@@ -107,7 +110,6 @@ struct panfrost_context {
         struct panfrost_memory shaders;
         struct panfrost_memory scratchpad;
         struct panfrost_memory tiler_heap;
-        struct panfrost_memory varying_mem;
         struct panfrost_memory tiler_polygon_list;
         struct panfrost_memory tiler_dummy;
         struct panfrost_memory depth_stencil_buffer;
@@ -136,8 +138,6 @@ struct panfrost_context {
 
         union mali_attr attributes[PIPE_MAX_ATTRIBS];
 
-        unsigned varying_height;
-
         struct mali_single_framebuffer vt_framebuffer_sfbd;
         struct bifrost_framebuffer vt_framebuffer_mfbd;
 
@@ -185,13 +185,6 @@ struct panfrost_context {
         /* True for t6XX, false for t8xx. */
         bool is_t6xx;
 
-        /* If set, we'll require the use of single render-target framebuffer
-         * descriptors (SFBD), for older hardware -- specifically, <T760 hardware, If
-         * false, we'll use the MFBD no matter what. New hardware -does- retain support
-         * for SFBD, and in theory we could flip between them on a per-RT basis, but
-         * there's no real advantage to doing so */
-        bool require_sfbd;
-
         uint32_t out_sync;
 };
 
@@ -216,7 +209,6 @@ struct panfrost_shader_state {
         /* Compiled, mapped descriptor, ready for the hardware */
         bool compiled;
         struct mali_shader_meta *tripipe;
-        mali_ptr tripipe_gpu;
 
         /* Non-descript information */
         int uniform_count;
@@ -235,6 +227,9 @@ struct panfrost_shader_state {
 
         uint16_t point_sprite_mask;
         unsigned point_sprite_upper_left : 1;
+
+        /* Should we enable helper invocations */
+        bool helper_invocations;
 };
 
 /* A collection of varyings (the CSO) */
@@ -265,6 +260,7 @@ struct panfrost_sampler_state {
 struct panfrost_sampler_view {
         struct pipe_sampler_view base;
         struct mali_texture_descriptor hw;
+        bool manual_stride;
 };
 
 static inline struct panfrost_context *