0001-Remove-ARM-specific-declarations-in-FELighting.patch 3.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. From 8863ceb3c8486f31e1ccfcd2c7c602fad9feac52 Mon Sep 17 00:00:00 2001
  2. From: Adrian Perez de Castro <aperez@igalia.com>
  3. Date: Mon, 27 May 2024 02:09:58 +0300
  4. Subject: [PATCH] Cherry-pick 279334@main (36d1b5d7c0ef). <bug>
  5. Remove ARM-specific declarations in FELighting.h unneeded after 272873@main
  6. Unreviewed build fix.
  7. * Source/WebCore/platform/graphics/filters/FELighting.h: Remove unneeded
  8. declarations for the getPowerCoefficients() and platformApplyNeon()
  9. functions, which are now defined elsewhere; and were causing a build
  10. failure due to usage of the protected LightingData type.
  11. * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp:
  12. (WebCore::FELightingNeonParallelApplier::applyPlatformParallel const):
  13. Add missing LightType:: namespace to uses of LS_POINT and LS_SPOT.
  14. Canonical link: https://commits.webkit.org/279334@main
  15. Canonical link: https://commits.webkit.org/274313.261@webkitglib/2.44
  16. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
  17. Upstream: https://github.com/WebKit/WebKit/commit/8863ceb3c8486f31e1ccfcd2c7c602fad9feac52
  18. ---
  19. .../cpu/arm/filters/FELightingNeonParallelApplier.cpp | 4 ++--
  20. Source/WebCore/platform/graphics/filters/FELighting.h | 5 -----
  21. 2 files changed, 2 insertions(+), 7 deletions(-)
  22. diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp
  23. index 04d855fa6d71..5f4250d87b61 100644
  24. --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp
  25. +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp
  26. @@ -542,14 +542,14 @@ void FELightingNeonParallelApplier::applyPlatformParallel(const LightingData& da
  27. floatArguments.colorBlue = color.blue;
  28. floatArguments.padding4 = 0;
  29. - if (data.lightSource->type() == LS_POINT) {
  30. + if (data.lightSource->type() == LightType::LS_POINT) {
  31. neonData.flags |= FLAG_POINT_LIGHT;
  32. auto& pointLightSource = downcast<PointLightSource>(*data.lightSource);
  33. floatArguments.lightX = pointLightSource.position().x();
  34. floatArguments.lightY = pointLightSource.position().y();
  35. floatArguments.lightZ = pointLightSource.position().z();
  36. floatArguments.padding2 = 0;
  37. - } else if (data.lightSource->type() == LS_SPOT) {
  38. + } else if (data.lightSource->type() == LightType::LS_SPOT) {
  39. neonData.flags |= FLAG_SPOT_LIGHT;
  40. auto& spotLightSource = downcast<SpotLightSource>(*data.lightSource);
  41. floatArguments.lightX = spotLightSource.position().x();
  42. diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h
  43. index 4efab920b1c3..dcd80b6f42b7 100644
  44. --- a/Source/WebCore/platform/graphics/filters/FELighting.h
  45. +++ b/Source/WebCore/platform/graphics/filters/FELighting.h
  46. @@ -68,11 +68,6 @@ protected:
  47. std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override;
  48. -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
  49. - static int getPowerCoefficients(float exponent);
  50. - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);
  51. -#endif
  52. -
  53. Color m_lightingColor;
  54. float m_surfaceScale;
  55. float m_diffuseConstant;
  56. --
  57. 2.45.2