From: Hemanth Kumar M D <[email protected]> Avoid conflict with C++20 std::lerp from <cmath>, which causes redefinition and ambiguous call errors with newer toolchains.
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/piglit/-/commit/ec0fc2fef0755b1595c3799ab25129174a4b2007] Signed-off-by: Hemanth Kumar M D <[email protected]> --- ...h-rename-local-lerp-to-linear_interp.patch | 46 +++++++++++++++++++ meta/recipes-graphics/piglit/piglit_git.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch diff --git a/meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch b/meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch new file mode 100644 index 0000000000..05f1dd687a --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch @@ -0,0 +1,46 @@ +From ec0fc2fef0755b1595c3799ab25129174a4b2007 Mon Sep 17 00:00:00 2001 +From: Vinson Lee <[email protected]> +Date: Sat, 7 Feb 2026 18:39:39 -0800 +Subject: [PATCH] fbo-blit-stretch: rename local lerp to linear_interp + +Avoid conflict with C++20 std::lerp from <cmath>, which +causes redefinition and ambiguous call errors with newer +toolchains. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/piglit/-/commit/ec0fc2fef0755b1595c3799ab25129174a4b2007] + +Signed-off-by: Vinson Lee <[email protected]> +Signed-off-by: Hemanth Kumar M D <[email protected]> +--- + tests/fbo/fbo-blit-stretch.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/fbo/fbo-blit-stretch.cpp b/tests/fbo/fbo-blit-stretch.cpp +index a83288c0f..b0d362ecd 100644 +--- a/tests/fbo/fbo-blit-stretch.cpp ++++ b/tests/fbo/fbo-blit-stretch.cpp +@@ -173,7 +173,7 @@ clamp(GLint &x, GLint xmin, GLint xmax) + } + + static float +-lerp(float x0, float x1, float w) ++linear_interp(float x0, float x1, float w) + { + return x0 + (x1 - x0) * w; + } +@@ -181,9 +181,9 @@ lerp(float x0, float x1, float w) + static float + lerp2d(float xy00, float xy01, float xy10, float xy11, float wx, float wy) + { +- float y0 = lerp(xy00, xy01, wx); +- float y1 = lerp(xy10, xy11, wx); +- return lerp(y0, y1, wy); ++ float y0 = linear_interp(xy00, xy01, wx); ++ float y1 = linear_interp(xy10, xy11, wx); ++ return linear_interp(y0, y1, wy); + } + + static float clearColor[4] = { +-- +2.49.0 + diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 7659635062..0dd9c58714 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch \ file://0001-tests-no_error.py-modify-_command-and-not-command.patch \ file://0001-generated_tests-use-shape-in-place-of-newshape-on-nu.patch \ + file://0001-fbo-blit-stretch-rename-local-lerp-to-linear_interp.patch \ " UPSTREAM_CHECK_COMMITS = "1" -- 2.49.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236610): https://lists.openembedded.org/g/openembedded-core/message/236610 Mute This Topic: https://lists.openembedded.org/mt/119201158/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
