radeonsi: add llvm processor names for CIK

[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 e50088f6e3b6822f54bea6afe5d947df3bc8af04..90d67e28d21047110e3cc6ec8a3e86efc0c4009b 100644 (file)
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h
@@ -87,7 +87,7 @@ struct si_pipe_sampler_view {
 
 struct si_pipe_sampler_state {
        uint32_t                        val[4];
-       float                           border_color[4];
+       uint32_t                        border_color[4];
 };
 
 struct si_cs_shader_state {
@@ -146,7 +146,6 @@ struct r600_context {
        struct pipe_framebuffer_state   framebuffer;
        unsigned                        pa_sc_line_stipple;
        unsigned                        pa_su_sc_mode_cntl;
-       unsigned                        pa_cl_clip_cntl;
        /* for saving when using blitter */
        struct pipe_stencil_ref         stencil_ref;
        struct si_pipe_shader_selector  *ps_shader;
@@ -154,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;