radeonsi: convert the framebuffer state to atom-based

[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 e24c0bb0cce4e67db4f8def6c2069aef07c7e690..f91d407dae310eb316b50b157987f082bfa23a79 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -82,7 +82,6 @@ union si_state {
                struct si_pm4_state             *sample_mask;
                struct si_pm4_state             *scissor;
                struct si_state_viewport        *viewport;
-               struct si_pm4_state             *framebuffer;
                struct si_state_rasterizer      *rasterizer;
                struct si_state_dsa             *dsa;
                struct si_pm4_state             *fb_rs;
@@ -114,8 +113,11 @@ union si_state {
 #define NUM_SAMPLER_VIEWS      (FMASK_TEX_OFFSET+NUM_TEX_UNITS)
 #define NUM_SAMPLER_STATES     NUM_TEX_UNITS
 
-#define NUM_PIPE_CONST_BUFFERS 16
-#define NUM_CONST_BUFFERS 19
+#define NUM_PIPE_CONST_BUFFERS 16
+#define NUM_CONST_BUFFERS      (NUM_PIPE_CONST_BUFFERS + 1)
+
+#define SI_RING_ESGS           0
+#define SI_RING_GSVS           1
 
 /* This represents resource descriptors in memory, such as buffer resources,
  * image resources, and sampler states.
@@ -159,6 +161,7 @@ struct si_buffer_resources {
        struct si_descriptors           desc;
        unsigned                        num_buffers;
        enum radeon_bo_usage            shader_usage; /* READ, WRITE, or READWRITE */
+       enum radeon_bo_priority         priority;
        struct pipe_resource            **buffers; /* this has num_buffers elements */
        uint32_t                        *desc_storage; /* this has num_buffers*4 elements */
        uint32_t                        **desc_data; /* an array of pointers pointing to desc_storage */
@@ -214,7 +217,6 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf
 
 /* si_state.c */
 struct si_pipe_shader_selector;
-struct si_surface;
 
 boolean si_is_format_supported(struct pipe_screen *screen,
                                enum pipe_format format,