ilo: switch to ilo states for shaders and resources

[mesa.git] / src / gallium / drivers / ilo / ilo_shader.c

diff --git a/src/gallium/drivers/ilo/ilo_shader.c b/src/gallium/drivers/ilo/ilo_shader.c
index 86268b1a9f04ff24082b1250735f4f6b8965a5c3..76ba7f04c667aefbf45bb8f8028be0b56d039b88 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_shader.c
+++ b/src/gallium/drivers/ilo/ilo_shader.c
@@ -72,15 +72,15 @@ ilo_shader_variant_init(struct ilo_shader_variant *variant,
       break;
    }
 
-   num_views = ilo->sampler_views[info->type].num_views;
+   num_views = ilo->view[info->type].count;
    assert(info->num_samplers <= num_views);
 
    variant->num_sampler_views = info->num_samplers;
    for (i = 0; i < info->num_samplers; i++) {
       const struct pipe_sampler_view *view =
-         ilo->sampler_views[info->type].views[i];
+         ilo->view[info->type].states[i];
       const struct pipe_sampler_state *sampler =
-         ilo->samplers[info->type].samplers[i];
+         ilo->sampler[info->type].states[i];
 
       if (view) {
          variant->sampler_view_swizzles[i].r = view->swizzle_r;