From 1fa987ae5ebc5e40fb7a321a85d03c6c0a610065 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Thu, 27 Feb 2020 13:30:29 +0100 Subject: [PATCH] gitlab-ci: Use PAN_MESA_DEBUG=gles3 for Panfrost We can drop now the GLES version overrides now that we have a DEBUG flag that enables all what is expected from a GLES 3.0 implementation. Signed-off-by: Tomeu Vizoso Reviewed-by: Alyssa Rosenzweig Part-of: --- .gitlab-ci/lava-gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 72337edf8ea..ea67546aac4 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -71,7 +71,7 @@ panfrost-t720-gles2:arm64: variables: DEVICE_TYPE: sun50i-h6-pine-h64 GPU_VERSION: panfrost-t720 - ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6" + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6" tags: - lava-sun50i-h6-pine-h64 @@ -82,7 +82,7 @@ panfrost-t760-gles2:armhf: GPU_VERSION: panfrost-t760 BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" - ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6" + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6" tags: - lava-rk3288-veyron-jaq @@ -93,7 +93,7 @@ panfrost-t860-gles2:arm64: GPU_VERSION: panfrost-t860 BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" - ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6" + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6" tags: - lava-rk3399-gru-kevin @@ -105,7 +105,7 @@ panfrost-t860-gles3:arm64: BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" DEQP_VERSION: gles3 - ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 MESA_GLSL_VERSION_OVERRIDE=300 PAN_MESA_DEBUG=deqp DEQP_PARALLEL=6" + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6" CI_NODE_INDEX: 1 CI_NODE_TOTAL: 5 tags: @@ -117,7 +117,7 @@ panfrost-t860-gles3:arm64: DEVICE_TYPE: meson-gxm-khadas-vim2 GPU_VERSION: panfrost-t820 LAVA_TAGS: panfrost - ENV_VARS: "MESA_GLES_VERSION_OVERRIDE=3.0 DEQP_PARALLEL=6" + ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6" tags: - lava-meson-gxm-khadas-vim2 -- 2.30.2