ilo: switch to ilo states for VF stage

Define and use

 struct ilo_vb_state;
 struct ilo_ve_state;
 struct ilo_ib_state;

in ilo_context.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/gallium/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c
index ba3fa96d513..e6ed4c9c50f 100644
--- a/src/gallium/drivers/ilo/ilo_3d.c
+++ b/src/gallium/drivers/ilo/ilo_3d.c
@@ -535,7 +535,7 @@ ilo_check_restart_index(struct ilo_context *ilo,
       return true;
 
    /* Note: indices must be unsigned byte, unsigned short or unsigned int */
-   switch (ilo->index_buffer.index_size) {
+   switch (ilo->ib.state.index_size) {
    case 1:
       return ((info->restart_index & 0xff) == 0xff);
       break;
@@ -607,15 +607,11 @@ ilo_draw_vbo_with_sw_restart(struct pipe_context *pipe,
 
    struct pipe_transfer *transfer = NULL;
    const void *map = NULL;
-   map = pipe_buffer_map(pipe,
-           ilo->index_buffer.buffer,
-           PIPE_TRANSFER_READ,
-           &transfer);
-
-   sub_prim_count = ilo_find_sub_primitives(map + ilo->index_buffer.offset,
-           ilo->index_buffer.index_size,
-           info,
-           restart_info);
+   map = pipe_buffer_map(pipe, ilo->ib.state.buffer,
+         PIPE_TRANSFER_READ, &transfer);
+
+   sub_prim_count = ilo_find_sub_primitives(map + ilo->ib.state.offset,
+           ilo->ib.state.index_size, info, restart_info);
 
    pipe_buffer_unmap(pipe, transfer);