shader: Update last image index also for created arrays

Remove an unnecessary type cast as well.

v2: Update expectations

Signed-off-by: Gert Wollny <gert.wollny@collabora.co.uk>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1157>

5 files changed, 4 insertions, 9 deletions

diff --git a/.gitlab-ci/expectations/host/virgl-gl-fails.txt b/.gitlab-ci/expectations/host/virgl-gl-fails.txt
index 7cdde53..92fd210 100644
--- a/.gitlab-ci/expectations/host/virgl-gl-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gl-fails.txt
@@ -138,8 +138,6 @@ spec@arb_shader_image_load_store@layer@image2DMSArray/layered binding test,Fail
 spec@arb_shader_image_load_store@layer@image2DMSArray/non-layered binding test,Fail
 spec@arb_shader_image_load_store@layer@image2DMS/layered binding test,Fail
 spec@arb_shader_image_load_store@layer@image2DMS/non-layered binding test,Fail
-spec@arb_shader_image_load_store@max-images@Combined max image uniforms test,Fail
-spec@arb_shader_image_load_store@max-images,Fail
 spec@arb_shader_image_load_store@max-size,Fail
 spec@arb_shader_image_load_store@max-size@image2DMSArray max size test/4x8x8x2048,Fail
 spec@arb_shader_image_load_store@max-size@image2DMS max size test/4x16384x8x1,Fail
diff --git a/.gitlab-ci/expectations/host/virgl-gles-fails.txt b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
index 3bf545c..9c7a639 100644
--- a/.gitlab-ci/expectations/host/virgl-gles-fails.txt
+++ b/.gitlab-ci/expectations/host/virgl-gles-fails.txt
@@ -260,8 +260,6 @@ spec@arb_shader_image_load_store@early-z,ExpectedFail
 spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,ExpectedFail
 spec@arb_shader_image_load_store@early-z@occlusion query test/late-z pass,Fail
 spec@arb_shader_image_load_store@execution@disable_early_z,Fail
-spec@arb_shader_image_load_store@max-images@Combined max image uniforms test,Fail
-spec@arb_shader_image_load_store@max-images,Fail
 spec@arb_shader_image_load_store@max-size,Fail
 spec@arb_shader_image_load_store@max-size@image1DArray max size test/16384x8x1x1,Fail
 spec@arb_shader_image_load_store@max-size@image1DArray max size test/8x2048x1x1,Fail
diff --git a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
index a43b021..5184d9b 100644
--- a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt
@@ -99,8 +99,6 @@ spec@arb_shader_image_load_store@layer@image2DMSArray/layered binding test,Fail
 spec@arb_shader_image_load_store@layer@image2DMSArray/non-layered binding test,Fail
 spec@arb_shader_image_load_store@layer@image2DMS/layered binding test,Fail
 spec@arb_shader_image_load_store@layer@image2DMS/non-layered binding test,Fail
-spec@arb_shader_image_load_store@max-images@Combined max image uniforms test,Fail
-spec@arb_shader_image_load_store@max-images,Fail
 spec@arb_shader_image_load_store@max-size,Fail
 spec@arb_shader_image_load_store@max-size@image2DMSArray max size test/4x8x8x2048,Fail
 spec@arb_shader_image_load_store@max-size@image2DMS max size test/4x16384x8x1,Fail
diff --git a/.gitlab-ci/expectations/virt/virgl-gles-fails.txt b/.gitlab-ci/expectations/virt/virgl-gles-fails.txt
index f0d0132..a0f1419 100644
--- a/.gitlab-ci/expectations/virt/virgl-gles-fails.txt
+++ b/.gitlab-ci/expectations/virt/virgl-gles-fails.txt
@@ -289,8 +289,6 @@ spec@arb_shader_image_load_store@early-z,ExpectedFail
 spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,ExpectedFail
 spec@arb_shader_image_load_store@early-z@occlusion query test/late-z pass,Fail
 spec@arb_shader_image_load_store@execution@disable_early_z,Fail
-spec@arb_shader_image_load_store@max-images@Combined max image uniforms test,Fail
-spec@arb_shader_image_load_store@max-images,Fail
 spec@arb_shader_image_load_store@max-size,Crash
 spec@arb_shader_image_load_store@max-size@image1D max size test/16384x1x1x1,Fail
 spec@arb_shader_image_load_store@restrict,Fail
diff --git a/src/vrend_shader.c b/src/vrend_shader.c
index a40d339..c2bee98 100644
--- a/src/vrend_shader.c
+++ b/src/vrend_shader.c
@@ -900,6 +900,8 @@ static bool add_images(struct dump_ctx *ctx, int first, int last,
              !memcmp(&ctx->images[last_array->first].decl, &ctx->images[first].decl, sizeof(ctx->images[first].decl)) &&
              ctx->images[last_array->first].image_return == ctx->images[first].image_return) {
             last_array->array_size += last - first + 1;
+            if (ctx->image_last_binding < last)
+               ctx->image_last_binding = last;
             return true;
          }
       }
@@ -912,7 +914,8 @@ static bool add_images(struct dump_ctx *ctx, int first, int last,
       ctx->image_arrays[ctx->num_image_arrays - 1].first = first;
       ctx->image_arrays[ctx->num_image_arrays - 1].array_size = last - first + 1;
    }
-   if ((int)ctx->image_last_binding < last)
+
+   if (ctx->image_last_binding < last)
       ctx->image_last_binding = last;
    return true;
 }