diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch index 32f92f7ff5..34e0ff9af3 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 0d3344e17d258106617b0e6d783d073b188a2548 Mon Sep 17 00:00:00 2001 | 1 | From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001 |
2 | From: Adrian Perez de Castro <aperez@igalia.com> | 2 | From: Adrian Perez de Castro <aperez@igalia.com> |
3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 | 3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 |
4 | Subject: [PATCH] [ARM][NEON] FELightningNEON.cpp fails to build, NEON fast | 4 | Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems |
5 | path seems unused https://bugs.webkit.org/show_bug.cgi?id=241182 | 5 | unused https://bugs.webkit.org/show_bug.cgi?id=241182 |
6 | 6 | ||
7 | Reviewed by NOBODY (OOPS!). | 7 | Reviewed by NOBODY (OOPS!). |
8 | 8 | ||
@@ -30,19 +30,21 @@ left for a follow-up fix. | |||
30 | * Source/WebCore/platform/graphics/filters/PointLightSource.h: | 30 | * Source/WebCore/platform/graphics/filters/PointLightSource.h: |
31 | * Source/WebCore/platform/graphics/filters/SpotLightSource.h: | 31 | * Source/WebCore/platform/graphics/filters/SpotLightSource.h: |
32 | * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: | 32 | * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: |
33 | --- | 33 | |
34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] | 34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] |
35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
36 | 36 | --- | |
37 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- | 37 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- |
38 | .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- | 38 | .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- |
39 | .../graphics/filters/DistantLightSource.h | 4 ++ | 39 | .../graphics/filters/DistantLightSource.h | 4 ++ |
40 | .../platform/graphics/filters/FELighting.h | 7 --- | 40 | .../platform/graphics/filters/FELighting.h | 7 --- |
41 | .../graphics/filters/PointLightSource.h | 4 ++ | 41 | .../graphics/filters/PointLightSource.h | 4 ++ |
42 | .../graphics/filters/SpotLightSource.h | 4 ++ | 42 | .../graphics/filters/SpotLightSource.h | 4 ++ |
43 | .../software/FELightingSoftwareApplier.h | 16 ++++++ | 43 | .../software/FELightingSoftwareApplier.h | 16 ++++++ |
44 | 7 files changed, 57 insertions(+), 36 deletions(-) | 44 | 7 files changed, 56 insertions(+), 35 deletions(-) |
45 | 45 | ||
46 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | ||
47 | index f6ff8c20..42a97ffc 100644 | ||
46 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | 48 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp |
47 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | 49 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp |
48 | @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() | 50 | @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() |
@@ -63,6 +65,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
63 | { | 65 | { |
64 | // Calling a powf function from the assembly code would require to save | 66 | // Calling a powf function from the assembly code would require to save |
65 | // and reload a lot of NEON registers. Since the base is in range [0..1] | 67 | // and reload a lot of NEON registers. Since the base is in range [0..1] |
68 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
69 | index b17c603d..e4629cda 100644 | ||
66 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 70 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h |
67 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 71 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h |
68 | @@ -24,14 +24,15 @@ | 72 | @@ -24,14 +24,15 @@ |
@@ -104,7 +108,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
104 | 0, | 108 | 0, |
105 | 0, | 109 | 0, |
106 | 0, | 110 | 0, |
107 | @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeo | 111 | @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
108 | // Set light source arguments. | 112 | // Set light source arguments. |
109 | floatArguments.constOne = 1; | 113 | floatArguments.constOne = 1; |
110 | 114 | ||
@@ -133,7 +137,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
133 | floatArguments.lightX = spotLightSource.position().x(); | 137 | floatArguments.lightX = spotLightSource.position().x(); |
134 | floatArguments.lightY = spotLightSource.position().y(); | 138 | floatArguments.lightY = spotLightSource.position().y(); |
135 | floatArguments.lightZ = spotLightSource.position().z(); | 139 | floatArguments.lightZ = spotLightSource.position().z(); |
136 | @@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeo | 140 | @@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
137 | if (spotLightSource.specularExponent() == 1) | 141 | if (spotLightSource.specularExponent() == 1) |
138 | neonData.flags |= FLAG_CONE_EXPONENT_IS_1; | 142 | neonData.flags |= FLAG_CONE_EXPONENT_IS_1; |
139 | } else { | 143 | } else { |
@@ -142,7 +146,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
142 | floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); | 146 | floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); |
143 | floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); | 147 | floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); |
144 | floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); | 148 | floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); |
145 | @@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeo | 149 | @@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
146 | // Set lighting arguments. | 150 | // Set lighting arguments. |
147 | floatArguments.surfaceScale = data.surfaceScale; | 151 | floatArguments.surfaceScale = data.surfaceScale; |
148 | floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; | 152 | floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; |
@@ -192,16 +196,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
192 | } | 196 | } |
193 | parallelJobs.execute(); | 197 | parallelJobs.execute(); |
194 | return; | 198 | return; |
195 | @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeo | 199 | @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
196 | } // namespace WebCore | 200 | } // namespace WebCore |
197 | 201 | ||
198 | #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) | 202 | #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) |
199 | - | 203 | - |
200 | -#endif // FELightingNEON_h | 204 | -#endif // FELightingNEON_h |
205 | diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | ||
206 | index 70c6512f..b032c82e 100644 | ||
201 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 207 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
202 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 208 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
203 | @@ -25,6 +25,10 @@ | 209 | @@ -26,6 +26,10 @@ |
204 | #include "LightSource.h" | 210 | #include <wtf/ArgumentCoder.h> |
205 | #include <wtf/Ref.h> | 211 | #include <wtf/Ref.h> |
206 | 212 | ||
207 | +namespace WTF { | 213 | +namespace WTF { |
@@ -211,6 +217,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
211 | namespace WebCore { | 217 | namespace WebCore { |
212 | 218 | ||
213 | class DistantLightSource : public LightSource { | 219 | class DistantLightSource : public LightSource { |
220 | diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h | ||
221 | index 53beb596..e78a9354 100644 | ||
214 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h | 222 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h |
215 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h | 223 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h |
216 | @@ -35,8 +35,6 @@ | 224 | @@ -35,8 +35,6 @@ |
@@ -222,7 +230,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
222 | class FELighting : public FilterEffect { | 230 | class FELighting : public FilterEffect { |
223 | public: | 231 | public: |
224 | const Color& lightingColor() const { return m_lightingColor; } | 232 | const Color& lightingColor() const { return m_lightingColor; } |
225 | @@ -67,11 +65,6 @@ protected: | 233 | @@ -64,11 +62,6 @@ protected: |
226 | 234 | ||
227 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; | 235 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; |
228 | 236 | ||
@@ -234,6 +242,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
234 | Color m_lightingColor; | 242 | Color m_lightingColor; |
235 | float m_surfaceScale; | 243 | float m_surfaceScale; |
236 | float m_diffuseConstant; | 244 | float m_diffuseConstant; |
245 | diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h | ||
246 | index 3a5723f0..675d63f5 100644 | ||
237 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h | 247 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h |
238 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h | 248 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h |
239 | @@ -26,6 +26,10 @@ | 249 | @@ -26,6 +26,10 @@ |
@@ -247,6 +257,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
247 | namespace WebCore { | 257 | namespace WebCore { |
248 | 258 | ||
249 | class PointLightSource : public LightSource { | 259 | class PointLightSource : public LightSource { |
260 | diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | ||
261 | index 684626f7..dea58389 100644 | ||
250 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 262 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
251 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 263 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
252 | @@ -26,6 +26,10 @@ | 264 | @@ -26,6 +26,10 @@ |
@@ -260,6 +272,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
260 | namespace WebCore { | 272 | namespace WebCore { |
261 | 273 | ||
262 | class SpotLightSource : public LightSource { | 274 | class SpotLightSource : public LightSource { |
275 | diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | ||
276 | index c974d921..e2896660 100644 | ||
263 | --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | 277 | --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h |
264 | +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | 278 | +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h |
265 | @@ -36,6 +36,7 @@ | 279 | @@ -36,6 +36,7 @@ |