v3d/ci: enable glsl 1.30 and 1.40 piglit tests

Now that we are exposing OpenGL 3.1, let's enable the proper supported
GLSL versions.

Acked-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22660>

diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index 370369e..6394acf 100644 (file)
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -444,6 +444,44 @@ spec@glsl-1.10@execution@glsl-vs-inline-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@built-in constants,Fail
+spec@glsl-1.30@built-in constants@gl_MaxDrawBuffers,Fail
+spec@glsl-1.30@execution@clipping@fs-clip-distance-interpolated,Crash
+spec@glsl-1.30@execution@clipping@vs-clip-distance-primitives,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texture(bias) 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texture(bias) 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturegrad 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturegrad 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturegradoffset 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturegradoffset 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturelod 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturelod 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturelodoffset 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection texturelodoffset 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection textureoffset 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection textureoffset 1darrayshadow,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection textureoffset(bias) 1darray,Fail
+spec@glsl-1.30@execution@tex-miplevel-selection textureoffset(bias) 1darrayshadow,Fail
+spec@glsl-1.30@execution@texelfetch fs sampler1darray 1x281-501x281,Fail
+spec@glsl-1.30@execution@texelfetch fs sampler1darray 1x71-501x71,Fail
+spec@glsl-1.30@execution@texelfetch fs sampler1darray 281x1-281x281,Fail
+spec@glsl-1.30@execution@texelfetch fs sampler1darray 71x1-71x281,Fail
+spec@glsl-1.30@execution@texelfetch@fs-texelfetch-isampler1darray,Fail
+spec@glsl-1.30@execution@texelfetch@fs-texelfetch-sampler1darray,Fail
+spec@glsl-1.30@execution@texelfetch@fs-texelfetch-usampler1darray,Fail
+spec@glsl-1.30@execution@texelfetch@vs-texelfetch-isampler1darray,Fail
+spec@glsl-1.30@execution@texelfetch@vs-texelfetch-sampler1darray,Fail
+spec@glsl-1.30@execution@texelfetch@vs-texelfetch-usampler1darray,Fail
+spec@glsl-1.30@execution@texelfetchoffset@fs-texelfetch-isampler1darray,Fail
+spec@glsl-1.30@execution@texelfetchoffset@fs-texelfetch-sampler1darray,Fail
+spec@glsl-1.30@execution@texelfetchoffset@fs-texelfetch-usampler1darray,Fail
+spec@glsl-1.30@execution@texelfetchoffset@vs-texelfetch-isampler1darray,Fail
+spec@glsl-1.30@execution@texelfetchoffset@vs-texelfetch-sampler1darray,Fail
+spec@glsl-1.30@execution@texelfetchoffset@vs-texelfetch-usampler1darray,Fail
+spec@glsl-1.40@built-in constants,Fail
+spec@glsl-1.40@built-in constants@gl_MaxDrawBuffers,Fail
 spec@intel_performance_query@intel_performance_query-issue_2235,Fail
 spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail
 spec@khr_texture_compression_astc@miptree-gles srgb-fp@sRGB decode full precision,Fail

diff --git a/src/broadcom/ci/broadcom-rpi4-skips.txt b/src/broadcom/ci/broadcom-rpi4-skips.txt
index 1ad880f..8c905e5 100644 (file)
--- a/src/broadcom/ci/broadcom-rpi4-skips.txt
+++ b/src/broadcom/ci/broadcom-rpi4-skips.txt
@@ -1,4 +1,5 @@
 # Slow tests (> 1 minute to run)
+spec@!opengl 1.0@gl-1.0-blend-func
 spec@!opengl 1.1@streaming-texture-leak
 spec@!opengl 1.2@tex3d-maxsize
 spec@arb_texture_multisample@large-float-texture-array-fp16
@@ -9,16 +10,19 @@ spec@arb_texture_multisample@texelfetch fs sampler2dmsarray 4 98x1x9-98x129x9
 spec@ext_texture_env_combine@texture-env-combine
 spec@glsl-1.10@execution@loops@glsl-fs-unroll-explosion
 spec@glsl-1.10@execution@loops@glsl-vs-unroll-explosion
-spec@!opengl 1.0@gl-1.0-blend-func
+spec@glsl-1.30@execution@texelfetch fs sampler2d 1x281-501x281
 
-# Extensions not supported
+# Versions / Extensions not supported
 spec@!opengl 3.2@.*
+spec@!opengl 3.3@.*
+spec@!opengl 4.2@.*
+spec@!opengl 4.3@.*
+spec@!opengl 4.4@.*
+spec@!opengl 4.5@.*
 spec@arb_gpu_shader5.*
 spec@arb_gpu_shader_fp64.*
 spec@arb_gpu_shader_int64.*
 spec@arb_tessellation_shader.*
-spec@glsl-1.30.*
-spec@glsl-1.40.*
 spec@glsl-1.50.*
 spec@glsl-3.*
 spec@glsl-4.*