X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fpan_context.h;h=8fb6c3a3ad14b4b0cd18f7083d8a06c482142a9a;hb=3bb61e21f8bf290773897778fbf391775ba706b9;hp=e60f737360de06745de2e35b9822de821ca83b92;hpb=2fc91a16abe0e517dfb46517dc4795857f0a9343;p=mesa.git diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h index e60f737360d..8fb6c3a3ad1 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); \ @@ -80,21 +70,20 @@ struct panfrost_query { unsigned type; unsigned index; - union { - /* For computed queries. 64-bit to prevent overflow */ - struct { - uint64_t start; - uint64_t end; - }; - - /* Memory for the GPU to writeback the value of the query */ - struct panfrost_transfer transfer; + /* For computed queries. 64-bit to prevent overflow */ + struct { + uint64_t start; + uint64_t end; }; + + /* Memory for the GPU to writeback the value of the query */ + struct panfrost_bo *bo; }; struct panfrost_fence { struct pipe_reference reference; - int fd; + uint32_t syncobj; + bool signaled; }; struct panfrost_streamout { @@ -107,13 +96,13 @@ struct panfrost_context { /* Gallium context */ struct pipe_context base; - /* Compiler context */ - struct midgard_screen compiler; - /* Bound job batch and map of panfrost_batch_key to job batches */ struct panfrost_batch *batch; struct hash_table *batches; + /* panfrost_bo -> panfrost_bo_access */ + struct hash_table *accessed_bos; + /* Within a launch_grid call.. */ const struct pipe_grid_info *compute_grid; @@ -123,27 +112,11 @@ struct panfrost_context { struct pipe_framebuffer_state pipe_framebuffer; struct panfrost_streamout streamout; - struct panfrost_bo *scratchpad; - struct panfrost_bo *tiler_heap; - struct panfrost_bo *tiler_dummy; - bool active_queries; uint64_t prims_generated; uint64_t tf_prims_generated; struct panfrost_query *occlusion_query; - /* 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; @@ -189,50 +162,53 @@ struct panfrost_context { struct pipe_viewport_state pipe_viewport; struct pipe_scissor_state scissor; struct pipe_blend_color blend_color; - struct pipe_depth_stencil_alpha_state *depth_stencil; + struct panfrost_zsa_state *depth_stencil; struct pipe_stencil_ref stencil_ref; + unsigned sample_mask; + unsigned min_samples; - /* True for t6XX, false for t8xx. */ - bool is_t6xx; - - uint32_t out_sync; - - /* While we're busy building up the job for frame N, the GPU is - * still busy executing frame N-1. So hold a reference to - * yesterjob */ - int last_fragment_flushed; - struct panfrost_batch *last_batch; + struct panfrost_blend_state blit_blend; }; /* Corresponds to the CSO */ 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 + * shaders with varying emulated features baked in */ /* 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_count; + unsigned work_reg_count; + unsigned attribute_count; + unsigned texture_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; + bool writes_global; + unsigned stack_size; + unsigned shared_size; + + /* Does the fragment shader have side effects? In particular, if output + * is masked out, is it legal to skip shader execution? */ + bool fs_sidefx; - struct mali_attr_meta varyings[PIPE_MAX_ATTRIBS]; + /* For Bifrost - output type for each RT */ + enum bifrost_shader_type blend_types[BIFROST_MAX_RENDER_TARGET_COUNT]; + + unsigned int varying_count; + enum mali_format varyings[PIPE_MAX_ATTRIBS]; gl_varying_slot varyings_loc[PIPE_MAX_ATTRIBS]; struct pipe_stream_output_info stream_output; uint64_t so_mask; @@ -240,16 +216,19 @@ struct panfrost_shader_state { unsigned sysval_count; unsigned sysval[MAX_SYSVAL_COUNT]; - /* Information on this particular shader variant */ - struct pipe_alpha_state alpha_state; - uint16_t point_sprite_mask; unsigned point_sprite_upper_left : 1; /* Should we enable helper invocations */ bool helper_invocations; + /* Pointer to GPU-executable memory formatted for the hardware. bo->gpu + * on Bifrost, bo->gpu | initial_tag on Midgard */ + mali_ptr shader; struct panfrost_bo *bo; + + BITSET_WORD outputs_read; + enum pipe_format rt_formats[8]; }; /* A collection of varyings (the CSO) */ @@ -264,7 +243,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 */ @@ -275,20 +256,32 @@ struct panfrost_vertex_state { unsigned num_elements; struct pipe_vertex_element pipe[PIPE_MAX_ATTRIBS]; - struct mali_attr_meta hw[PIPE_MAX_ATTRIBS]; + unsigned formats[PIPE_MAX_ATTRIBS]; +}; + +struct panfrost_zsa_state { + struct pipe_depth_stencil_alpha_state base; + + /* Precomputed stencil state */ + struct mali_stencil_packed stencil_front; + struct mali_stencil_packed stencil_back; + u8 stencil_mask_front; + u8 stencil_mask_back; }; struct panfrost_sampler_state { struct pipe_sampler_state base; - struct mali_sampler_descriptor hw; + struct mali_midgard_sampler_packed hw; }; /* Misnomer: Sampler view corresponds to textures, not samplers */ struct panfrost_sampler_view { struct pipe_sampler_view base; - struct mali_texture_descriptor hw; - bool manual_stride; + struct panfrost_bo *bo; + struct mali_bifrost_texture_packed bifrost_descriptor; + mali_ptr texture_bo; + uint64_t modifier; }; static inline struct panfrost_context * @@ -297,21 +290,27 @@ pan_context(struct pipe_context *pcontext) return (struct panfrost_context *) pcontext; } -struct panfrost_fence * -panfrost_fence_create(struct panfrost_context *ctx); +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_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data); +bool +panfrost_writes_point_size(struct panfrost_context *ctx); 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, @@ -321,57 +320,43 @@ panfrost_flush( mali_ptr panfrost_sfbd_fragment(struct panfrost_batch *batch, bool has_draws); mali_ptr panfrost_mfbd_fragment(struct panfrost_batch *batch, bool has_draws); -struct bifrost_framebuffer -panfrost_emit_mfbd(struct panfrost_batch *batch, unsigned vertex_count); - -struct mali_single_framebuffer -panfrost_emit_sfbd(struct panfrost_batch *batch, unsigned vertex_count); - -mali_ptr -panfrost_fragment_job(struct panfrost_batch *batch, bool has_draws); +void +panfrost_attach_mfbd(struct panfrost_batch *batch, unsigned vertex_count); 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_attach_sfbd(struct panfrost_batch *batch, unsigned vertex_count); -/* Instancing */ +struct midgard_tiler_descriptor +panfrost_emit_midg_tiler(struct panfrost_batch *batch, unsigned vertex_count); mali_ptr -panfrost_vertex_buffer_address(struct panfrost_context *ctx, unsigned i); +panfrost_fragment_job(struct panfrost_batch *batch, bool has_draws); void -panfrost_emit_vertex_data(struct panfrost_batch *batch); +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); -struct pan_shift_odd { - unsigned shift; - unsigned odd; -}; +unsigned +panfrost_ubo_count(struct panfrost_context *ctx, enum pipe_shader_type stage); -struct pan_shift_odd -panfrost_padded_vertex_count( - unsigned vertex_count, - bool primitive_pot); +void +panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, + struct pipe_context *pctx, + struct pipe_resource *texture); +/* Instancing */ -unsigned -pan_expand_shift_odd(struct pan_shift_odd o); +mali_ptr +panfrost_vertex_buffer_address(struct panfrost_context *ctx, unsigned i); /* Compute */ void panfrost_compute_context_init(struct pipe_context *pctx); -/* Varyings */ - -void -panfrost_emit_varying_descriptor( - struct panfrost_context *ctx, - unsigned vertex_count); #endif