projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c86b82a
)
correctly switch between windows and (other) when deciding whether to use AVX code
author
Paul Davis
<paul@linuxaudiosystems.com>
Wed, 12 Aug 2015 04:01:02 +0000
(
00:01
-0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Wed, 12 Aug 2015 04:01:02 +0000
(
00:01
-0400)
libs/ardour/globals.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/globals.cc
b/libs/ardour/globals.cc
index 4951161a72f91681cbfb869d6c5f6318e0a85f9b..5ab66da015566cea1dd4e9a599cee115cab06bc4 100644
(file)
--- a/
libs/ardour/globals.cc
+++ b/
libs/ardour/globals.cc
@@
-164,12
+164,17
@@
setup_hardware_optimization (bool try_optimization)
#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
-#if 0 /* AVX code doesn't compile on Linux yet, don't use generic code instead */
+#ifdef PLATFORM_WINDOWS
+ /* We have AVX-optimized code for Windows */
if (fpu->has_avx()) {
if (fpu->has_avx()) {
-
+#else
+ /* AVX code doesn't compile on Linux yet */
+
+ if (false) {
+#endif
info << "Using AVX optimized routines" << endmsg;
info << "Using AVX optimized routines" << endmsg;
-
+
// AVX SET
compute_peak = x86_sse_avx_compute_peak;
find_peaks = x86_sse_avx_find_peaks;
// AVX SET
compute_peak = x86_sse_avx_compute_peak;
find_peaks = x86_sse_avx_find_peaks;
@@
-180,9
+185,7
@@
setup_hardware_optimization (bool try_optimization)
generic_mix_functions = false;
generic_mix_functions = false;
- } else
-#endif
- if (fpu->has_sse()) {
+ } else if (fpu->has_sse()) {
info << "Using SSE optimized routines" << endmsg;
info << "Using SSE optimized routines" << endmsg;