From 0bf5c5a0b1ff93d1f4aaa8cdea6acda5e42c2068 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Sep 2022 23:28:46 +0100 Subject: gentoo auto-resync : 22:09:2022 - 23:28:46 --- .../chromium-104-swiftshader-no-wayland.patch | 52 ---------------- .../chromium/files/chromium-104-v8-neon.patch | 72 ---------------------- 2 files changed, 124 deletions(-) delete mode 100644 www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch delete mode 100644 www-client/chromium/files/chromium-104-v8-neon.patch (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch deleted file mode 100644 index 75f78f36bc3d..000000000000 --- a/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/third_party/swiftshader/src/Vulkan/BUILD.gn -+++ b/third_party/swiftshader/src/Vulkan/BUILD.gn -@@ -16,14 +16,22 @@ import("//build_overrides/build.gni") - import("../swiftshader.gni") - import("vulkan.gni") - -+if (is_linux) { -+ import("//build/config/ozone.gni") -+} -+ - # Need a separate config to ensure the warnings are added to the end. - config("swiftshader_libvulkan_private_config") { - if (is_linux) { - defines = [ - "VK_USE_PLATFORM_XCB_KHR", -- "VK_USE_PLATFORM_WAYLAND_KHR", - "VK_EXPORT=__attribute__((visibility(\"default\")))", - ] -+ if (ozone_platform_wayland) { -+ defines += [ -+ "VK_USE_PLATFORM_WAYLAND_KHR", -+ ] -+ } - } else if (is_chromeos) { - defines = [ - "VK_EXPORT=__attribute__((visibility(\"default\")))", ---- a/third_party/swiftshader/src/WSI/BUILD.gn -+++ b/third_party/swiftshader/src/WSI/BUILD.gn -@@ -42,15 +42,19 @@ swiftshader_source_set("WSI") { - - if (is_linux) { - sources += [ -- "WaylandSurfaceKHR.cpp", -- "WaylandSurfaceKHR.hpp", - "XcbSurfaceKHR.cpp", - "XcbSurfaceKHR.hpp", -- "libWaylandClient.cpp", -- "libWaylandClient.hpp", - "libXCB.cpp", - "libXCB.hpp", - ] -+ if (ozone_platform_wayland) { -+ sources += [ -+ "WaylandSurfaceKHR.cpp", -+ "WaylandSurfaceKHR.hpp", -+ "libWaylandClient.cpp", -+ "libWaylandClient.hpp", -+ ] -+ } - } - - if (is_win) { diff --git a/www-client/chromium/files/chromium-104-v8-neon.patch b/www-client/chromium/files/chromium-104-v8-neon.patch deleted file mode 100644 index ee573f8862e6..000000000000 --- a/www-client/chromium/files/chromium-104-v8-neon.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0fc6592cf8867f0cd6d8d41b43392fb52d359649 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Tue, 07 Jun 2022 15:44:35 +0200 -Subject: [PATCH] GCC: fix compilation of NEON64 extract_first_nonzero_index - -GCC fails to compile extract_first_nonzero_index because of the -signedness type mismatch in the NEON intrinsics. - -Bug: chromium:819294 -Change-Id: I9b73e5fa1d5fbf161740ab1b5d77f5c494369dfa -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3693709 -Reviewed-by: Toon Verwaest -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/main@{#81063} ---- - -diff --git a/v8/src/objects/simd.cc b/v8/src/objects/simd.cc -index d3cedfe..0a73b9c 100644 ---- a/v8/src/objects/simd.cc -+++ b/v8/src/objects/simd.cc -@@ -95,24 +95,21 @@ - } - - template <> --inline int extract_first_nonzero_index(int32x4_t v) { -- int32x4_t mask = {4, 3, 2, 1}; -+inline int extract_first_nonzero_index(uint32x4_t v) { -+ uint32x4_t mask = {4, 3, 2, 1}; - mask = vandq_u32(mask, v); - return 4 - vmaxvq_u32(mask); - } - - template <> --inline int extract_first_nonzero_index(int64x2_t v) { -- int32x4_t mask = {2, 0, 1, 0}; // Could also be {2,2,1,1} or {0,2,0,1} -- mask = vandq_u32(mask, vreinterpretq_s32_s64(v)); -+inline int extract_first_nonzero_index(uint64x2_t v) { -+ uint32x4_t mask = {2, 0, 1, 0}; // Could also be {2,2,1,1} or {0,2,0,1} -+ mask = vandq_u32(mask, vreinterpretq_u32_u64(v)); - return 2 - vmaxvq_u32(mask); - } - --template <> --inline int extract_first_nonzero_index(float64x2_t v) { -- int32x4_t mask = {2, 0, 1, 0}; // Could also be {2,2,1,1} or {0,2,0,1} -- mask = vandq_u32(mask, vreinterpretq_s32_f64(v)); -- return 2 - vmaxvq_u32(mask); -+inline int32_t reinterpret_vmaxvq_u64(uint64x2_t v) { -+ return vmaxvq_u32(vreinterpretq_u32_u64(v)); - } - #endif - -@@ -204,14 +201,14 @@ - } - #elif defined(NEON64) - if constexpr (std::is_same::value) { -- VECTORIZED_LOOP_Neon(int32x4_t, int32x4_t, vdupq_n_u32, vceqq_u32, -+ VECTORIZED_LOOP_Neon(uint32x4_t, uint32x4_t, vdupq_n_u32, vceqq_u32, - vmaxvq_u32) - } else if constexpr (std::is_same::value) { -- VECTORIZED_LOOP_Neon(int64x2_t, int64x2_t, vdupq_n_u64, vceqq_u64, -- vmaxvq_u32) -+ VECTORIZED_LOOP_Neon(uint64x2_t, uint64x2_t, vdupq_n_u64, vceqq_u64, -+ reinterpret_vmaxvq_u64) - } else if constexpr (std::is_same::value) { -- VECTORIZED_LOOP_Neon(float64x2_t, float64x2_t, vdupq_n_f64, vceqq_f64, -- vmaxvq_f64) -+ VECTORIZED_LOOP_Neon(float64x2_t, uint64x2_t, vdupq_n_f64, vceqq_f64, -+ reinterpret_vmaxvq_u64) - } - #else - UNREACHABLE(); -- cgit v1.2.3