ci/deqp-runner: split gl & gles groups to use the correct binary

Now that these can come from different releases, with different sets of
patches backported to them, it matters that we use the correct one.

Fixes: 78ea3bb43d ("ci/deqp: use the proper gl/gles releases for deqp-gl*, deqp-gles*, deqp-egl")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28343>

src/amd/ci/deqp-radeonsi-vangogh.toml

@@ -1,14 +1,54 @@
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = [
+    "/deqp/mustpass/gles31-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = [
+    "/deqp/mustpass/gles3-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = [
+    "/deqp/mustpass/gles2-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
-    # The GL* tests include the tests for the previous versions, but the GLES*
+    # The GLES* tests don't include the tests for the previous versions.
-    # tests don't.
-    "/deqp/mustpass/gles2-main.txt",
-    "/deqp/mustpass/gles3-main.txt",
-    "/deqp/mustpass/gles31-main.txt",
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    # The GL* tests include the tests for the previous versions.
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/broadcom/ci/deqp-broadcom-rpi3.toml

@@ -1,9 +1,6 @@
 [[deqp]]
-deqp = "/deqp/external/openglcts/modules/glcts"
+deqp = "/deqp/modules/gles2/deqp-gles2"
-caselists = [
+caselists = ["/deqp/mustpass/gles2-main.txt"]
-    "/deqp/mustpass/gles2-main.txt",
-    "/deqp/mustpass/gles2-khr-main.txt",
-]
 tests_per_group = 250
 deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
@@ -15,6 +12,18 @@ deqp_args = [
 version_check = "GL ES 2.0.*git"
 renderer_check = "VC4"
 
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = ["/deqp/mustpass/gles2-khr-main.txt"]
+tests_per_group = 250
+deqp_args = [
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-surface-width=256",
+    "--deqp-visibility=hidden",
+]
+
 # We are getting frequent GPU hangs with piglit, but still haven't identified
 # the cause. So let's disable it for now.
 # [[piglit]]

src/broadcom/ci/deqp-broadcom-rpi4.toml

@@ -1,14 +1,6 @@
 [[deqp]]
-deqp = "/deqp/external/openglcts/modules/glcts"
+deqp = "/deqp/modules/gles31/deqp-gles31"
-caselists = [
+caselists = ["/deqp/mustpass/gles31-main.txt"]
-    "/deqp/mustpass/gles31-main.txt",
-    "/deqp/mustpass/gles3-main.txt",
-    "/deqp/mustpass/gles2-main.txt",
-    "/deqp/mustpass/gles31-khr-main.txt",
-    "/deqp/mustpass/gles3-khr-main.txt",
-    "/deqp/mustpass/gles2-khr-main.txt",
-    "/deqp/mustpass/gl31-main.txt",
-]
 deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
     "--deqp-surface-height=256",
@@ -19,6 +11,54 @@ deqp_args = [
 version_check = "GL ES 3.1.*git"
 renderer_check = "V3D"
 
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = ["/deqp/mustpass/gles3-main.txt"]
+deqp_args = [
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-surface-width=256",
+    "--deqp-visibility=hidden",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-main.txt"]
+deqp_args = [
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-surface-width=256",
+    "--deqp-visibility=hidden",
+]
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gles31-khr-main.txt",
+    "/deqp/mustpass/gles3-khr-main.txt",
+    "/deqp/mustpass/gles2-khr-main.txt",
+]
+deqp_args = [
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-surface-width=256",
+    "--deqp-visibility=hidden",
+]
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = ["/deqp/mustpass/gl31-main.txt"]
+deqp_args = [
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-surface-width=256",
+    "--deqp-visibility=hidden",
+]
+
 [[piglit]]
 piglit_folder = "/piglit"
 profile = "gpu"

src/freedreno/ci/deqp-freedreno-a618.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["install/freedreno-a618-premerge-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
 ]
 skips = ["install/freedreno-a618-premerge-skips.txt"]

src/freedreno/ci/deqp-freedreno-a630.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
 ]
 skips = ["install/freedreno-a630-premerge-skips.txt"]

src/freedreno/ci/deqp-freedreno-a660.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["install/freedreno-a660-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
 ]
 skips = ["install/freedreno-a660-skips.txt"]

src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml

@@ -37,15 +37,27 @@ deqp_args = [
   # Costs about 30% extra runtime.
   NIR_DEBUG="clone,serialize"
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl45-main.txt",
     "/deqp/mustpass/gl45-khr-single.txt",
 ]

src/gallium/drivers/r300/ci/deqp-r300-rv380.toml

@@ -1,12 +1,19 @@
-version_check = "GL ES 2.0.*git"
-renderer_check = "RV370"
-
 [[deqp]]
-deqp = "/deqp/external/openglcts/modules/glcts"
+deqp = "/deqp/modules/gles2/deqp-gles2"
-caselists = [
+caselists = ["/deqp/mustpass/gles2-main.txt"]
-    "/deqp/mustpass/gles2-khr-main.txt",
+deqp_args = [
-    "/deqp/mustpass/gles2-main.txt",
+    "--deqp-surface-width=256",
-]
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+version_check = "GL ES 2.0.*git"
+renderer_check = "RV370"
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = ["/deqp/mustpass/gles2-khr-main.txt"]
 deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-surface-height=256",

src/gallium/drivers/softpipe/ci/deqp-softpipe.toml

@@ -33,15 +33,27 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl33-main.txt",
 ]
 deqp_args = [

src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml

@@ -39,8 +39,6 @@ timeout = 180.0
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
-    "/deqp/mustpass/gl46-main.txt",
-    "/deqp/mustpass/gl46-khr-single.txt",
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
@@ -54,6 +52,21 @@ deqp_args = [
 ]
 timeout = 180.0
 
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gl46-main.txt",
+    "/deqp/mustpass/gl46-khr-single.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+timeout = 180.0
+
 # 565-nozs
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"

src/gallium/drivers/zink/ci/deqp-zink-freedreno-a618.toml

@@ -28,9 +28,6 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [

src/gallium/drivers/zink/ci/deqp-zink-radv.toml

@@ -4,6 +4,20 @@ caselists = [
     "/deqp/mustpass/gles2-main.txt",
     "/deqp/mustpass/gles3-main.txt",
     "/deqp/mustpass/gles31-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+timeout = 180.0
+renderer_check = "zink.*RADV"
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
 ]
 deqp_args = [

src/intel/ci/deqp-anv-jsl-angle-full.toml

@@ -28,9 +28,6 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [

src/intel/ci/deqp-anv-jsl-angle.toml

@@ -31,9 +31,6 @@ deqp_args = [
 ]
 fraction = 6
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [

src/intel/ci/deqp-anv-tgl-angle-full.toml

@@ -28,9 +28,6 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [

src/intel/ci/deqp-anv-tgl-angle.toml

@@ -30,9 +30,6 @@ deqp_args = [
 ]
 fraction = 3
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [

src/intel/ci/deqp-iris-amly.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/intel/ci/deqp-iris-apl.toml

@@ -33,15 +33,26 @@ deqp_args = [
 ]
 fraction = 3
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/intel/ci/deqp-iris-cml.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/intel/ci/deqp-iris-glk.toml

@@ -34,15 +34,27 @@ deqp_args = [
 ]
 fraction = 8
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+fraction = 2
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/intel/ci/deqp-iris-jsl.toml

@@ -31,15 +31,27 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+timeout = 90.0  # Some tests take a bit over 60 seconds
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/intel/ci/deqp-iris-kbl.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]

src/intel/ci/deqp-iris-whl.toml

@@ -31,15 +31,26 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
 
-# Note that KHR-GL3* test sets include all tests from the previous
-# version, so we only need to run one test list (unlike dEQP-GLES,
-# where the test sets are separate).
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
     "/deqp/mustpass/gles2-khr-main.txt",
     "/deqp/mustpass/gles3-khr-main.txt",
     "/deqp/mustpass/gles31-khr-main.txt",
+]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+# Note that KHR-GL3* test sets include all tests from the previous
+# version, so we only need to run one test list (unlike dEQP-GLES,
+# where the test sets are separate).
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
     "/deqp/mustpass/gl46-main.txt",
     "/deqp/mustpass/gl46-khr-single.txt",
 ]