summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-08-17 12:50:27 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-08-17 13:22:31 +0000
commit10fcb22c79387b957fe3e6663b23f75d693531d6 (patch)
treecb2551affff729a35b7bc19caadc5d600a3180e9 /src/core
parentc281914db0a4ccfa83224c8c26eb44dc0932b1fc (diff)
Disable SIMD for msvc2013 on x86
Avoids an internal compiler error. Task-number: QTBUG-62551 Change-Id: I74275d07cfbff2c7053d819fe7fb64fe69a2f634 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/configure.json b/src/core/configure.json
index 7f98356c1..c7ada271e 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -86,7 +86,7 @@
"purpose": "Use SSE2 SIMD instructions to accelerate matrix operations",
"autoDetect": "features.sse2",
"enable": "input.qt3d-simd == 'sse2' || input.qt3d-simd == 'avx2'",
- "disable": "input.qt3d-simd == 'no'",
+ "disable": "input.qt3d-simd == 'no' || (config.win32-msvc2013 && arch.i386)",
"output": [ "privateFeature" ]
},
"qt3d-simd-avx2": {
@@ -94,7 +94,7 @@
"purpose": "Use AVX2 SIMD instructions to accelerate matrix operations",
"autoDetect": false,
"enable": "input.qt3d-simd == 'avx2'",
- "disable": "input.qt3d-simd == 'sse2' || input.qt3d-simd == 'no'",
+ "disable": "input.qt3d-simd == 'sse2' || input.qt3d-simd == 'no' || (config.win32-msvc2013 && arch.i386)",
"output": [ "privateFeature" ]
}
},