X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fpan_context.h;h=cc8d0eb16dfadf349071a00b4d8f669ea1e0df3c;hb=046c15458575f826da430d86a3056876f1bcc638;hp=ad0791bf06a4627fc41d39d20ed6e1b2fe78b2ff;hpb=31305e1b2854c6a70dc8c61265f525fcb52c265d;p=mesa.git

diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h
index ad0791bf06a..cc8d0eb16df 100644
--- a/src/gallium/drivers/panfrost/pan_context.h
+++ b/src/gallium/drivers/panfrost/pan_context.h
@@ -33,6 +33,7 @@
 #include "pan_job.h"
 #include "pan_blend.h"
 #include "pan_encoder.h"
+#include "pan_texture.h"
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_config.h"
@@ -52,17 +53,6 @@ struct prim_convert_context;
 
 #define MAX_VARYINGS   4096
 
-//#define PAN_DIRTY_CLEAR	     (1 << 0)
-#define PAN_DIRTY_RASTERIZER (1 << 2)
-#define PAN_DIRTY_FS	     (1 << 3)
-#define PAN_DIRTY_FRAG_CORE  (PAN_DIRTY_FS) /* Dirty writes are tied */
-#define PAN_DIRTY_VS	     (1 << 4)
-#define PAN_DIRTY_VERTEX     (1 << 5)
-#define PAN_DIRTY_VERT_BUF   (1 << 6)
-//#define PAN_DIRTY_VIEWPORT   (1 << 7)
-#define PAN_DIRTY_SAMPLERS   (1 << 8)
-#define PAN_DIRTY_TEXTURES   (1 << 9)
-
 #define SET_BIT(lval, bit, cond) \
 	if (cond) \
 		lval |= (bit); \
@@ -129,15 +119,6 @@ struct panfrost_context {
         /* Each draw has corresponding vertex and tiler payloads */
         struct midgard_payload_vertex_tiler payloads[PIPE_SHADER_TYPES];
 
-        /* The fragment shader binary itself is pointed here (for the tripipe) but
-         * also everything else in the shader core, including blending, the
-         * stencil/depth tests, etc. Refer to the presentations. */
-
-        struct mali_shader_meta fragment_shader_core;
-
-        /* Per-draw Dirty flags are setup like any other driver */
-        int dirty;
-
         unsigned vertex_count;
         unsigned instance_count;
         enum pipe_prim_type active_prim;
@@ -191,31 +172,34 @@ struct panfrost_context {
 
 struct panfrost_rasterizer {
         struct pipe_rasterizer_state base;
-
-        /* Bitmask of front face, etc */
-        unsigned tiler_gl_enables;
 };
 
 /* Variants bundle together to form the backing CSO, bundling multiple
  * shaders with varying emulated features baked in (alpha test
  * parameters, etc) */
-#define MAX_SHADER_VARIANTS 8
 
 /* A shader state corresponds to the actual, current variant of the shader */
 struct panfrost_shader_state {
         /* Compiled, mapped descriptor, ready for the hardware */
         bool compiled;
-        struct mali_shader_meta *tripipe;
 
         /* Non-descript information */
         int uniform_count;
+        unsigned uniform_cutoff;
+        unsigned work_reg_count;
+        unsigned attribute_count;
         bool can_discard;
         bool writes_point_size;
+        bool writes_depth;
+        bool writes_stencil;
         bool reads_point_coord;
         bool reads_face;
         bool reads_frag_coord;
         unsigned stack_size;
+        unsigned shared_size;
 
+
+        unsigned int varying_count;
         struct mali_attr_meta varyings[PIPE_MAX_ATTRIBS];
         gl_varying_slot varyings_loc[PIPE_MAX_ATTRIBS];
         struct pipe_stream_output_info stream_output;
@@ -233,6 +217,7 @@ struct panfrost_shader_state {
         /* Should we enable helper invocations */
         bool helper_invocations;
 
+        unsigned first_tag;
         struct panfrost_bo *bo;
 };
 
@@ -248,7 +233,9 @@ struct panfrost_shader_variants {
                 struct pipe_compute_state cbase;
         };
 
-        struct panfrost_shader_state variants[MAX_SHADER_VARIANTS];
+        struct panfrost_shader_state *variants;
+        unsigned variant_space;
+
         unsigned variant_count;
 
         /* The current active variant */
@@ -271,8 +258,7 @@ struct panfrost_sampler_state {
 
 struct panfrost_sampler_view {
         struct pipe_sampler_view base;
-        struct mali_texture_descriptor hw;
-        bool manual_stride;
+        struct panfrost_bo *bo;
 };
 
 static inline struct panfrost_context *
@@ -281,21 +267,34 @@ pan_context(struct pipe_context *pcontext)
         return (struct panfrost_context *) pcontext;
 }
 
+static inline struct panfrost_shader_state *
+panfrost_get_shader_state(struct panfrost_context *ctx,
+                          enum pipe_shader_type st)
+{
+        struct panfrost_shader_variants *all = ctx->shader[st];
+
+        if (!all)
+                return NULL;
+
+        return &all->variants[all->active_variant];
+}
+
 struct pipe_context *
 panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags);
 
 void
 panfrost_invalidate_frame(struct panfrost_context *ctx);
 
+bool
+panfrost_writes_point_size(struct panfrost_context *ctx);
+
 void
-panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data);
+panfrost_vertex_state_upd_attr_offs(struct panfrost_context *ctx,
+                                    struct midgard_payload_vertex_tiler *vp);
 
 struct panfrost_transfer
 panfrost_vertex_tiler_job(struct panfrost_context *ctx, bool is_tiler);
 
-unsigned
-panfrost_get_default_swizzle(unsigned components);
-
 void
 panfrost_flush(
         struct pipe_context *pipe,
@@ -315,18 +314,18 @@ struct midgard_tiler_descriptor
 panfrost_emit_midg_tiler(struct panfrost_batch *batch, unsigned vertex_count);
 
 mali_ptr
-panfrost_fragment_job(struct panfrost_batch *batch, bool has_draws,
-                      struct mali_job_descriptor_header **header_cpu);
+panfrost_fragment_job(struct panfrost_batch *batch, bool has_draws);
 
 void
-panfrost_shader_compile(
-                struct panfrost_context *ctx,
-                struct mali_shader_meta *meta,
-                enum pipe_shader_ir ir_type,
-                const void *ir,
-                gl_shader_stage stage,
-                struct panfrost_shader_state *state,
-                uint64_t *outputs_written);
+panfrost_shader_compile(struct panfrost_context *ctx,
+                        enum pipe_shader_ir ir_type,
+                        const void *ir,
+                        gl_shader_stage stage,
+                        struct panfrost_shader_state *state,
+                        uint64_t *outputs_written);
+
+unsigned
+panfrost_ubo_count(struct panfrost_context *ctx, enum pipe_shader_type stage);
 
 /* Instancing */