radeonsi: remove redundant si_shader_info::images_declared

[mesa.git] / src / gallium / drivers / r600 / r600_shader.h

diff --git a/src/gallium/drivers/r600/r600_shader.h b/src/gallium/drivers/r600/r600_shader.h
index 844490788396e5b1831b50a131164b4bb3fba032..4e4942c1ba4b449709b652ec38ff79d517b7d9c3 100644 (file)
--- a/src/gallium/drivers/r600/r600_shader.h
+++ b/src/gallium/drivers/r600/r600_shader.h
@@ -45,7 +45,7 @@ struct r600_shader_io {
        unsigned                name;
        unsigned                gpr;
        unsigned                done;
-       int                     sid;
+       unsigned                sid;
        int                     spi_sid;
        unsigned                interpolate;
        unsigned                ij_index;
@@ -54,6 +54,7 @@ struct r600_shader_io {
        unsigned                back_color_input;
        unsigned                write_mask;
        int                     ring_offset;
+       unsigned                uses_interpolate_at_centroid;
 };
 
 struct r600_shader_atomic {
@@ -71,19 +72,22 @@ struct r600_shader {
        unsigned                nhwatomic;
        unsigned                nlds;
        unsigned                nsys_inputs;
-       struct r600_shader_io   input[64];
-       struct r600_shader_io   output[64];
+       struct r600_shader_io   input[PIPE_MAX_SHADER_INPUTS];
+       struct r600_shader_io   output[PIPE_MAX_SHADER_OUTPUTS];
        struct r600_shader_atomic atomics[8];
        unsigned                nhwatomic_ranges;
        boolean                 uses_kill;
        boolean                 fs_write_all;
        boolean                 two_side;
+       boolean                 needs_scratch_space;
        /* Number of color outputs in the TGSI shader,
         * sometimes it could be higher than nr_cbufs (bug?).
         * Also with writes_all property on eg+ it will be set to max CB number */
        unsigned                nr_ps_max_color_exports;
        /* Real number of ps color exports compiled in the bytecode */
        unsigned                nr_ps_color_exports;
+       unsigned                ps_color_export_mask;
+       unsigned                ps_export_highest;
        /* bit n is set if the shader writes gl_ClipDistance[n] */
        unsigned                cc_dist_mask;
        unsigned                clip_dist_write;
@@ -119,6 +123,7 @@ struct r600_shader {
        boolean                 uses_doubles;
        boolean                 uses_atomics;
        boolean                 uses_images;
+       boolean                 uses_helper_invocation;
        uint8_t                 atomic_base;
        uint8_t                 rat_base;
        uint8_t                 image_size_const_offset;
@@ -131,6 +136,7 @@ union r600_shader_key {
                unsigned        image_size_const_offset:5;
                unsigned        color_two_side:1;
                unsigned        alpha_to_one:1;
+               unsigned        apply_sample_id_mask:1;
        } ps;
        struct {
                unsigned        prim_id_out:8;
@@ -171,10 +177,13 @@ struct r600_pipe_shader {
        unsigned                flatshade;
        unsigned                pa_cl_vs_out_cntl;
        unsigned                nr_ps_color_outputs;
+       unsigned                ps_color_export_mask;
+       
        union r600_shader_key   key;
        unsigned                db_shader_control;
        unsigned                ps_depth_export;
        unsigned                enabled_stream_buffers_mask;
+       unsigned                scratch_space_needed; /* size of scratch space (if > 0) counted in vec4 */
 };
 
 /* return the table index 0-5 for TGSI_INTERPOLATE_LINEAR/PERSPECTIVE and
@@ -183,6 +192,10 @@ int eg_get_interpolator_index(unsigned interpolate, unsigned location);
 
 int r600_get_lds_unique_index(unsigned semantic_name, unsigned index);
 
+int generate_gs_copy_shader(struct r600_context *rctx,
+                            struct r600_pipe_shader *gs,
+                            struct pipe_stream_output_info *so);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif