#define SI_BIG_ENDIAN 0
#endif
+/* The base vertex and primitive restart can be any number, but we must pick
+ * one which will mean "unknown" for the purpose of state tracking and
+ * the number shouldn't be a commonly-used one. */
+#define SI_BASE_VERTEX_UNKNOWN INT_MIN
+#define SI_RESTART_INDEX_UNKNOWN INT_MIN
+
#define SI_TRACE_CS 0
#define SI_TRACE_CS_DWORDS 6
-#define SI_MAX_DRAW_CS_DWORDS 18
+#define SI_MAX_DRAW_CS_DWORDS \
+ (/*derived prim state:*/ 6 + /*draw regs:*/ 16 + /*draw packets:*/ 31)
-struct si_pipe_compute;
+struct si_compute;
struct si_screen {
struct r600_common_screen b;
};
-struct si_pipe_sampler_view {
+struct si_sampler_view {
struct pipe_sampler_view base;
+ struct list_head list;
struct r600_resource *resource;
uint32_t state[8];
uint32_t fmask_state[8];
};
-struct si_pipe_sampler_state {
+struct si_sampler_state {
uint32_t val[4];
uint32_t border_color[4];
};
struct si_cs_shader_state {
- struct si_pipe_compute *program;
+ struct si_compute *program;
};
struct si_textures_info {
struct si_sampler_views views;
- struct si_pipe_sampler_state *samplers[NUM_TEX_UNITS];
- unsigned n_views;
+ struct si_sampler_states states;
uint32_t depth_texture_mask; /* which textures are depth */
uint32_t compressed_colortex_mask;
- unsigned n_samplers;
};
-struct si_surface {
- struct pipe_surface base;
+struct si_framebuffer {
+ struct r600_atom atom;
+ struct pipe_framebuffer_state state;
+ unsigned nr_samples;
+ unsigned log_samples;
+ unsigned cb0_is_integer;
+ unsigned compressed_cb_mask;
+ unsigned export_16bpc;
};
#define SI_NUM_ATOMS(sctx) (sizeof((sctx)->atoms)/sizeof((sctx)->atoms.array[0]))
struct si_context {
struct r600_common_context b;
struct blitter_context *blitter;
- void *custom_dsa_flush_depth_stencil[8];
- void *custom_dsa_flush_depth[8];
- void *custom_dsa_flush_stencil[8];
- void *custom_dsa_flush_inplace;
+ void *custom_dsa_flush;
void *custom_blend_resolve;
void *custom_blend_decompress;
+ void *custom_blend_fastclear;
struct si_screen *screen;
union {
struct {
/* The order matters. */
+ struct r600_atom *vertex_buffers;
struct r600_atom *const_buffers[SI_NUM_SHADERS];
+ struct r600_atom *rw_buffers[SI_NUM_SHADERS];
struct r600_atom *sampler_views[SI_NUM_SHADERS];
- struct r600_atom *streamout_buffers;
+ struct r600_atom *sampler_states[SI_NUM_SHADERS];
/* Caches must be flushed after resource descriptors are
* updated in memory. */
struct r600_atom *cache_flush;
struct r600_atom *streamout_begin;
- };
+ struct r600_atom *streamout_enable; /* must be after streamout_begin */
+ struct r600_atom *framebuffer;
+ struct r600_atom *db_render_state;
+ struct r600_atom *msaa_config;
+ struct r600_atom *clip_regs;
+ } s;
struct r600_atom *array[0];
} atoms;
+ struct si_framebuffer framebuffer;
struct si_vertex_element *vertex_elements;
- struct pipe_framebuffer_state framebuffer;
- unsigned fb_log_samples;
- unsigned fb_cb0_is_integer;
- unsigned fb_compressed_cb_mask;
unsigned pa_sc_line_stipple;
unsigned pa_su_sc_mode_cntl;
/* for saving when using blitter */
struct pipe_stencil_ref stencil_ref;
- struct si_pipe_shader_selector *ps_shader;
- struct si_pipe_shader_selector *gs_shader;
- struct si_pipe_shader_selector *vs_shader;
+ /* shaders */
+ struct si_shader_selector *ps_shader;
+ struct si_shader_selector *gs_shader;
+ struct si_shader_selector *vs_shader;
struct si_cs_shader_state cs_shader_state;
/* shader information */
unsigned sprite_coord_enable;
- unsigned export_16bpc;
+ struct si_descriptors vertex_buffers;
struct si_buffer_resources const_buffers[SI_NUM_SHADERS];
- struct si_buffer_resources streamout_buffers;
- struct si_textures_info samplers[SI_NUM_SHADERS];
+ struct si_buffer_resources rw_buffers[SI_NUM_SHADERS];
+ struct si_textures_info samplers[SI_NUM_SHADERS];
struct r600_resource *border_color_table;
unsigned border_color_offset;
- unsigned default_ps_gprs, default_vs_gprs;
+ struct r600_atom clip_regs;
+ struct r600_atom msaa_config;
+ int ps_iter_samples;
- /* Below are variables from the old r600_context.
- */
- unsigned pm4_dirty_cdwords;
+ unsigned default_ps_gprs, default_vs_gprs;
/* Vertex and index buffers. */
bool vertex_buffers_dirty;
struct pipe_index_buffer index_buffer;
- struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
- unsigned nr_vertex_buffers;
+ struct pipe_vertex_buffer vertex_buffer[SI_NUM_VERTEX_BUFFERS];
/* With rasterizer discard, there doesn't have to be a pixel shader.
* In that case, we bind this one: */
struct si_pm4_state *gs_rings;
struct r600_atom cache_flush;
struct pipe_constant_buffer null_const_buf; /* used for set_constant_buffer(NULL) on CIK */
- struct pipe_constant_buffer esgs_ring;
- struct pipe_constant_buffer gsvs_ring;
+ struct pipe_resource *esgs_ring;
+ struct pipe_resource *gsvs_ring;
/* SI state handling */
union si_state queued;
union si_state emitted;
+
+ /* DB render state. */
+ struct r600_atom db_render_state;
+ bool dbcb_depth_copy_enabled;
+ bool dbcb_stencil_copy_enabled;
+ unsigned dbcb_copy_sample;
+ bool db_inplace_flush_enabled;
+ bool db_depth_clear;
+ bool db_depth_disable_expclear;
+ unsigned ps_db_shader_control;
+
+ /* Draw state. */
+ int last_base_vertex;
+ int last_start_instance;
+ int last_sh_base_reg;
+ int last_primitive_restart_en;
+ int last_restart_index;
+ int last_gs_out_prim;
+ int last_prim;
+ int last_multi_vgt_param;
+ int last_rast_prim;
};
/* si_blit.c */
struct si_textures_info *textures);
void si_decompress_color_textures(struct si_context *sctx,
struct si_textures_info *textures);
+void si_resource_copy_region(struct pipe_context *ctx,
+ struct pipe_resource *dst,
+ unsigned dst_level,
+ unsigned dstx, unsigned dsty, unsigned dstz,
+ struct pipe_resource *src,
+ unsigned src_level,
+ const struct pipe_box *src_box);
+
+/* si_dma.c */
+void si_dma_copy(struct pipe_context *ctx,
+ struct pipe_resource *dst,
+ unsigned dst_level,
+ unsigned dstx, unsigned dsty, unsigned dstz,
+ struct pipe_resource *src,
+ unsigned src_level,
+ const struct pipe_box *src_box);
/* si_hw_context.c */
-void si_context_flush(struct si_context *ctx, unsigned flags);
+void si_context_gfx_flush(void *context, unsigned flags,
+ struct pipe_fence_handle **fence);
void si_begin_new_cs(struct si_context *ctx);
void si_need_cs_space(struct si_context *ctx, unsigned num_dw, boolean count_draw_in);
-/* si_pipe.c */
-void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
- unsigned flags);
-
#if SI_TRACE_CS
void si_trace_emit(struct si_context *sctx);
#endif
PIPE_BIND_CUSTOM, usage, size));
}
+static INLINE void
+si_invalidate_draw_sh_constants(struct si_context *sctx)
+{
+ sctx->last_base_vertex = SI_BASE_VERTEX_UNKNOWN;
+ sctx->last_start_instance = -1; /* reset to an unknown value */
+ sctx->last_sh_base_reg = -1; /* reset to an unknown value */
+}
+
#endif