forked from amazingfate/loongoffice
302fb4c1ec
The m91 snapshot seems to cause a number of Vulkan problems. My commit already worked around one, but there are apparently others, such as very slow startup, or a failed Skia assertion triggered by VCL Skia's copyArea(). This reverts commit 09d850e46903a528d4b08d3fdf03c3964d79fbc5. Change-Id: I4f1832ba76db15cab8eccbe115d21c989da3c841 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114089 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
18 lines
637 B
Plaintext
18 lines
637 B
Plaintext
--- include/private/SkTemplates.h
|
|
+++ include/private/SkTemplates.h
|
|
@@ -453,12 +453,12 @@
|
|
|
|
template<typename C, std::size_t... Is>
|
|
constexpr auto SkMakeArrayFromIndexSequence(C c, std::index_sequence<Is...>)
|
|
--> std::array<std::result_of_t<C(std::size_t)>, sizeof...(Is)> {
|
|
+-> std::array<std::invoke_result_t<C, std::size_t>, sizeof...(Is)> {
|
|
return {{ c(Is)... }};
|
|
}
|
|
|
|
template<size_t N, typename C> constexpr auto SkMakeArray(C c)
|
|
--> std::array<std::result_of_t<C(std::size_t)>, N> {
|
|
+-> std::array<std::invoke_result_t<C, std::size_t>, N> {
|
|
return SkMakeArrayFromIndexSequence(c, std::make_index_sequence<N>{});
|
|
}
|
|
|