X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Filo%2Filo_state.h;h=66c93007eb11935cf4e19349c7d32beac4f8bf31;hb=4bc9130fba2f815cb910536d3d3a253a8c3ed0b9;hp=d990269171be026d59e9890018088d5a0a738a38;hpb=9904e647cca0a15c80557ed7bcc6893faf147436;p=mesa.git

diff --git a/src/gallium/drivers/ilo/ilo_state.h b/src/gallium/drivers/ilo/ilo_state.h
index d990269171b..66c93007eb1 100644
--- a/src/gallium/drivers/ilo/ilo_state.h
+++ b/src/gallium/drivers/ilo/ilo_state.h
@@ -28,7 +28,9 @@
 #ifndef ILO_STATE_H
 #define ILO_STATE_H
 
+#include "core/ilo_builder_3d.h" /* for gen6_3dprimitive_info */
 #include "core/ilo_state_cc.h"
+#include "core/ilo_state_compute.h"
 #include "core/ilo_state_raster.h"
 #include "core/ilo_state_sampler.h"
 #include "core/ilo_state_sbe.h"
@@ -168,8 +170,6 @@ struct ilo_ib_state {
    struct pipe_resource *hw_resource;
    unsigned hw_index_size;
    struct ilo_state_index_buffer ib;
-   /* an offset to be added to pipe_draw_info::start */
-   int64_t draw_start_offset;
 };
 
 struct ilo_cbuf_cso {
@@ -202,7 +202,7 @@ struct ilo_cbuf_state {
 };
 
 struct ilo_resource_state {
-   struct pipe_surface *states[PIPE_MAX_SHADER_RESOURCES];
+   struct pipe_surface *states[PIPE_MAX_SHADER_IMAGES];
    unsigned count;
 };
 
@@ -217,11 +217,19 @@ struct ilo_view_state {
    unsigned count;
 };
 
+struct ilo_stream_output_target {
+   struct pipe_stream_output_target base;
+
+   struct ilo_state_sol_buffer sb;
+};
+
 struct ilo_so_state {
    struct pipe_stream_output_target *states[ILO_MAX_SO_BUFFERS];
    unsigned count;
    unsigned append_bitmask;
 
+   struct ilo_state_sol_buffer dummy_sb;
+
    bool enabled;
 };
 
@@ -330,6 +338,7 @@ struct ilo_global_binding {
 
 struct ilo_state_vector {
    const struct pipe_draw_info *draw;
+   struct gen6_3dprimitive_info draw_info;
 
    uint32_t dirty;