mirror of
https://github.com/blender/blender
synced 2026-10-25 03:07:01 +03:00
32f7665673
It appears that previously, assembly was straight up disabled for all ARM64 platforms in x264 - this re-enables it. This also updates the version of FFmpeg to 7.1.1. I updated the patch files so that they would cleanly apply to 7.1.1. For Windows ARM64, it also switches both of these libraries to use the copy of LLVM we build as part of the deps, instead of MSVC - this gives a small performance increase. To do this for x264, I added a small patch taken from VCPKG - this should be harmless to other platforms. With all these changes, I was able to get a ~20-30% perf improvement in video transcoding in the sequence editor. Pull Request: https://projects.blender.org/blender/blender/pulls/137670
15 lines
863 B
Diff
15 lines
863 B
Diff
diff --git a/configure b/configure
|
|
index 6f95e2314..e677e36f4 100644
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -606,9 +606,9 @@ if [[ $host_os = mingw* || $host_os = msys* || $host_os = cygwin* ]]; then
|
|
if cc_check '' -Qdiag-error:10006,10157 ; then
|
|
CHECK_CFLAGS="$CHECK_CFLAGS -Qdiag-error:10006,10157"
|
|
fi
|
|
- elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* ]]; then
|
|
+ elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* || "$cc_base" = clang-cl || "$cc_base" = clang-cl[\ .]* ]]; then
|
|
# Standard Microsoft Visual Studio
|
|
compiler=CL
|
|
compiler_style=MS
|
|
CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras"
|
|
cpp_check '' '' '_MSC_VER > 1800 || (_MSC_VER == 1800 && _MSC_FULL_VER >= 180030324)' || die "Microsoft Visual Studio support requires Visual Studio 2013 Update 2 or newer"
|