#include "util/bitset.h"
#include "util/slab.h"
#include "xf86drm.h"
-#include "v3d_drm.h"
+#include "drm-uapi/v3d_drm.h"
#include "v3d_screen.h"
+#include "broadcom/common/v3d_limits.h"
struct v3d_job;
struct v3d_bo;
#define VC5_DIRTY_ZSA (1 << 2)
#define VC5_DIRTY_FRAGTEX (1 << 3)
#define VC5_DIRTY_VERTTEX (1 << 4)
+#define VC5_DIRTY_SHADER_IMAGE (1 << 5)
#define VC5_DIRTY_BLEND_COLOR (1 << 7)
#define VC5_DIRTY_STENCIL_REF (1 << 8)
#define VC5_DIRTY_OQ (1 << 28)
#define VC5_DIRTY_CENTROID_FLAGS (1 << 29)
#define VC5_DIRTY_NOPERSPECTIVE_FLAGS (1 << 30)
+#define VC5_DIRTY_SSBO (1 << 31)
#define VC5_MAX_FS_INPUTS 64
+enum v3d_sampler_state_variant {
+ V3D_SAMPLER_STATE_BORDER_0,
+ V3D_SAMPLER_STATE_F16,
+ V3D_SAMPLER_STATE_F16_UNORM,
+ V3D_SAMPLER_STATE_F16_SNORM,
+ V3D_SAMPLER_STATE_F16_BGRA,
+ V3D_SAMPLER_STATE_F16_BGRA_UNORM,
+ V3D_SAMPLER_STATE_F16_BGRA_SNORM,
+ V3D_SAMPLER_STATE_F16_A,
+ V3D_SAMPLER_STATE_F16_A_SNORM,
+ V3D_SAMPLER_STATE_F16_A_UNORM,
+ V3D_SAMPLER_STATE_F16_LA,
+ V3D_SAMPLER_STATE_F16_LA_UNORM,
+ V3D_SAMPLER_STATE_F16_LA_SNORM,
+ V3D_SAMPLER_STATE_32,
+ V3D_SAMPLER_STATE_32_UNORM,
+ V3D_SAMPLER_STATE_32_SNORM,
+ V3D_SAMPLER_STATE_32_A,
+ V3D_SAMPLER_STATE_32_A_UNORM,
+ V3D_SAMPLER_STATE_32_A_SNORM,
+ V3D_SAMPLER_STATE_1010102U,
+ V3D_SAMPLER_STATE_16U,
+ V3D_SAMPLER_STATE_16I,
+ V3D_SAMPLER_STATE_8I,
+ V3D_SAMPLER_STATE_8U,
+
+ V3D_SAMPLER_STATE_VARIANT_COUNT,
+};
+
struct v3d_sampler_view {
struct pipe_sampler_view base;
uint32_t p0;
uint8_t texture_shader_state[32];
/* V3D 4.x: Texture state struct. */
struct v3d_bo *bo;
+
+ enum v3d_sampler_state_variant sampler_variant;
+
+ /* Actual texture to be read by this sampler view. May be different
+ * from base.texture in the case of having a shadow tiled copy of a
+ * raster texture.
+ */
+ struct pipe_resource *texture;
};
struct v3d_sampler_state {
/* V3D 3.x: Packed texture state. */
uint8_t texture_shader_state[32];
/* V3D 4.x: Sampler state struct. */
- struct v3d_bo *bo;
+ struct pipe_resource *sampler_state;
+ uint32_t sampler_state_offset[V3D_SAMPLER_STATE_VARIANT_COUNT];
+
+ bool border_color_variants;
};
struct v3d_texture_stateobj {
- struct pipe_sampler_view *textures[PIPE_MAX_SAMPLERS];
+ struct pipe_sampler_view *textures[V3D_MAX_TEXTURE_SAMPLERS];
unsigned num_textures;
- struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];
+ struct pipe_sampler_state *samplers[V3D_MAX_TEXTURE_SAMPLERS];
unsigned num_samplers;
- struct v3d_cl_reloc texture_state[PIPE_MAX_SAMPLERS];
+ struct v3d_cl_reloc texture_state[V3D_MAX_TEXTURE_SAMPLERS];
};
struct v3d_shader_uniform_info {
uint16_t tf_specs[16];
uint16_t tf_specs_psiz[16];
uint32_t num_tf_specs;
-
- /**
- * Flag for if the NIR in this shader originally came from TGSI. If
- * so, we need to do some fixups at compile time, due to missing
- * information in TGSI that exists in NIR.
- */
- bool was_tgsi;
};
struct v3d_compiled_shader {
- struct v3d_bo *bo;
+ struct pipe_resource *resource;
+ uint32_t offset;
union {
struct v3d_prog_data *base;
struct v3d_vs_prog_data *vs;
struct v3d_fs_prog_data *fs;
+ struct v3d_compute_prog_data *compute;
} prog_data;
/**
};
struct v3d_program_stateobj {
- struct v3d_uncompiled_shader *bind_vs, *bind_fs;
- struct v3d_compiled_shader *cs, *vs, *fs;
+ struct v3d_uncompiled_shader *bind_vs, *bind_fs, *bind_compute;
+ struct v3d_compiled_shader *cs, *vs, *fs, *compute;
+
+ struct hash_table *cache[MESA_SHADER_STAGES];
struct v3d_bo *spill_bo;
int spill_size_per_thread;
};
struct v3d_vertex_stateobj {
- struct pipe_vertex_element pipe[VC5_MAX_ATTRIBUTES];
+ struct pipe_vertex_element pipe[V3D_MAX_VS_INPUTS / 4];
unsigned num_elements;
- uint8_t attrs[16 * VC5_MAX_ATTRIBUTES];
- struct v3d_bo *default_attribute_values;
+ uint8_t attrs[16 * (V3D_MAX_VS_INPUTS / 4)];
+ struct pipe_resource *defaults;
+ uint32_t defaults_offset;
};
struct v3d_streamout_stateobj {
unsigned num_targets;
};
+struct v3d_ssbo_stateobj {
+ struct pipe_shader_buffer sb[PIPE_MAX_SHADER_BUFFERS];
+ uint32_t enabled_mask;
+};
+
/* Hash table key for v3d->jobs */
struct v3d_job_key {
struct pipe_surface *cbufs[4];
VC5_EZ_DISABLED,
};
+struct v3d_image_view {
+ struct pipe_image_view base;
+ /* V3D 4.x texture shader state struct */
+ struct pipe_resource *tex_state;
+ uint32_t tex_state_offset;
+};
+
+struct v3d_shaderimg_stateobj {
+ struct v3d_image_view si[PIPE_MAX_SHADER_IMAGES];
+ uint32_t enabled_mask;
+};
+
/**
* A complete bin/render job.
*
* first rendering.
*/
uint32_t clear;
+ /* Bitmask of PIPE_CLEAR_* of buffers that have been read by a draw
+ * call without having been cleared first.
+ */
+ uint32_t load;
/* Bitmask of PIPE_CLEAR_* of buffers that have been rendered to
* (either clears or draws) and should be stored.
*/
*/
bool needs_flush;
- /**
- * Set if there is a nonzero address for OCCLUSION_QUERY_COUNTER. If
- * so, we need to disable it and flush before ending the CL, to keep
- * the next tile from starting with it enabled.
+ /* Set if any shader has dirtied cachelines in the TMU that need to be
+ * flushed before job end.
*/
- bool oq_enabled;
+ bool tmu_dirty_rcl;
/**
- * Set when a packet enabling TF on all further primitives has been
- * emitted.
+ * Set if a packet enabling TF has been emitted in the job (V3D 4.x).
*/
bool tf_enabled;
struct primconvert_context *primconvert;
- struct hash_table *fs_cache, *vs_cache;
uint32_t next_uncompiled_program_id;
uint64_t next_compiled_program_id;
/** Maximum index buffer valid for the current shader_rec. */
uint32_t max_index;
- /** Sync object that our RCL will update as its out_sync. */
+ /** Sync object that our RCL or TFU job will update as its out_sync. */
uint32_t out_sync;
+ /* Stream uploader used by gallium internals. This could also be used
+ * by driver internals, but we tend to use the v3d_cl.h interfaces
+ * instead.
+ */
struct u_upload_mgr *uploader;
+ /* State uploader used inside the driver. This is for packing bits of
+ * long-term state inside buffers, since the kernel interfaces
+ * allocate a page at a time.
+ */
+ struct u_upload_mgr *state_uploader;
/** @{ Current pipeline state objects */
struct pipe_scissor_state scissor;
struct v3d_rasterizer_state *rasterizer;
struct v3d_depth_stencil_alpha_state *zsa;
- struct v3d_texture_stateobj verttex, fragtex;
-
struct v3d_program_stateobj prog;
+ uint32_t compute_num_workgroups[3];
+ struct v3d_bo *compute_shared_memory;
struct v3d_vertex_stateobj *vtx;
struct pipe_poly_stipple stipple;
struct pipe_clip_state clip;
struct pipe_viewport_state viewport;
+ struct v3d_ssbo_stateobj ssbo[PIPE_SHADER_TYPES];
+ struct v3d_shaderimg_stateobj shaderimg[PIPE_SHADER_TYPES];
struct v3d_constbuf_stateobj constbuf[PIPE_SHADER_TYPES];
+ struct v3d_texture_stateobj tex[PIPE_SHADER_TYPES];
struct v3d_vertexbuf_stateobj vertexbuf;
struct v3d_streamout_stateobj streamout;
struct v3d_bo *current_oq;
+ struct pipe_debug_callback debug;
/** @} */
};
float point_size;
- /**
- * Half-float (1/8/7 bits) value of polygon offset units for
- * VC5_PACKET_DEPTH_OFFSET
- */
- uint16_t offset_units;
- /**
- * The HW treats polygon offset units based on a Z24 buffer, so we
- * need to scale up offset_units if we're only Z16.
- */
- uint16_t z16_offset_units;
- /**
- * Half-float (1/8/7 bits) value of polygon offset scale for
- * VC5_PACKET_DEPTH_OFFSET
- */
- uint16_t offset_factor;
+ uint8_t depth_offset[9];
+ uint8_t depth_offset_z16[9];
};
struct v3d_depth_stencil_alpha_state {
#define perf_debug(...) do { \
if (unlikely(V3D_DEBUG & V3D_DEBUG_PERF)) \
fprintf(stderr, __VA_ARGS__); \
+ if (unlikely(v3d->debug.debug_message)) \
+ pipe_debug_message(&v3d->debug, PERF_INFO, __VA_ARGS__); \
} while (0)
+#define foreach_bit(b, mask) \
+ for (uint32_t _m = (mask), b; _m && ({(b) = u_bit_scan(&_m); 1;});)
+
static inline struct v3d_context *
v3d_context(struct pipe_context *pcontext)
{
void v3d_simulator_init(struct v3d_screen *screen);
void v3d_simulator_destroy(struct v3d_screen *screen);
-int v3d_simulator_flush(struct v3d_context *v3d,
- struct drm_v3d_submit_cl *args,
- struct v3d_job *job);
+uint32_t v3d_simulator_get_spill(uint32_t spill_size);
int v3d_simulator_ioctl(int fd, unsigned long request, void *arg);
-void v3d_simulator_open_from_handle(int fd, uint32_t winsys_stride,
- int handle, uint32_t size);
+void v3d_simulator_open_from_handle(int fd, int handle, uint32_t size);
static inline int
v3d_ioctl(int fd, unsigned long request, void *arg)
void v3d_set_shader_uniform_dirty_flags(struct v3d_compiled_shader *shader);
struct v3d_cl_reloc v3d_write_uniforms(struct v3d_context *v3d,
struct v3d_compiled_shader *shader,
- struct v3d_constbuf_stateobj *cb,
- struct v3d_texture_stateobj *texstate);
+ enum pipe_shader_type stage);
void v3d_flush(struct pipe_context *pctx);
void v3d_job_init(struct v3d_context *v3d);
void v3d_flush_jobs_reading_resource(struct v3d_context *v3d,
struct pipe_resource *prsc);
void v3d_update_compiled_shaders(struct v3d_context *v3d, uint8_t prim_mode);
+void v3d_update_compiled_cs(struct v3d_context *v3d);
bool v3d_rt_format_supported(const struct v3d_device_info *devinfo,
enum pipe_format f);
uint32_t format,
uint32_t *type,
uint32_t *bpp);
+bool v3d_tfu_supports_tex_format(const struct v3d_device_info *devinfo,
+ uint32_t tex_format);
void v3d_init_query_functions(struct v3d_context *v3d);
void v3d_blit(struct pipe_context *pctx, const struct pipe_blit_info *blit_info);
void v3d_blitter_save(struct v3d_context *v3d);
+boolean v3d_generate_mipmap(struct pipe_context *pctx,
+ struct pipe_resource *prsc,
+ enum pipe_format format,
+ unsigned int base_level,
+ unsigned int last_level,
+ unsigned int first_layer,
+ unsigned int last_layer);
struct v3d_fence *v3d_fence_create(struct v3d_context *v3d);
projects / mesa.git / blobdiff