Revert "This patch attempts to fix static linkage issues by disabling AVX2 and AVX512 by default, and includes a minor SkUnicode fix."

This reverts commit b5c13d8.

Author: viniciusfbb

BUILD.gn

@@ -170,10 +170,8 @@ is_loong64 = current_cpu == "loong64"
 opts("hsw") {
   enabled = is_x86
   sources = skia_opts.hsw_sources
-  if (is_win) {
-    if (!is_mingw) {
-      cflags = [ "/arch:AVX2" ]
-    }
+  if (is_win && !is_mingw) {
+    cflags = [ "/arch:AVX2" ]
   } else {
     cflags = [ "-march=haswell" ]
   }
@@ -182,10 +180,8 @@ opts("hsw") {
 opts("skx") {
   enabled = is_x86
   sources = skia_opts.skx_sources
-  if (is_win) {
-    if (!is_mingw) {
-      cflags = [ "/arch:AVX512" ]
-    }
+  if (is_win && !is_mingw) {
+    cflags = [ "/arch:AVX512" ]
   } else {
     cflags = [ "-march=skylake-avx512" ]
   }

modules/skcms/BUILD.gn

@@ -33,17 +33,15 @@ template("arch") {
 arch("skcms_TransformHsw") {
   enabled = current_cpu == "x64" && target_os != "android"
   sources = skcms_TransformHsw
-  if (is_win) {
-    if (!is_mingw) {
-      if (is_clang) {
-        cflags = [
-          "/clang:-mavx2",
-          "/clang:-mf16c",
-          "/clang:-ffp-contract=off",
-        ]
-      } else {
-        cflags = [ "/arch:AVX2" ]
-      }
+  if (is_win && !is_mingw) {
+    if (is_clang) {
+      cflags = [
+        "/clang:-mavx2",
+        "/clang:-mf16c",
+        "/clang:-ffp-contract=off",
+      ]
+    } else {
+      cflags = [ "/arch:AVX2" ]
     }
   } else {
     cflags = [
@@ -57,20 +55,18 @@ arch("skcms_TransformHsw") {
 arch("skcms_TransformSkx") {
   enabled = current_cpu == "x64" && target_os != "android"
   sources = skcms_TransformSkx
-  if (is_win) {
-    if (!is_mingw) {
-      if (is_clang) {
-        cflags = [
-          "/clang:-mavx512f",
-          "/clang:-mavx512dq",
-          "/clang:-mavx512cd",
-          "/clang:-mavx512bw",
-          "/clang:-mavx512vl",
-          "/clang:-ffp-contract=off",
-        ]
-      } else {
-        cflags = [ "/arch:AVX512" ]
-      }
+  if (is_win && !is_mingw) {
+    if (is_clang) {
+      cflags = [
+        "/clang:-mavx512f",
+        "/clang:-mavx512dq",
+        "/clang:-mavx512cd",
+        "/clang:-mavx512bw",
+        "/clang:-mavx512vl",
+        "/clang:-ffp-contract=off",
+      ]
+    } else {
+      cflags = [ "/arch:AVX512" ]
     }
   } else {
     cflags = [
@@ -91,7 +87,7 @@ static_library("skcms") {
   } else if (is_clang) {
     cflags_c += [ "-std=c11" ]
   }
-  if (target_cpu != "x64" || target_os == "android" || (is_win && !is_mingw)) {
+  if (target_cpu != "x64" || target_os == "android") {
     defines = [
       "SKCMS_DISABLE_HSW",
       "SKCMS_DISABLE_SKX",

sk4d/modules/skunicode/src/sk4d_unicode.cpp

@@ -14,7 +14,7 @@ sk_unicode_t* sk4d_unicode_create(void) {
 }
 
 void sk4d_unicode_destroy(sk_unicode_t* self) {
-    AsUnicode(self)->unref();
+    delete AsUnicode(self);
 }
 
 void sk4d_unicode_for_each_bidi_region(sk_unicode_t* self, const uint16_t utf16_text[], int32_t utf16_units, sk_direction_t direction, sk_unicode_bidi_region_proc proc, void* context) {