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 3b3e667ec567efa3b934e74bf62cdf63da47a35c..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,8 +72,8 @@ 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;
@@ -135,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;
@@ -190,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