nvc0: move firmware loading functions to nouveau

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

diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h
index 67cb14b7cc0db19b7ffb7c9cd6e85d92964b4e97..6fbe6539d8765b856a641359bb66c57f5f4c6e38 100644 (file)
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h
@@ -153,8 +153,10 @@ struct r600_context {
        struct si_cs_shader_state       cs_shader_state;
        struct pipe_query               *current_render_cond;
        unsigned                        current_render_cond_mode;
+       boolean                         current_render_cond_cond;
        struct pipe_query               *saved_render_cond;
        unsigned                        saved_render_cond_mode;
+       boolean                         saved_render_cond_cond;
        /* shader information */
        unsigned                        sprite_coord_enable;
        unsigned                        export_16bpc;
@@ -210,8 +212,8 @@ struct r600_context {
 /* r600_blit.c */
 void si_init_blit_functions(struct r600_context *rctx);
 void si_blit_uncompress_depth(struct pipe_context *ctx,
-               struct r600_resource_texture *texture,
-               struct r600_resource_texture *staging,
+               struct r600_texture *texture,
+               struct r600_texture *staging,
                unsigned first_level, unsigned last_level,
                unsigned first_layer, unsigned last_layer);
 void si_flush_depth_textures(struct r600_context *rctx,