winsys/radeon: fix a race condition between winsys_create and winsys_destroy

[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 45a8f67d67d73bb080e5aec25329f8f0ee82e960..f1ef2ac94697464d226b96695db9e2535bb6e9db 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -70,14 +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_SHADER_EXPORT (PIPE_SHADER_GEOMETRY+1)
-#define SI_NUM_SHADERS (SI_SHADER_EXPORT+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;
@@ -88,27 +95,27 @@ struct si_context {
        void                            *custom_dsa_flush_inplace;
        void                            *custom_blend_resolve;
        void                            *custom_blend_decompress;
+       void                            *custom_blend_fastclear;
        struct si_screen                *screen;
 
        union {
                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 *streamout_enable; /* must be after 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 */
@@ -119,9 +126,8 @@ 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      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;
@@ -161,6 +167,15 @@ void si_flush_depth_textures(struct si_context *sctx,
 void si_decompress_color_textures(struct si_context *sctx,
                                  struct si_textures_info *textures);
 
+/* 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_begin_new_cs(struct si_context *ctx);