From f908bf1e7f9f300797a2ffb858fbee51c41ab433 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 11 Nov 2024 18:40:00 +0100 Subject: [PATCH] ci/deqp: cherry-pick fixes for building GL and GLES deqp on Android The main branch of dEQP build fine for android but the GL and GLES branches fail with errors like the following: ----------------------------------------------------------------------- .../external/openglcts/modules/common/glcFramebufferBlitTests.cpp:715:26: error: no member named 'floor' in namespace 'std' return (GLubyte)std::floor(f == 1.0f ? 255 : f * 255.0); ~~~~~^ .../external/openglcts/modules/common/glcFramebufferBlitTests.cpp:1491:14: error: no member named 'fabs' in namespace 'std' if (std::fabs(actual - expected) > eps) ~~~~~^ 2 errors generated. ----------------------------------------------------------------------- Cherry-pick a couple of commit from main that fix the errors. Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/container/build-deqp.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 838c747a751..e15a31353e3 100755 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -55,6 +55,11 @@ vk_cts_patch_files=( # shellcheck disable=SC2034 gl_cts_commits_to_backport=( + # Add #include in deMath.h when being compiled by C++ + 71808fe7d0a640dfd703e845d93ba1c5ab751055 + # Revert "Add #include in deMath.h when being compiled by C++ compiler" + # This also adds an alternative fix along with the revert. + 6164879a0acce258637d261592a9c395e564b361 ) # shellcheck disable=SC2034 @@ -71,6 +76,11 @@ fi # shellcheck disable=SC2034 # GLES builds also EGL gles_cts_commits_to_backport=( + # Add #include in deMath.h when being compiled by C++ + 71808fe7d0a640dfd703e845d93ba1c5ab751055 + # Revert "Add #include in deMath.h when being compiled by C++ compiler" + # This also adds an alternative fix along with the revert. + 6164879a0acce258637d261592a9c395e564b361 ) # shellcheck disable=SC2034