Disable neon in qcms.

diff --git a/debian/changelog b/debian/changelog
index 3950fa607c4873c4eba020aab9853740ecb522e3..bf6e50c61feb511b8f58c559e751d9b1c2df214c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ firefox-esr (78.3.0esr-2+rpi1) bullseye-staging; urgency=medium
 
   [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
   * Clean up pycache directories.
+  * Disable neon in qcms.
 
  -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Oct 2020 09:12:23 +0000
 

diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h
index 0daeda9614eafb303443a34898cfac162d01af32..71fc31bc038b087b0425a95b2a5e94442c02ce0f 100644 (file)
--- a/gfx/qcms/qcmsint.h
+++ b/gfx/qcms/qcmsint.h
@@ -344,18 +344,18 @@ void qcms_transform_data_bgra_out_lut_altivec(const qcms_transform *transform,
                                               unsigned char *dest,
                                               size_t length);
 
-void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
-                                          const unsigned char *src,
-                                          unsigned char *dest,
-                                          size_t length);
-void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
-                                           const unsigned char *src,
-                                           unsigned char *dest,
-                                           size_t length);
-void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
-                                           const unsigned char *src,
-                                           unsigned char *dest,
-                                           size_t length);
+//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
+//                                          const unsigned char *src,
+//                                          unsigned char *dest,
+//                                          size_t length);
+//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
+//                                           const unsigned char *src,
+//                                           unsigned char *dest,
+//                                           size_t length);
+//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
+//                                           const unsigned char *src,
+//                                           unsigned char *dest,
+//                                           size_t length);
 
 extern bool qcms_supports_iccv4;
 extern bool qcms_supports_neon;

diff --git a/gfx/qcms/transform.cpp b/gfx/qcms/transform.cpp
index 21bc5a55eaeb47b3e3308ff6cfabb354f5b3ae77..5c8ab6226403113e4dbe7baba785192a53c8743b 100644 (file)
--- a/gfx/qcms/transform.cpp
+++ b/gfx/qcms/transform.cpp
@@ -1240,7 +1240,7 @@ qcms_transform* qcms_transform_create(
 #endif
                    } else
 #endif
-#if defined(__arm__) || defined(__aarch64__)
+#if 0 // defined(__arm__) || defined(__aarch64__)
                     if (qcms_supports_neon) {
                            if (in_type == QCMS_DATA_RGB_8) {
                                    transform->transform_fn = qcms_transform_data_rgb_out_lut_neon;

diff --git a/gfx/tests/gtest/TestQcms.cpp b/gfx/tests/gtest/TestQcms.cpp
index 83d361e17df28b57fe112bae8ce8b006b0f09741..a5f2c6414d24e5f4258333d0c179e11691153276 100644 (file)
--- a/gfx/tests/gtest/TestQcms.cpp
+++ b/gfx/tests/gtest/TestQcms.cpp
@@ -493,11 +493,11 @@ void GfxQcms_ProfilePairBase::TransformPrecachePlatformExt() {
     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_avx));
   }
 #endif
-#ifdef MOZILLA_MAY_SUPPORT_NEON
-  if (mozilla::supports_neon()) {
-    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
-  }
-#endif
+//#ifdef MOZILLA_MAY_SUPPORT_NEON
+//  if (mozilla::supports_neon()) {
+//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
+//  }
+//#endif
 
   // Verify RGBA transforms.
   ASSERT_TRUE(SetBuffers(QCMS_DATA_RGBA_8));
@@ -518,11 +518,11 @@ void GfxQcms_ProfilePairBase::TransformPrecachePlatformExt() {
     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_avx));
   }
 #endif
-#ifdef MOZILLA_MAY_SUPPORT_NEON
-  if (mozilla::supports_neon()) {
-    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
-  }
-#endif
+//#ifdef MOZILLA_MAY_SUPPORT_NEON
+//  if (mozilla::supports_neon()) {
+//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
+//  }
+//#endif
 
   // Verify BGRA transforms.
   ASSERT_TRUE(SetBuffers(QCMS_DATA_BGRA_8));
@@ -543,11 +543,11 @@ void GfxQcms_ProfilePairBase::TransformPrecachePlatformExt() {
     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_avx));
   }
 #endif
-#ifdef MOZILLA_MAY_SUPPORT_NEON
-  if (mozilla::supports_neon()) {
-    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
-  }
-#endif
+//#ifdef MOZILLA_MAY_SUPPORT_NEON
+//  if (mozilla::supports_neon()) {
+//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
+//  }
+//#endif
 }
 
 class GfxQcms_sRGB_To_sRGB : public GfxQcms_ProfilePairBase {