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 4709454c9ddd8f86dc14585da4293b9aba5f4a35..c66c88e05a4aa397cf7ab934baafe95d7f700d3b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -70,6 +70,16 @@ struct si_textures_info {
        unsigned                        n_samplers;
 };
 
+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_GEOMETRY+1)
@@ -97,15 +107,13 @@ struct si_context {
                         * 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 */
@@ -116,7 +124,6 @@ struct si_context {
        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      rw_buffers[SI_NUM_SHADERS];
        struct si_textures_info samplers[SI_NUM_SHADERS];