diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index 1b8389f9fbc..664242d5952 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -764,7 +764,6 @@ spec@arb_clear_texture@arb_clear_texture-3d,Fail spec@arb_clear_texture@arb_clear_texture-sized-formats,Fail spec@glsl-1.10@execution@glsl-fs-inline-explosion,Crash spec@glsl-1.10@execution@glsl-vs-inline-explosion,Crash -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail # Bisected to b3133e250e1 ("gallium: add pipe_context::resource_release to eliminate buffer refcounting") spec@!opengl 1.1@longprim,Crash diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index 6cdf1635a0c..ebb557cd801 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -247,7 +247,6 @@ spec@glsl-1.10@execution@glsl-fs-inline-explosion,Crash spec@glsl-1.10@execution@glsl-vs-inline-explosion,Fail spec@glsl-1.10@execution@loops@glsl-fs-unroll-explosion,Crash spec@glsl-1.10@execution@loops@glsl-vs-unroll-explosion,Crash -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-1.20@execution@clipping@vs-clip-vertex-primitives,Fail spec@glsl-1.20@execution@fs-underflow-mul-compare-zero,Fail spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail diff --git a/src/broadcom/ci/broadcom-rpi5-fails.txt b/src/broadcom/ci/broadcom-rpi5-fails.txt index fe115053231..ca48290ff57 100644 --- a/src/broadcom/ci/broadcom-rpi5-fails.txt +++ b/src/broadcom/ci/broadcom-rpi5-fails.txt @@ -216,7 +216,6 @@ spec@glsl-1.10@execution@glsl-fs-inline-explosion,Crash spec@glsl-1.10@execution@glsl-vs-inline-explosion,Crash spec@glsl-1.10@execution@loops@glsl-fs-unroll-explosion,Crash spec@glsl-1.10@execution@loops@glsl-vs-unroll-explosion,Crash -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-1.20@execution@clipping@vs-clip-vertex-primitives,Fail spec@glsl-1.20@execution@fs-underflow-mul-compare-zero,Fail spec@glsl-1.30@execution@varying-packing-mixed-types,Crash diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 74fb2b7e71b..e93e2481d7c 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -903,7 +903,8 @@ validate_assignment(struct _mesa_glsl_parse_state *state, } if (unsized_array) { if (is_initializer) { - if (glsl_get_scalar_type(rhs->type) == glsl_get_scalar_type(lhs->type)) + if (glsl_without_array_or_matrix(rhs->type) == + glsl_without_array_or_matrix(lhs->type)) return rhs; } else { _mesa_glsl_error(&loc, state, diff --git a/src/gallium/drivers/i915/ci/i915-g33-fails.txt b/src/gallium/drivers/i915/ci/i915-g33-fails.txt index 1225de84639..9fce4152ab4 100644 --- a/src/gallium/drivers/i915/ci/i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/i915-g33-fails.txt @@ -841,8 +841,6 @@ spec@glsl-1.10@execution@varying-packing@simple vec3 separate,Fail spec@glsl-1.10@execution@varying-packing@simple vec4 array,Fail spec@glsl-1.10@execution@varying-packing@simple vec4 separate,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail - spec@glsl-1.20@execution@array_bounds@glsl-array-bounds-13,Fail spec@glsl-1.20@execution@built-in-functions@fs-matrixcompmult-mat2x3-mat2x3,Fail diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt index 197baf46c13..1742936e8b8 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt @@ -8,7 +8,6 @@ x11-dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_stat x11-dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex,Fail x11-dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex_and_fragment,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail glx@glx-make-current,Fail diff --git a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt index e340370bb49..08d8a50f110 100644 --- a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt +++ b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt @@ -816,8 +816,6 @@ spec@ext_texture_srgb@fbo-fast-clear,Fail spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail - spec@glsl-1.20@execution@clipping@vs-clip-vertex-primitives,Fail spec@glsl-1.20@execution@fs-nan-builtin-max,Fail diff --git a/src/gallium/drivers/r600/ci/r600-turks-fails.txt b/src/gallium/drivers/r600/ci/r600-turks-fails.txt index c7b004f0a5b..7f131eadb8f 100644 --- a/src/gallium/drivers/r600/ci/r600-turks-fails.txt +++ b/src/gallium/drivers/r600/ci/r600-turks-fails.txt @@ -1206,8 +1206,6 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail - spec@glsl-1.20@execution@clipping@vs-clip-vertex-primitives,Fail spec@glsl-1.30@execution@clipping@vs-clip-distance-primitives,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv index 04c801c1380..56ed5a85515 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv @@ -15,7 +15,6 @@ spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,F spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail spec@egl_chromium_sync_control@conformance,Fail spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail spec@glsl-es-3.00@execution@built-in-functions@vs-packhalf2x16,Fail spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv index ca3b0ac23ac..3872758243f 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv @@ -14,7 +14,6 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail spec@arb_texture_multisample@sample-position@8,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail spec@glsl-es-3.00@execution@built-in-functions@vs-packhalf2x16,Fail spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv index 39a3194e980..f28beb5c661 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv @@ -14,7 +14,6 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail spec@egl 1.4@egl-ext_egl_image_storage,Crash -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail spec@glsl-es-3.00@execution@built-in-functions@vs-packhalf2x16,Fail spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-fail.csv index 16bc1de382a..19d8d0ac162 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx12-gfx1200-fail.csv @@ -11,7 +11,6 @@ spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-clip,Fail spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shading_language_packing@execution@built-in-functions@fs-packhalf2x16,Fail spec@arb_shading_language_packing@execution@built-in-functions@vs-packhalf2x16,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail spec@glsl-es-3.00@execution@built-in-functions@vs-packhalf2x16,Fail spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv index f48a047391f..f7e5cb963bf 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv @@ -16,7 +16,6 @@ spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail spec@glsl-es-3.00@execution@built-in-functions@vs-packhalf2x16,Fail spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv index 835bb4fdc2b..bfdceefb091 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv @@ -130,7 +130,6 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency ffs,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency other,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv index aba47771d85..2f4828ce159 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv @@ -122,7 +122,6 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency ffs,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency other,Fail spec@glsl-es-1.00@linker@glsl-mismatched-uniform-precision-unused,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv index 429841cfc72..da6d7198968 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv @@ -37,7 +37,6 @@ spec@glsl-4.00@compiler@built-in-functions@texturequerylod-sampler2dshadow.frag, spec@glsl-4.00@compiler@built-in-functions@texturequerylod-samplercubearrayshadow.frag,Crash spec@glsl-4.00@compiler@built-in-functions@texturequerylod-samplercubeshadow.frag,Crash spec@glsl-es-1.00@linker@glsl-mismatched-uniform-precision-unused,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency ffs,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency other,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv index 4f501a1513d..cdc8aa37f26 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv @@ -33,7 +33,6 @@ spec@egl_ext_protected_content@conformance,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-1.50@execution@geometry@primitive-types gl_triangle_strip_adjacency,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency ffs,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency other,Fail diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index 6dc09ca2683..027154eac6f 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -456,8 +456,6 @@ spec@ext_texture_snorm@texwrap formats bordercolor@GL_RGB8_SNORM- border color o spec@ext_texture_snorm@texwrap formats bordercolor@GL_RGBA16_SNORM- border color only,Fail spec@ext_texture_snorm@texwrap formats bordercolor@GL_RGBA8_SNORM- border color only,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail - spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt index 83ffe134da2..a318c85fe8b 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt @@ -350,7 +350,6 @@ spec@glsl-1.10@execution@glsl-vs-inline-explosion,Crash spec@glsl-1.10@execution@loops@glsl-fs-unroll-explosion,Crash spec@glsl-1.10@execution@loops@glsl-vs-unroll-explosion,Crash spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-clamp-z,Fail -spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail spec@glsl-es-3.00@execution@built-in-functions@fs-packhalf2x16,Fail spec@glsl-es-3.00@execution@built-in-functions@vs-packhalf2x16,Fail spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail