ilo: add a new struct for context states

Move pipe states in ilo_context to the new ilo_state_vector.  The motivation
is that ilo_context consists of several loosely related things.  When we need
an ilo_context somewhere, we usually need only one or two of the things in it.
This change makes ilo_state_vector one such thing.

An immediate result is that we no longer need ilo_context in 3D pipelines,
something we have planned for since early days.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/gallium/drivers/ilo/ilo_blit.h b/src/gallium/drivers/ilo/ilo_blit.h
index fe228f879b9..fed8776e4be 100644
--- a/src/gallium/drivers/ilo/ilo_blit.h
+++ b/src/gallium/drivers/ilo/ilo_blit.h
@@ -33,8 +33,6 @@
 #include "ilo_state.h"
 #include "ilo_resource.h"
 
-struct ilo_context;
-
 void
 ilo_blit_resolve_slices_for_hiz(struct ilo_context *ilo,
                                 struct pipe_resource *res, unsigned level,
@@ -157,14 +155,15 @@ ilo_blit_resolve_view(struct ilo_context *ilo,
 static inline void
 ilo_blit_resolve_framebuffer(struct ilo_context *ilo)
 {
-   const struct pipe_framebuffer_state *fb = &ilo->fb.state;
+   struct ilo_state_vector *vec = &ilo->state_vector;
+   const struct pipe_framebuffer_state *fb = &vec->fb.state;
    unsigned sh, i;
 
    /* Not all bound views are sampled by the shaders.  How do we tell? */
-   for (sh = 0; sh < Elements(ilo->view); sh++) {
-      for (i = 0; i < ilo->view[sh].count; i++) {
-         if (ilo->view[sh].states[i])
-            ilo_blit_resolve_view(ilo, ilo->view[sh].states[i]);
+   for (sh = 0; sh < Elements(vec->view); sh++) {
+      for (i = 0; i < vec->view[sh].count; i++) {
+         if (vec->view[sh].states[i])
+            ilo_blit_resolve_view(ilo, vec->view[sh].states[i]);
       }
    }