radeonsi: convert the framebuffer state to atom-based

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

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 3c27e670303dbcf51d49d734e23aede403813557..c66c88e05a4aa397cf7ab934baafe95d7f700d3b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -70,12 +70,21 @@ struct si_textures_info {
        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]))
-#define SI_NUM_SHADERS (PIPE_SHADER_FRAGMENT+1)
+
+#define SI_NUM_SHADERS (PIPE_SHADER_GEOMETRY+1)
+
+#define SI_RW_SO 2 /* Streamout buffer descriptors after ring buffers */
 
 struct si_context {
        struct r600_common_context      b;
@@ -92,33 +101,31 @@ struct si_context {
                struct {
                        /* The order matters. */
                        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;
                        /* Caches must be flushed after resource descriptors are
                         * updated in memory. */
                        struct r600_atom *cache_flush;
                        struct r600_atom *streamout_begin;
+                       struct r600_atom *framebuffer;
                };
                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;
        struct si_cs_shader_state       cs_shader_state;
        /* shader information */
        unsigned                        sprite_coord_enable;
-       unsigned                        export_16bpc;
        struct si_buffer_resources      const_buffers[SI_NUM_SHADERS];
-       struct si_buffer_resources      streamout_buffers;
+       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;
@@ -138,8 +145,13 @@ struct si_context {
        /* With rasterizer discard, there doesn't have to be a pixel shader.
         * In that case, we bind this one: */
        void                    *dummy_pixel_shader;
+       struct si_pm4_state     *gs_on;
+       struct si_pm4_state     *gs_off;
+       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;
 
        /* SI state handling */
        union si_state  queued;