ci: fixup tests after all indirect images fixes.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3778>

diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt
index 14e83e2be690655adc26680793e876fdea00980a..bc50f08f0f60a5aad8a1f226c669fe6ea32ed86f 100644 (file)
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -594,12 +594,6 @@ spec/arb_separate_shader_objects/programuniform coverage/double matrices: skip
 spec/arb_separate_shader_objects/programuniform coverage/double scalar and vectors: skip
 spec/arb_shader_atomic_counters/max-counters/combined test above maximum number of atomic counter buffers: skip
 spec/arb_shader_image_load_store/early-z/occlusion query test/early-z pass: fail
-spec/arb_shader_image_load_store/indexing/compute shader/dynamically uniform indexing test: fail
-spec/arb_shader_image_load_store/indexing/fragment shader/dynamically uniform indexing test: fail
-spec/arb_shader_image_load_store/indexing/geometry shader/dynamically uniform indexing test: fail
-spec/arb_shader_image_load_store/indexing/tessellation control shader/dynamically uniform indexing test: fail
-spec/arb_shader_image_load_store/indexing/tessellation evaluation shader/dynamically uniform indexing test: fail
-spec/arb_shader_image_load_store/indexing/vertex shader/dynamically uniform indexing test: fail
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/r11f_g11f_b10f: fail
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/r16: fail
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/r16_snorm: fail
@@ -625,13 +619,6 @@ spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/r
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8_snorm: fail
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8i: fail
 spec/arb_shader_image_load_store/invalid/imageload/address bounds test/image2d/rg8ui: fail
-spec/arb_shader_image_load_store/max-images/combined max image uniforms test: fail
-spec/arb_shader_image_load_store/max-images/compute shader max image uniforms test: fail
-spec/arb_shader_image_load_store/max-images/fragment shader max image uniforms test: fail
-spec/arb_shader_image_load_store/max-images/geometry shader max image uniforms test: fail
-spec/arb_shader_image_load_store/max-images/tessellation control shader max image uniforms test: fail
-spec/arb_shader_image_load_store/max-images/tessellation evaluation shader max image uniforms test: fail
-spec/arb_shader_image_load_store/max-images/vertex shader max image uniforms test: fail
 spec/arb_shader_image_load_store/max-size/imagecube max size test/8192x8192x6x1: skip
 spec/arb_shader_image_load_store/max-size/imagecubearray max size test/8192x8192x6x1: skip
 spec/arb_shader_texture_image_samples/builtin-image/r8/compute/image2dms samples test/2x8x96x1: skip
@@ -1701,8 +1688,8 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    21824
-       fail:      230
+       pass:    21837
+       fail:      217
       crash:        0
        skip:     1446
     timeout:        0

diff --git a/.gitlab-ci/piglit/quick_shader.txt b/.gitlab-ci/piglit/quick_shader.txt
index 040dae3217d195330470f7b998a1b1a6bbd20502..387b832afcea1202434ac9a0ae0916efa332e12e 100644 (file)
--- a/.gitlab-ci/piglit/quick_shader.txt
+++ b/.gitlab-ci/piglit/quick_shader.txt
@@ -36,9 +36,6 @@ spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-min3-uvec4-uvec4-
 spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-min3-vec2-vec2-vec2: skip
 spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-min3-vec3-vec3-vec3: skip
 spec/amd_shader_trinary_minmax/execution/built-in-functions/cs-min3-vec4-vec4-vec4: skip
-spec/arb_arrays_of_arrays/execution/image_store/basic-imagestore-mixed-const-non-const-uniform-index: fail
-spec/arb_arrays_of_arrays/execution/image_store/basic-imagestore-mixed-const-non-const-uniform-index2: fail
-spec/arb_arrays_of_arrays/execution/image_store/basic-imagestore-non-const-uniform-index: fail
 spec/arb_bindless_texture/execution/images/basic-arithmetic-uvec2-imagestore: skip
 spec/arb_bindless_texture/execution/images/basic-imageatomicexchange: skip
 spec/arb_bindless_texture/execution/images/basic-imagestore: skip
@@ -2787,8 +2784,8 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
 summary:
        name:  results
        ----  --------
-       pass:    13582
-       fail:       93
+       pass:    13585
+       fail:       90
       crash:      178
        skip:     2515
     timeout:        0