[x265] [PATCH] AArch64: Move neon-sve-bridge.h inclusion to SVE/SVE2 sources

[Hari Limaye]

Move the inclusion of neon-sve-bridge.h from sao-prim.h to the SVE/SVE2
source files where it is required, so that this header no longer
requires building with SVE/SVE2 feature flags.
---
 source/common/aarch64/sao-prim-sve.cpp  | 1 +
 source/common/aarch64/sao-prim-sve2.cpp | 1 +
 source/common/aarch64/sao-prim.h        | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/common/aarch64/sao-prim-sve.cpp b/source/common/aarch64/sao-prim-sve.cpp
index 889b42a79..47b3a7d69 100644
--- a/source/common/aarch64/sao-prim-sve.cpp
+++ b/source/common/aarch64/sao-prim-sve.cpp
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include "sao-prim.h"
+#include "neon-sve-bridge.h"
 
 /*
  * Compute Edge Offset statistics (count and stats).
diff --git a/source/common/aarch64/sao-prim-sve2.cpp b/source/common/aarch64/sao-prim-sve2.cpp
index 0653537e5..ca67e0544 100644
--- a/source/common/aarch64/sao-prim-sve2.cpp
+++ b/source/common/aarch64/sao-prim-sve2.cpp
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include "sao-prim.h"
+#include "neon-sve-bridge.h"
 
 static inline uint8x16_t sve_count(int8x16_t in)
 {
diff --git a/source/common/aarch64/sao-prim.h b/source/common/aarch64/sao-prim.h
index 8258bd477..e25f90fc1 100644
--- a/source/common/aarch64/sao-prim.h
+++ b/source/common/aarch64/sao-prim.h
@@ -24,7 +24,6 @@
 #ifndef X265_COMMON_AARCH64_SAO_PRIM_H
 #define X265_COMMON_AARCH64_SAO_PRIM_H
 
-#include "neon-sve-bridge.h"
 #include "primitives.h"
 #include <arm_neon.h>
 
-- 
2.42.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-AArch64-Move-neon-sve-bridge.h-inclusion-to-SVE-SVE2.patch
Type: text/x-patch
Size: 1855 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20241007/8ae2727a/attachment.bin>