radeonsi: merge sampler and image descriptor lists into one

[mesa.git] / src / gallium / drivers / radeonsi / si_state.h

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 6bb067333f3b71f7b18ff9782eaf0f841e279663..c4ef90372fb9697be22b5a40ed243cb90137084e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -35,7 +35,7 @@
 
 #define SI_MAX_ATTRIBS                 16
 #define SI_NUM_VERTEX_BUFFERS          SI_MAX_ATTRIBS
-#define SI_NUM_SAMPLERS                        24 /* OpenGL textures units per shader */
+#define SI_NUM_SAMPLERS                        32 /* OpenGL textures units per shader */
 #define SI_NUM_CONST_BUFFERS           16
 #define SI_NUM_IMAGES                  16
 #define SI_NUM_SHADER_BUFFERS          16
@@ -74,6 +74,7 @@ struct si_state_rasterizer {
        bool                    poly_smooth;
        bool                    uses_poly_offset;
        bool                    clamp_fragment_color;
+       bool                    clamp_vertex_color;
        bool                    rasterizer_discard;
        bool                    scissor_enable;
        bool                    clip_halfz;
@@ -100,13 +101,10 @@ struct si_vertex_element
 {
        unsigned                        count;
        unsigned                        first_vb_use_mask;
+       /* Vertex buffer descriptor list size aligned for optimal prefetch. */
+       unsigned                        desc_list_byte_size;
 
-       /* Two bits per attribute indicating the size of each vector component
-        * in bytes if the size 3-workaround must be applied.
-        */
-       uint32_t                        fix_size3;
-       uint64_t                        fix_fetch;
-
+       uint8_t                         fix_fetch[SI_MAX_ATTRIBS];
        uint32_t                        rsrc_word3[SI_MAX_ATTRIBS];
        uint32_t                        format_size[SI_MAX_ATTRIBS];
        struct pipe_vertex_element      elements[SI_MAX_ATTRIBS];
@@ -166,9 +164,6 @@ struct si_shader_data {
 
 /* Private read-write buffer slots. */
 enum {
-       SI_HS_RING_TESS_FACTOR,
-       SI_HS_RING_TESS_OFFCHIP,
-
        SI_ES_RING_ESGS,
        SI_GS_RING_ESGS,
 
@@ -199,11 +194,11 @@ enum {
  *  21 - compute const buffers
  *   ...
  */
-#define SI_SHADER_DESCS_CONST_BUFFERS  0
-#define SI_SHADER_DESCS_SHADER_BUFFERS 1
-#define SI_SHADER_DESCS_SAMPLERS       2
-#define SI_SHADER_DESCS_IMAGES         3
-#define SI_NUM_SHADER_DESCS            4
+enum {
+       SI_SHADER_DESCS_CONST_AND_SHADER_BUFFERS,
+       SI_SHADER_DESCS_SAMPLERS_AND_IMAGES,
+       SI_NUM_SHADER_DESCS,
+};
 
 #define SI_DESCS_RW_BUFFERS            0
 #define SI_DESCS_FIRST_SHADER          1
@@ -233,8 +228,10 @@ struct si_descriptors {
        unsigned ce_offset;
 
        /* elements of the list that are changed and need to be uploaded */
-       unsigned dirty_mask;
+       uint64_t dirty_mask;
 
+       /* Whether CE is used to upload this descriptor array. */
+       bool uses_ce;
        /* Whether the CE ram is dirty and needs to be reinitialized entirely
         * before we can do partial updates. */
        bool ce_ram_dirty;
@@ -254,7 +251,9 @@ struct si_sampler_views {
 
 struct si_buffer_resources {
        enum radeon_bo_usage            shader_usage; /* READ, WRITE, or READWRITE */
+       enum radeon_bo_usage            shader_usage_constbuf;
        enum radeon_bo_priority         priority;
+       enum radeon_bo_priority         priority_constbuf;
        struct pipe_resource            **buffers; /* this has num_buffers elements */
 
        /* The i-th bit is set if that element is enabled (non-NULL resource). */
@@ -285,14 +284,16 @@ struct si_buffer_resources {
 /* si_descriptors.c */
 void si_ce_reinitialize_all_descriptors(struct si_context *sctx);
 void si_ce_enable_loads(struct radeon_winsys_cs *ib);
-void si_set_mutable_tex_desc_fields(struct r600_texture *tex,
-                                   const struct radeon_surf_level *base_level_info,
+void si_set_mutable_tex_desc_fields(struct si_screen *sscreen,
+                                   struct r600_texture *tex,
+                                   const struct legacy_surf_level *base_level_info,
                                    unsigned base_level, unsigned first_level,
                                    unsigned block_width, bool is_stencil,
                                    uint32_t *state);
 void si_get_pipe_constant_buffer(struct si_context *sctx, uint shader,
                                 uint slot, struct pipe_constant_buffer *cbuf);
-void si_get_shader_buffers(struct si_context *sctx, uint shader,
+void si_get_shader_buffers(struct si_context *sctx,
+                          enum pipe_shader_type shader,
                           uint start_slot, uint count,
                           struct pipe_shader_buffer *sbuf);
 void si_set_ring_buffer(struct pipe_context *ctx, uint slot,
@@ -368,9 +369,33 @@ static inline unsigned
 si_tile_mode_index(struct r600_texture *rtex, unsigned level, bool stencil)
 {
        if (stencil)
-               return rtex->surface.stencil_tiling_index[level];
+               return rtex->surface.u.legacy.stencil_tiling_index[level];
        else
-               return rtex->surface.tiling_index[level];
+               return rtex->surface.u.legacy.tiling_index[level];
+}
+
+static inline unsigned si_get_constbuf_slot(unsigned slot)
+{
+       /* Constant buffers are in slots [16..31], ascending */
+       return SI_NUM_SHADER_BUFFERS + slot;
+}
+
+static inline unsigned si_get_shaderbuf_slot(unsigned slot)
+{
+       /* shader buffers are in slots [15..0], descending */
+       return SI_NUM_SHADER_BUFFERS - 1 - slot;
+}
+
+static inline unsigned si_get_sampler_slot(unsigned slot)
+{
+       /* samplers are in slots [8..39], ascending */
+       return SI_NUM_IMAGES / 2 + slot;
+}
+
+static inline unsigned si_get_image_slot(unsigned slot)
+{
+       /* images are in slots [15..0] (sampler slots [7..0]), descending */
+       return SI_NUM_IMAGES - 1 - slot;
 }
 
 #endif