Add support for building Apple Silicon.

domchen · web-flow · commit c8dc1d7f7dd4 · 2022-01-28T14:38:03.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,11 @@
 cmake_minimum_required(VERSION 3.1)
 project(PAG)
 
-if (APPLE AND NOT IOS)
-    SET(CMAKE_SYSTEM_PROCESSOR x86_64)
-    SET(CMAKE_OSX_ARCHITECTURES x86_64)
-endif ()
+# Uncomment the next 4 lines to build libpag for Intel cpus.
+#if (APPLE AND NOT IOS)
+#    SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+#    SET(CMAKE_OSX_ARCHITECTURES x86_64)
+#endif ()
 
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 include(./vendor_tools/vendor.cmake)
diff --git a/DEPS b/DEPS
@@ -7,7 +7,7 @@
     "common": [
       {
         "url": "${PAG_GROUP}/vendor_tools.git",
-        "commit": "27837194cf1834bcdf2bc2643655bdebcf2a67e9",
+        "commit": "24aaeef49c7daffcc4446bd0795143c66f3223e6",
         "dir": "vendor_tools"
       },
       {
@@ -22,12 +22,12 @@
       },
       {
         "url": "${PAG_GROUP}/libavc.git",
-        "commit": "dfc550bc75eef789eae8f0b0bfb954e11f7740e4",
+        "commit": "c2bf4c84a6d39788929e59514417e819185af98e",
         "dir": "third_party/libavc"
       },
       {
         "url": "${PAG_GROUP}/swiftshader.git",
-        "commit": "8d781475d99e8c1582f4c0da44b54ba105f8b79a",
+        "commit": "040ee43bfeba9b6b532dbd8222df737aac2d55b1",
         "dir": "third_party/swiftshader"
       },
       {
diff --git a/libpag.podspec b/libpag.podspec
@@ -22,7 +22,7 @@ end
 
 if  ENV["PLATFORM"] == "mac"
   system("depsync mac")
-  system("node build_vendor #{vendorNames} -o #{PAG_ROOT}/mac/Pods/pag-vendor -p mac")
+  system("node build_vendor #{vendorNames} -o #{PAG_ROOT}/mac/Pods/pag-vendor -p mac --fatLib")
 else
   system("depsync ios")
   system("node build_vendor #{vendorNames} -o #{PAG_ROOT}/ios/Pods/pag-vendor -p ios --fatLib")
@@ -91,6 +91,6 @@ Pod::Spec.new do |s|
   s.ios.xcconfig = {"OTHER_CFLAGS" => commonCFlags.join(" "),"EXPORTED_SYMBOLS_FILE" => "${PODS_ROOT}/../libpag.lds","OTHER_LDFLAGS" => "-w","VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS" => "OpenGLES"}
   s.osx.xcconfig = {"OTHER_CFLAGS" => commonCFlags.join(" ")}
   s.ios.vendored_libraries = 'ios/Pods/pag-vendor/libpag-vendor.a'
-  s.osx.vendored_libraries = 'mac/Pods/pag-vendor/x64/libpag-vendor.a'
+  s.osx.vendored_libraries = 'mac/Pods/pag-vendor/libpag-vendor.a'
 
 end
diff --git a/mac/PAGViewer.xcodeproj/project.pbxproj b/mac/PAGViewer.xcodeproj/project.pbxproj
@@ -574,7 +574,6 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				EXCLUDED_ARCHS = arm64;
 				INFOPLIST_FILE = PAGViewer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -596,7 +595,6 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				EXCLUDED_ARCHS = arm64;
 				INFOPLIST_FILE = PAGViewer/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/test/PAGCompareFrameTest.cpp b/test/PAGCompareFrameTest.cpp
@@ -65,8 +65,8 @@ class CompareFrameTask : public Executor {
   bool success = false;
 
   void execute() override {
-    success = Baseline::Compare(pixelBuffer, "PAGCompareFrameTest/" + fileName + "/" +
-                                                 std::to_string(_currentFrame));
+    success = Baseline::Compare(
+        pixelBuffer, "PAGCompareFrameTest/" + fileName + "/" + std::to_string(_currentFrame));
   }
 };
 
@@ -102,6 +102,9 @@ void CompareFileFrames(Semaphore* semaphore, std::string pagPath) {
   std::shared_ptr<Task> lastTask = nullptr;
 
   auto CompareFrame = [&](Frame currentFrame) {
+    if (lastTask == nullptr) {
+      return;
+    }
     auto startTime = GetTimer();
     auto task = static_cast<CompareFrameTask*>(lastTask->wait());
     auto compareCost = GetTimer() - startTime;
@@ -113,6 +116,7 @@ void CompareFileFrames(Semaphore* semaphore, std::string pagPath) {
     if (!task->isSuccess()) {
       errorMsg += (std::to_string(currentFrame) + ";");
     }
+    lastTask = nullptr;
   };
 
   while (currentFrame < totalFrames) {
@@ -127,9 +131,7 @@ void CompareFileFrames(Semaphore* semaphore, std::string pagPath) {
       cost.performance = cache->getPerformanceString();
       performanceMap[currentFrame] = cost;
     }
-    if (currentFrame > 0) {
-      CompareFrame(currentFrame - 1);
-    }
+    CompareFrame(currentFrame - 1);
     if (changed) {
       auto executor = new CompareFrameTask(fileName, currentFrame, currentSnapshot);
       lastTask = Task::Make(std::unique_ptr<CompareFrameTask>(executor));
diff --git a/test/framework/utils/Baseline.cpp b/test/framework/utils/Baseline.cpp
@@ -30,21 +30,8 @@ namespace pag {
 #define OUT_BASELINE_ROOT "../test/out/baseline/"
 #define OUT_COMPARE_ROOT "../test/out/compare/"
 #define COMPRESS_FILE_EXT ".lzma2"
-
-static std::unordered_set<std::string> clearedFolders = {};
-
-static void ClearPreviousOutput(const std::string& key) {
-  std::filesystem::path folder = key;
-  while (!folder.parent_path().empty()) {
-    folder = folder.parent_path();
-  }
-  if (clearedFolders.count(folder) > 0) {
-    return;
-  }
-  clearedFolders.insert(folder);
-  std::filesystem::remove_all(OUT_BASELINE_ROOT + folder.string());
-  std::filesystem::remove_all(OUT_COMPARE_ROOT + folder.string());
-}
+#define MAX_DIFF_COUNT 10
+#define MAX_DIFF_VALUE 5
 
 static ImageInfo MakeInfo(int with, int height) {
   return ImageInfo::Make(with, height, ColorType::RGBA_8888, AlphaType::Premultiplied);
@@ -85,25 +72,38 @@ static void SaveImage(const ImageInfo& info, const std::shared_ptr<Data>& imageD
   SaveData(compareImage, OUT_COMPARE_ROOT + key + "_new.webp");
 }
 
-bool ComparePixelData(const std::shared_ptr<Data>& pixelData, const std::string& key) {
-  ClearPreviousOutput(key);
+static void ClearPreviousOutput(const std::string& key) {
+  std::filesystem::remove(OUT_BASELINE_ROOT + key + COMPRESS_FILE_EXT);
+  std::filesystem::remove(OUT_COMPARE_ROOT + key + "_baseline.webp");
+  std::filesystem::remove(OUT_COMPARE_ROOT + key + "_new.webp");
+}
+
+static bool ComparePixelData(const std::shared_ptr<Data>& pixelData, const std::string& key,
+                             const ImageInfo& info) {
   if (pixelData == nullptr) {
     return false;
   }
   auto baselineData = LoadImageData(key);
   if (baselineData == nullptr || pixelData->size() != baselineData->size()) {
     return false;
   }
+  size_t diffCount = 0;
   auto baseline = baselineData->bytes();
   auto pixels = pixelData->bytes();
   auto byteSize = pixelData->size();
   for (size_t index = 0; index < byteSize; index++) {
     auto pixelA = pixels[index];
     auto pixelB = baseline[index];
-    if (abs(pixelA - pixelB) > 3) {
-      return false;
+    if (abs(pixelA - pixelB) > MAX_DIFF_VALUE) {
+      diffCount++;
     }
   }
+  // We assume that the two images are the same if the number of different pixels is less than 10.
+  if (diffCount > MAX_DIFF_COUNT) {
+    SaveImage(info, pixelData, key);
+    return false;
+  }
+  ClearPreviousOutput(key);
   return true;
 }
 
@@ -121,11 +121,7 @@ bool Baseline::Compare(const std::shared_ptr<PixelBuffer>& pixelBuffer, const st
   if (!result) {
     return false;
   }
-  result = ComparePixelData(data, key);
-  if (!result) {
-    SaveImage(info, data, key);
-  }
-  return result;
+  return ComparePixelData(data, key, info);
 }
 
 bool Baseline::Compare(const Bitmap& bitmap, const std::string& key) {
@@ -139,11 +135,7 @@ bool Baseline::Compare(const Bitmap& bitmap, const std::string& key) {
   if (!result) {
     return false;
   }
-  result = ComparePixelData(data, key);
-  if (!result) {
-    SaveImage(info, data, key);
-  }
-  return result;
+  return ComparePixelData(data, key, info);
 }
 
 bool Baseline::Compare(const PixelMap& pixelMap, const std::string& key) {
@@ -157,11 +149,7 @@ bool Baseline::Compare(const PixelMap& pixelMap, const std::string& key) {
   if (!result) {
     return false;
   }
-  result = ComparePixelData(data, key);
-  if (!result) {
-    SaveImage(info, data, key);
-  }
-  return result;
+  return ComparePixelData(data, key, info);
 }
 
 bool Baseline::Compare(const std::shared_ptr<PAGSurface>& surface, const std::string& key) {
@@ -176,10 +164,6 @@ bool Baseline::Compare(const std::shared_ptr<PAGSurface>& surface, const std::st
   if (!result) {
     return false;
   }
-  result = ComparePixelData(data, key);
-  if (!result) {
-    SaveImage(info, data, key);
-  }
-  return result;
+  return ComparePixelData(data, key, info);
 }
 }  // namespace pag
diff --git a/vendor.json b/vendor.json
@@ -120,7 +120,8 @@
           "${BUILD_DIR}/pnglibconf.h"
         ],
         "platforms": [
-          "ios"
+          "ios",
+          "mac"
         ]
       }
     },
diff --git a/vendor/ffavc/mac/arm64/libffavc.dylib b/vendor/ffavc/mac/arm64/libffavc.dylib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:953fd50fb98d44de54f13908e99df7145f5a4cecdf9f1b6b4689e69905b0bfc1
+size 1784635
diff --git a/vendor/swiftshader/mac/arm64/libEGL.dylib b/vendor/swiftshader/mac/arm64/libEGL.dylib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e787fd91ff325db711cd3f4eca1e667e7a88f83e571c100c496ebb35c229ef0
+size 106841
diff --git a/vendor/swiftshader/mac/arm64/libGLESv2.dylib b/vendor/swiftshader/mac/arm64/libGLESv2.dylib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3560c1919c50ba0d272bfbd3fd457d085c00258b5eb49efcf1b3c9c77cd25343
+size 31171340

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"common": [`
`8`	`8`	`{`
`9`	`9`	`"url": "${PAG_GROUP}/vendor_tools.git",`
`10`		`- "commit": "27837194cf1834bcdf2bc2643655bdebcf2a67e9",`
	`10`	`+ "commit": "24aaeef49c7daffcc4446bd0795143c66f3223e6",`
`11`	`11`	`"dir": "vendor_tools"`
`12`	`12`	`},`
`13`	`13`	`{`
`@@ -22,12 +22,12 @@`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"url": "${PAG_GROUP}/libavc.git",`
`25`		`- "commit": "dfc550bc75eef789eae8f0b0bfb954e11f7740e4",`
	`25`	`+ "commit": "c2bf4c84a6d39788929e59514417e819185af98e",`
`26`	`26`	`"dir": "third_party/libavc"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"url": "${PAG_GROUP}/swiftshader.git",`
`30`		`- "commit": "8d781475d99e8c1582f4c0da44b54ba105f8b79a",`
	`30`	`+ "commit": "040ee43bfeba9b6b532dbd8222df737aac2d55b1",`
`31`	`31`	`"dir": "third_party/swiftshader"`
`32`	`32`	`},`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@`
`120`	`120`	`"${BUILD_DIR}/pnglibconf.h"`
`121`	`121`	`],`
`122`	`122`	`"platforms": [`
`123`		`- "ios"`
	`123`	`+ "ios",`
	`124`	`+ "mac"`
`124`	`125`	`]`
`125`	`126`	`}`
`126`	`127`	`},`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:953fd50fb98d44de54f13908e99df7145f5a4cecdf9f1b6b4689e69905b0bfc1`
	`3`	`+size 1784635`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:6e787fd91ff325db711cd3f4eca1e667e7a88f83e571c100c496ebb35c229ef0`
	`3`	`+size 106841`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:3560c1919c50ba0d272bfbd3fd457d085c00258b5eb49efcf1b3c9c77cd25343`
	`3`	`+size 31171340`