ilo: add array_size and level_count to ilo_image

We will use them for bound checking.

diff --git a/src/gallium/drivers/ilo/core/ilo_image.c b/src/gallium/drivers/ilo/core/ilo_image.c
index 5365dd10bab3ff0360e60e189cb93ac5b2c92d9d..cf6c17f28f7e744dd252444dbeeab7f47231fce5 100644 (file)
--- a/src/gallium/drivers/ilo/core/ilo_image.c
+++ b/src/gallium/drivers/ilo/core/ilo_image.c
@@ -679,6 +679,8 @@ img_init_size_and_format(struct ilo_image *img,
    img->width0 = templ->width0;
    img->height0 = templ->height0;
    img->depth0 = templ->depth0;
+   img->array_size = templ->array_size;
+   img->level_count = templ->last_level + 1;
    img->sample_count = (templ->nr_samples) ? templ->nr_samples : 1;
 
    /*
@@ -1348,6 +1350,8 @@ img_init_for_transfer(struct ilo_image *img,
    img->width0 = templ->width0;
    img->height0 = templ->height0;
    img->depth0 = templ->depth0;
+   img->array_size = templ->array_size;
+   img->level_count = 1;
    img->sample_count = 1;
 
    img->format = templ->format;

diff --git a/src/gallium/drivers/ilo/core/ilo_image.h b/src/gallium/drivers/ilo/core/ilo_image.h
index bef08bc3ca2257007d20bc0d015bcbcaf5077de0..8307cb68f9c1e6a575a6551eea98c47e43f366a8 100644 (file)
--- a/src/gallium/drivers/ilo/core/ilo_image.h
+++ b/src/gallium/drivers/ilo/core/ilo_image.h
@@ -94,6 +94,8 @@ struct ilo_image {
    unsigned width0;
    unsigned height0;
    unsigned depth0;
+   unsigned array_size;
+   unsigned level_count;
    unsigned sample_count;
    enum pipe_format format;
    bool separate_stencil;